Changeset 538 in dev for trunk/ab5.0/abdev

Timestamp:

May 3, 2008, 11:50:25 PM (17 years ago)

Author:

dai_9181

Message:

pCompilingMethodを排除。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/include/Class.h (modified) (2 diffs)
• BasicCompiler_Common/src/Class.cpp (modified) (1 diff)
• compiler_x86/Compile_Var.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Class.h

@@ -476 +476 @@
 public:
     Classes()
-        : pCompilingMethod( NULL )
-        , pStringClass( NULL )
+        : pStringClass( NULL )
         , pObjectClass( NULL )
         , pInterfaceInfo( NULL )
@@ -504 +503 @@
     const CClass *Find( const std::string &fullName ) const;
 
-
-    /////////////////////////////
-    // 現在コンパイル中の情報
-    /////////////////////////////
-private:
-    const CMethod *pCompilingMethod;
-public:
     void StartCompile( const UserProc *pUserProc );
-
-    //現在コンパイル中のメソッド情報を取得
-    const CMethod *GetNowCompilingMethodInfo(){
-        return pCompilingMethod;
-    }
 
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1166 +1166 @@
             }
         }
-
-        pCompilingMethod = pParentClass->GetDynamicMethodOrInterfaceMethod( pUserProc );
-        if( !pCompilingMethod ){
-            pCompilingMethod = pParentClass->GetStaticMethods().GetMethodPtr( pUserProc );
-            if( !pCompilingMethod ){
-                compiler.errorMessenger.OutputFatalError();
-            }
-        }
-    }
-    else{
-        pCompilingMethod = NULL;
     }
 }

trunk/ab5.0/abdev/compiler_x86/Compile_Var.cpp

@@ -480 +480 @@
         //Const修飾子のメソッド内でメンバ書き込みアクセスが発生したとき
         //（コンストラクタ、デストラクタ内を除く）
-        const CMethod *pMethod = compiler.GetObjectModule().meta.GetClasses().GetNowCompilingMethodInfo();
+        const CMethod *pMethod = &compiler.GetCompilingUserProc().GetMethod();
         if( isWriteAccess &&
             pMethod->IsConst() &&