Changeset 584 in dev for trunk/ab5.0/abdev/compiler_x64/NumOpe.cpp

Timestamp:

May 10, 2008, 12:19:15 PM (17 years ago)

Author:

dai_9181

Message:

[530]～[583]を64bit版にマージ。

File:

• trunk/ab5.0/abdev/compiler_x64/NumOpe.cpp (modified) (8 diffs)

trunk/ab5.0/abdev/compiler_x64/NumOpe.cpp

@@ -426 +426 @@
 
     if( pIsClassName ){
-        if( compiler.GetObjectModule().meta.GetClasses().Find( termFull ) ){
+        if( compiler.GetObjectModule().meta.FindClassSupportedTypeDef( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -442 +442 @@
 
     if(lstrcmpi(termFull,"This")==0 && isProcedureCallOnly == false ){
-        if( compiler.pCompilingClass == NULL )
+        if( !compiler.IsCompilingClass() )
         {
             compiler.errorMessenger.Output(142,NULL,cp);
@@ -449 +449 @@
 
         //Thisオブジェクト
-        resultType.SetType( DEF_OBJECT, compiler.pCompilingClass );
+        resultType.SetType( DEF_OBJECT, &compiler.GetCompilingClass() );
 
         SetThisPtrToReg( UseReg );
@@ -527 +527 @@
         }
 
-        ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find( procName );
+        ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find(
+            ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( procName )
+        );
         if( pConstMacro )
         {
-            if( pConstMacro->GetCalcBuffer( parameter, temporary ) )
+            if( ActiveBasic::Compiler::LexicalAnalyzer::ConstMacroToExpression( *pConstMacro, parameter, temporary ) )
             {
                 /////////////////////////
@@ -1143 +1145 @@
                     //////////////
 
-                    i3 = compiler.GetObjectModule().meta.GetGlobalConsts().GetBasicType(term);
+                    i3 = compiler.GetObjectModule().meta.GetGlobalConsts().GetBasicType(
+                        ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term )
+                    );
                     if(i3){
-                        if( compiler.GetObjectModule().meta.GetGlobalConsts().IsStringPtr( term ) ){
+                        if( compiler.GetObjectModule().meta.GetGlobalConsts().IsStringPtr( ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term ) ) ){
                             //リテラル文字列
 
@@ -1166 +1170 @@
                             }
 
-                            double dbl = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData(term);
+                            double dbl = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData(
+                                ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term )
+                            );
                             memcpy(&i64data,&dbl,sizeof(double));
 
@@ -1180 +1186 @@
                         if(IsRealNumberType(i3)){
                             //実数
-                            double dbl = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData(term);
+                            double dbl = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData(
+                                ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term )
+                            );
                             memcpy(&i64data,&dbl,sizeof(double));
                             goto Literal;
@@ -1186 +1194 @@
                         else if(IsWholeNumberType(i3)){
                             //整数
-                            i64data = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(term);
+                            i64data = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
+                                ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term )
+                            );
                             goto Literal;
                         }