Changeset 137 in dev for BasicCompiler64

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler64

Files:

• BasicCompiler.vcproj (modified) (3 diffs)
• Compile_CallProc.cpp (modified) (4 diffs)
• Compile_Var.cpp (modified) (7 diffs)

BasicCompiler64/BasicCompiler.vcproj

@@ -480 +480 @@
                     >
                     <File
-                        RelativePath="..\BasicCompiler_Common\include\Member.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\Method.h"
-                        >
-                    </File>
-                    <File
                         RelativePath="..\BasicCompiler_Common\include\Namespace.h"
                         >
@@ -500 +492 @@
                     </File>
                     <File
-                        RelativePath="..\BasicCompiler_Common\include\Prototype.h"
-                        >
-                    </File>
-                    <File
                         RelativePath="..\BasicCompiler_Common\Type.h"
                         >
@@ -515 +503 @@
                         >
                     </File>
+                    <Filter
+                        Name="Prototype"
+                        >
+                        <File
+                            RelativePath="..\BasicCompiler_Common\include\Member.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\BasicCompiler_Common\include\Method.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\BasicCompiler_Common\include\Prototype.h"
+                            >
+                        </File>
+                    </Filter>
                 </Filter>
                 <Filter

BasicCompiler64/Compile_CallProc.cpp

@@ -175 +175 @@
         // アクセスエラーチェック
         //////////////////////////////
-        DWORD dwAccess = pMethod->dwAccess;
 
         if(ObjectName[0]){
@@ -181 +180 @@
             if(pobj_c==pobj_CompilingClass){
                 //同一クラスオブジェクトの場合はプライベートアクセスを容認する
-                if(dwAccess==ACCESS_NON){
+                if( pMethod->IsNoneAccess() ){
                     SetError(109,pUserProc->GetName(),cp);
                     return false;
@@ -187 +186 @@
             }
             else{
-                if(dwAccess==ACCESS_PRIVATE||
-                    dwAccess==ACCESS_NON){
+                if( pMethod->IsPrivate()
+                    || pMethod->IsNoneAccess() ){
                     SetError(109,pUserProc->GetName(),cp);
                     return false;
                 }
-                if(dwAccess==ACCESS_PROTECTED){
+                if( pMethod->IsProtected() ){
                     SetError(110,pUserProc->GetName(),cp);
                     return false;
@@ -200 +199 @@
         else{
             //クラス内部からの呼び出し（継承によるACCESS_NONのみをエラーとする）
-            if(dwAccess==ACCESS_NON){
+            if( pMethod->IsNoneAccess() ){
                 SetError(109,pUserProc->GetName(),cp);
                 return false;

BasicCompiler64/Compile_Var.cpp

@@ -219 +219 @@
     if(&objClass==pobj_CompilingClass){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
-        if(pMember->dwAccess==ACCESS_NON){
+        if(pMember->IsNoneAccess()){
             if(isErrorEnabled) SetError(107,VarName,cp);
             return false;
@@ -225 +225 @@
     }
     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;
@@ -246 +246 @@
     }
 
-    resultType = *pMember;
+    resultType = pMember->GetType();
 
     //ポインタ変数の場合
@@ -273 +273 @@
     if(array[0]){
         //配列オフセット
-        if(!GetArrayOffset(pMember->SubScripts,array,*pMember)){
+        if(!GetArrayOffset(pMember->SubScripts,array,pMember->GetType())){
             if(isErrorEnabled) SetError(14,member,cp);
         }
@@ -352 +352 @@
             isErrorEnabled,
             isWriteAccess,
-            pMember->GetClass(),
+            pMember->GetType().GetClass(),
             NestMember,
             pRelativeVar,
@@ -777 +777 @@
 
                 if(!SetInitGlobalData(offset+i3,
-                    *objClass.ppobj_Member[i2],
+                    objClass.ppobj_Member[i2]->GetType(),
                     objClass.ppobj_Member[i2]->SubScripts,
                     temporary)) return false;
@@ -913 +913 @@
 
                 if(!InitLocalVar(offset+i3,
-                    *objClass.ppobj_Member[i2],
+                    objClass.ppobj_Member[i2]->GetType(),
                     objClass.ppobj_Member[i2]->SubScripts,
                     temporary)) return false;