Changeset 579 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/calculation.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/calculation.cpp (modified) (4 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/calculation.cpp

@@ -498 +498 @@
                         //定数関数
 
-                        ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find( temporary );
+                        ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find(
+                            ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( temporary )
+                        );
                         if( !pConstMacro )
                         {
@@ -663 +665 @@
                         /////////
                         StrPtr[pnum]=0;
-                        type[pnum] = compiler.GetObjectModule().meta.GetGlobalConsts().GetBasicType(Parms);
+                        type[pnum] = compiler.GetObjectModule().meta.GetGlobalConsts().GetBasicType(
+                            ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( Parms )
+                        );
                         if(type[pnum]){
                             if(IsRealNumberType(type[pnum])){
                                 //実数型
-                                nums[pnum] = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData(Parms);
+                                nums[pnum] = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData(
+                                    ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( Parms )
+                                );
                             }
                             else if(IsWholeNumberType(type[pnum])){
                                 //整数
-                                i64nums[pnum] = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(Parms);
+                                i64nums[pnum] = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
+                                    ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( Parms )
+                                );
                             }
 /*                          else if(type[pnum]==DEF_STRING){
@@ -1223 +1231 @@
 
                     //定数
-                    ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find( temporary );
+                    ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find(
+                        ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( temporary )
+                    );
                     if(pConstMacro){
                         //マクロ関数の場合
@@ -1233 +1243 @@
 
                 //定数
-                i3 = compiler.GetObjectModule().meta.GetGlobalConsts().GetBasicType(Command+i2);
+                i3 = compiler.GetObjectModule().meta.GetGlobalConsts().GetBasicType(
+                    ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( Command+i2 )
+                );
                 if(i3==DEF_STRING) return 1;    //文字列
                 if(i3) return 0;            //数値