Changeset 193 in dev for trunk/abdev/BasicCompiler32/Compile_Var.cpp

Timestamp:

Jun 26, 2007, 5:04:50 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler32/Compile_Var.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -5 +5 @@
 #include <CodeGenerator.h>
 #include <Compiler.h>
+#include <VariableImpl.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -367 +368 @@
     // 名前空間を分離
     char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
-    Smoothie::GetMeta().namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
+    compiler.GetMeta().GetNamespaces().SplitNamespace( variable, namespaceStr, simpleName );
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
@@ -461 +462 @@
         //Const修飾子のメソッド内でメンバ書き込みアクセスが発生したとき
         //（コンストラクタ、デストラクタ内を除く）
-        const CMethod *pMethod = Smoothie::GetMeta().GetClasses().GetNowCompilingMethodInfo();
+        const CMethod *pMethod = compiler.GetMeta().GetClasses().GetNowCompilingMethodInfo();
         if( isWriteAccess &&
             pMethod->IsConst() &&
@@ -524 +525 @@
             }
 
-            int typeDefIndex = Smoothie::GetMeta().typeDefs.GetIndex( VarName );
+            int typeDefIndex = compiler.GetMeta().GetTypeDefs().GetIndex( VarName );
             if( typeDefIndex != -1 ){
                 // TypeDef後の型名だったとき
-                lstrcpy( VarName, Smoothie::GetMeta().typeDefs[typeDefIndex].GetBaseName().c_str() );
+                lstrcpy( VarName, compiler.GetMeta().GetTypeDefs()[typeDefIndex].GetBaseName().c_str() );
             }
 
@@ -832 +833 @@
             char *temp;
             temp=(char *)i64data;
-            i2=Compiler::GetNativeCode().GetDataTable().AddString(temp,lstrlen(temp));
+            i2=compiler.GetNativeCode().GetDataTable().AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1022 +1023 @@
             char *temp;
             temp=(char *)i64data;
-            i2=Compiler::GetNativeCode().GetDataTable().AddString(temp,lstrlen(temp));
+            i2=compiler.GetNativeCode().GetDataTable().AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1095 +1096 @@
         bool isConst = ( dwFlags & DIMFLAG_CONST ) ? true:false;
 
-        Variable *pVar = new Variable( VarName, type, isConst );
+        Variable *pVar = new VariableImpl( VarName, type, isConst );
 
         if( SubScripts[0] != -1 ){