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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/abdev/BasicCompiler32/Compile_Calc.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler32/Compile_Calc.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
@@ -481 +483 @@
             }
             else{
-                if(GetConstHash(variable)){
+                if( compiler.GetMeta().GetGlobalConsts().IsExist(variable)
+                    || compiler.GetMeta().GetGlobalConstMacros().IsExist(variable) )
+                {
                     //定数リストに該当したとき
                     SetError(1,NULL,cp);
@@ -626 +630 @@
     if( varType.IsObject() && compiler.GetMeta().GetBlittableTypes().IsExist( calcType ) ){
         // Blittable型をオブジェクトとして扱う
-        vector<UserProc *> userProcs;
+        vector<const UserProc *> userProcs;
         compiler.GetMeta().GetBlittableTypes().GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
         if( userProcs.size() != 1 ){
@@ -632 +636 @@
             return;
         }
-        UserProc *pUserProc = userProcs[0];
+        const UserProc *pUserProc = userProcs[0];
 
         // call System.[TypeClass]._Create