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

Timestamp:

Jun 24, 2007, 6:50:40 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <LexicalScopingImpl.h>
+#include <CodeGenerator.h>
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -187 +194 @@
 
     //アクセシビリティをチェック
-    if(&objClass==pobj_CompilingClass){
+    if(&objClass==Smoothie::Temp::pCompilingClass){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
         if(pMember->IsNoneAccess()){
@@ -360 +367 @@
     // 名前空間を分離
     char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
-    Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
+    Smoothie::GetMeta().namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
@@ -417 +424 @@
     }
 
-    if(pobj_CompilingClass){
+    if(Smoothie::Temp::pCompilingClass){
         //////////////////////
         // クラスメンバの参照
@@ -430 +437 @@
             pRelativeVar->dwKind=VAR_DIRECTMEM;
 
-            resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+            resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
             return true;
         }
@@ -443 +450 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, pobj_CompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -454 +461 @@
         //Const修飾子のメソッド内でメンバ書き込みアクセスが発生したとき
         //（コンストラクタ、デストラクタ内を除く）
-        const CMethod *pMethod = pobj_DBClass->GetNowCompilingMethodInfo();
+        const CMethod *pMethod = Smoothie::GetMeta().GetClasses().GetNowCompilingMethodInfo();
         if( isWriteAccess &&
             pMethod->IsConst() &&
-            pobj_CompilingClass->IsCompilingConstructor() == false &&
-            pobj_CompilingClass->IsCompilingDestructor() == false
+            Smoothie::Temp::pCompilingClass->IsCompilingConstructor() == false &&
+            Smoothie::Temp::pCompilingClass->IsCompilingDestructor() == false
             ){
                 SetError(131, NULL, cp );
@@ -473 +480 @@
             isErrorEnabled,
             isWriteAccess,
-            *pobj_CompilingClass,
+            *Smoothie::Temp::pCompilingClass,
             variable,
             pRelativeVar,
@@ -517 +524 @@
             }
 
-            int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName );
+            int typeDefIndex = Smoothie::GetMeta().typeDefs.GetIndex( VarName );
             if( typeDefIndex != -1 ){
                 // TypeDef後の型名だったとき
-                lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() );
+                lstrcpy( VarName, Smoothie::GetMeta().typeDefs[typeDefIndex].GetBaseName().c_str() );
             }
 
@@ -533 +540 @@
         }
 
-        if(pobj_CompilingClass){
+        if(Smoothie::Temp::pCompilingClass){
             //自身のクラスから静的メンバを参照する場合
             char temp2[VN_SIZE];
-            sprintf(temp2,"%s.%s",pobj_CompilingClass->GetName().c_str(),VarName);
+            sprintf(temp2,"%s.%s",Smoothie::Temp::pCompilingClass->GetName().c_str(),VarName);
             pVar = globalVars.Find( Symbol( temp2 ) );
             if( pVar ){
@@ -825 +832 @@
             char *temp;
             temp=(char *)i64data;
-            i2=dataTable.AddString(temp,lstrlen(temp));
+            i2=Compiler::GetNativeCode().GetDataTable().AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1015 +1022 @@
             char *temp;
             temp=(char *)i64data;
-            i2=dataTable.AddString(temp,lstrlen(temp));
+            i2=Compiler::GetNativeCode().GetDataTable().AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1099 +1106 @@
 
         //レキシカルスコープ
-        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+        pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
         pVar->bLiving=TRUE;
 
@@ -1134 +1141 @@
 
         //レキシカルスコープ
-        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+        pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
         pVar->bLiving=TRUE;