Changeset 206 in dev for trunk/abdev/BasicCompiler32/NumOpe.cpp

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

File:

• trunk/abdev/BasicCompiler32/NumOpe.cpp (modified) (8 diffs)

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
@@ -179 +181 @@
     // 動的メソッドを検索
     ///////////////////////////////////////////////////////////////////
-    vector<UserProc *> userProcs;
+    vector<const UserProc *> userProcs;
 
     char methodName[VN_SIZE], lpPtrOffset[VN_SIZE], parameter[VN_SIZE], dummy[1];
-    CClass::RefType refType;
+    ReferenceKind refType;
     lstrcpy( methodName, member );
     GetVarFormatString(methodName,parameter,lpPtrOffset,dummy,refType);
 
     objClass.GetMethods().Enum( methodName, userProcs );
-    UserProc *pUserProc;
     if(userProcs.size()){
         //オーバーロードを解決
-        pUserProc=OverloadSolutionWithStrParam(termFull,userProcs,parameter,termLeft);
+        const UserProc *pUserProc = OverloadSolutionWithStrParam(termFull,userProcs,parameter,termLeft);
 
         if( pUserProc ){
@@ -248 +249 @@
     // パース
     char member[VN_SIZE];
-    CClass::RefType refType;
-    if( CClass::SplitName( termFull, termLeft, member, refType ) ){
+    ReferenceKind refType;
+    if( SplitMemberName( termFull, termLeft, member, refType ) ){
         ///////////////////////////////////////////////////////////////////
         // オブジェクトとメンバに分解できるとき
@@ -312 +313 @@
     if(lstrcmpi(termFull,"This")==0 && isProcedureCallOnly == false ){
         //Thisオブジェクト
-        resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
+        resultType.SetType( DEF_OBJECT, compiler.pCompilingClass );
 
         SetThisPtrToReg( useReg );
@@ -386 +387 @@
             return true;
         }
-        else if(GetConstCalcBuffer(procName,parameter,temporary)){
-            /////////////////////////
-            // マクロ関数
-            /////////////////////////
-
-            //閉じカッコ")"に続く文字がNULLでないときはエラーにする
-            if(termFull[i2+1+i4+1]!='\0') SetError(42,NULL,cp);
-
-            //マクロ関数の場合
-            NumOpe(useReg, temporary,Type(),resultType);
-
-            if(!IS_LITERAL(resultType.GetIndex())){
-                //リテラル値ではなかったとき
-                isLiteral = false;
+        ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( procName );
+        if( pConstMacro )
+        {
+            if( pConstMacro->GetCalcBuffer( parameter, temporary ) )
+            {
+                /////////////////////////
+                // マクロ関数
+                /////////////////////////
+
+                //閉じカッコ")"に続く文字がNULLでないときはエラーにする
+                if(termFull[i2+1+i4+1]!='\0') SetError(42,NULL,cp);
+
+                //マクロ関数の場合
+                NumOpe(useReg, temporary,Type(),resultType);
+
+                if(!IS_LITERAL(resultType.GetIndex())){
+                    //リテラル値ではなかったとき
+                    isLiteral = false;
+                }
+
+                return true;
             }
-
-            return true;
         }
     }
@@ -855 +861 @@
                     //////////////
 
-                    i3 = CDBConst::obj.GetBasicType(term);
+                    i3 = compiler.GetMeta().GetGlobalConsts().GetBasicType(term);
                     if(i3){
-                        if( CDBConst::obj.IsStringPtr( term ) ){
+                        if( compiler.GetMeta().GetGlobalConsts().IsStringPtr( term ) ){
                             //リテラル文字列
 
-                            double dbl = CDBConst::obj.GetDoubleData(term);
+                            double dbl = compiler.GetMeta().GetGlobalConsts().GetDoubleData(term);
                             memcpy(&i64data,&dbl,sizeof(double));
 
@@ -874 +880 @@
                         if(IsRealNumberType(i3)){
                             //実数
-                            double dbl = CDBConst::obj.GetDoubleData(term);
+                            double dbl = compiler.GetMeta().GetGlobalConsts().GetDoubleData(term);
                             memcpy(&i64data,&dbl,sizeof(double));
                             goto Literal;
@@ -880 +886 @@
                         else if(IsWholeNumberType(i3)){
                             //整数
-                            i64data = CDBConst::obj.GetWholeData(term);
+                            i64data = compiler.GetMeta().GetGlobalConsts().GetWholeData(term);
                             goto Literal;
                         }