Changeset 579 in dev for trunk/ab5.0/abdev/compiler_x86/NumOpe.cpp

Timestamp:

May 8, 2008, 3:27:32 PM (16 years ago)

Author:

dai_9181

Message:

Consts/ConstMacrosクラスのLexicalAnalyzerクラスへの依存性をなくした。

File:

• trunk/ab5.0/abdev/compiler_x86/NumOpe.cpp (modified) (5 diffs)

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

@@ -515 +515 @@
         }
 
-        ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find( procName );
+        ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find(
+            ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( procName )
+        );
         if( pConstMacro )
         {
@@ -1043 +1045 @@
                     //////////////
 
-                    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 ) ) ){
                             //リテラル文字列
 
@@ -1063 +1067 @@
                             }
 
-                            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));
 
@@ -1077 +1083 @@
                         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;
@@ -1083 +1091 @@
                         else if(IsWholeNumberType(i3)){
                             //整数
-                            i64data = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(term);
+                            i64data = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
+                                ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term )
+                            );
                             goto Literal;
                         }