Changeset 137 in dev for BasicCompiler32/Compile_Var.cpp

Timestamp:

Jun 8, 2007, 3:11:47 AM (17 years ago)

Author:

dai_9181

Message:

アクセシビリティ周りをリファクタリングした。

File:

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

BasicCompiler32/Compile_Var.cpp

@@ -190 +190 @@
     if(&objClass==pobj_CompilingClass){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
-        if(pMember->dwAccess==ACCESS_NON){
+        if(pMember->IsNoneAccess()){
             if(isErrorEnabled) SetError(107,VarName,cp);
             return false;
@@ -196 +196 @@
     }
     else{
-        if((bPrivateAccess==0&&pMember->dwAccess==ACCESS_PRIVATE)||
-            pMember->dwAccess==ACCESS_NON){
+        if((bPrivateAccess==0&&pMember->IsPrivate())||
+            pMember->IsNoneAccess()){
             if(isErrorEnabled) SetError(107,VarName,cp);
             return false;
         }
-        else if(bPrivateAccess==0&&pMember->dwAccess==ACCESS_PROTECTED){
+        else if(bPrivateAccess==0&&pMember->IsProtected()){
             if(isErrorEnabled) SetError(108,VarName,cp);
             return false;
@@ -217 +217 @@
     }
 
-    resultType = *pMember;
+    resultType = pMember->GetType();
 
     //ポインタ変数の場合
@@ -243 +243 @@
     if(array[0]){
         //配列オフセット
-        if(!GetArrayOffset(pMember->SubScripts,array,*pMember)){
+        if(!GetArrayOffset(pMember->SubScripts,array,pMember->GetType())){
             if(isErrorEnabled) SetError(14,member,cp);
         }
@@ -323 +323 @@
             isErrorEnabled,
             isWriteAccess,
-            pMember->GetClass(),
+            pMember->GetType().GetClass(),
             NestMember,
             pRelativeVar,
@@ -755 +755 @@
 
                 if(!SetInitGlobalData(offset+i3,
-                    *objClass.ppobj_Member[i2],
+                    objClass.ppobj_Member[i2]->GetType(),
                     objClass.ppobj_Member[i2]->SubScripts,
                     temporary)) return false;
@@ -891 +891 @@
 
                 if(!InitLocalVar(offset+i3,
-                    *objClass.ppobj_Member[i2],
+                    objClass.ppobj_Member[i2]->GetType(),
                     objClass.ppobj_Member[i2]->SubScripts,
                     temporary)) return false;