Changeset 135 in dev for BasicCompiler32

Timestamp:

Jun 6, 2007, 12:58:40 AM (17 years ago)

Author:

dai_9181

Message:

Method/Memberのリファクタリング

Location:

BasicCompiler32

Files:

• BasicCompiler.vcproj (modified) (3 diffs)
• Compile_Calc.cpp (modified) (1 diff)
• Compile_CallProc.cpp (modified) (3 diffs)
• Compile_Object.cpp (modified) (3 diffs)
• Compile_ProcOp.cpp (modified) (1 diff)
• Compile_Statement.cpp (modified) (1 diff)
• Compile_Var.cpp (modified) (4 diffs)
• NumOpe.cpp (modified) (1 diff)
• OperatorProc.cpp (modified) (3 diffs)

BasicCompiler32/BasicCompiler.vcproj

@@ -1822 +1822 @@
                     Name="Meta Parts"
                     >
+                    <File
+                        RelativePath="..\BasicCompiler_Common\src\Member.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\src\Method.cpp"
+                        >
+                    </File>
                     <File
                         RelativePath="..\BasicCompiler_Common\src\Namespace.cpp"
@@ -1956 +1964 @@
                     </File>
                     <File
-                        RelativePath="..\BasicCompiler_Common\include\Prototype.h"
-                        >
-                    </File>
-                    <File
                         RelativePath="..\BasicCompiler_Common\Type.h"
                         >
@@ -1971 +1975 @@
                         >
                     </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

BasicCompiler32/Compile_Calc.cpp

@@ -622 +622 @@
         // Blittable型をオブジェクトとして扱う
         vector<UserProc *> userProcs;
-        Smoothie::Meta::blittableTypes.GetClass( calcType ).EnumStaticMethod( "_Create", userProcs );
+        Smoothie::Meta::blittableTypes.GetClass( calcType ).GetStaticMethods().EnumStatic( "_Create", userProcs );
         if( userProcs.size() != 1 ){
             SetError();

BasicCompiler32/Compile_CallProc.cpp

@@ -113 +113 @@
     bool isStatic = false;
     const CClass *pobj_c = NULL;
-    CMethod *pMethod = NULL;
+    const CMethod *pMethod = NULL;
     if( pUserProc->GetParentClassPtr() ){
         //クラスのメンバ関数を呼び出す場合はアクセスチェックを行う
@@ -153 +153 @@
         /////////////////////////////////
         pMethod = NULL;
-        if( ! isStatic ) pMethod = pobj_c->GetMethodInfo( pUserProc );
+        if( ! isStatic ) pMethod = pobj_c->GetMethods().GetMethodPtr( pUserProc );
         if( ! pMethod ){
             //動的メソッドが取得できなかったときは静的メソッドを当たる
-            pMethod = pobj_c->GetStaticMethodInfo( pUserProc );
+            pMethod = pobj_c->GetStaticMethods().GetMethodPtr( pUserProc );
             if( !pMethod ){
                 SetError(300,NULL,cp);
@@ -276 +276 @@
             else{
                 RELATIVE_VAR RelativeVar;
-                if( pMethod->isConst ){
+                if( pMethod->IsConst() ){
                     //Constアクセスが可能なメソッドの場合
                     if( !GetVarOffsetReadOnly( ObjectName, &RelativeVar, Type() ) ){

BasicCompiler32/Compile_Object.cpp

@@ -36 +36 @@
 
     std::vector<UserProc *> subs;
-    pobj_c->EnumMethod( pobj_c->GetName().c_str(), subs );
+    pobj_c->GetMethods().Enum( pobj_c->GetName().c_str(), subs );
 
     UserProc *pUserProc;
@@ -56 +56 @@
         // obj._System_SetType( _System_TypeBase.Search( strNamespace, name ) )
         subs.clear();
-        pobj_c->EnumMethod( "_System_SetType", subs );
+        pobj_c->GetMethods().Enum( "_System_SetType", subs );
         if( subs.size() == 1 ){
             char temporary[VN_SIZE];
@@ -208 +208 @@
 
 
-    CMethod *method = classObj.GetDestructorMethod();
+    const CMethod *method = classObj.GetDestructorMethod();
     if( method == NULL ) return;
 

BasicCompiler32/Compile_ProcOp.cpp

@@ -599 +599 @@
                     基底クラスのデストラクタを呼び出す */
 
-                CMethod *method = pobj_CompilingClass->pobj_InheritsClass->GetDestructorMethod();
+                const CMethod *method = pobj_CompilingClass->pobj_InheritsClass->GetDestructorMethod();
                 if( method ){
                     Opcode_CallProc("",

BasicCompiler32/Compile_Statement.cpp

@@ -1075 +1075 @@
                 if(type1.IsObject()){
                     std::vector<UserProc *> subs;
-                    type1.GetClass().EnumMethod( CALC_EQUAL, subs );
+                    type1.GetClass().GetMethods().Enum( CALC_EQUAL, subs );
                     if( subs.size() == 0 ){
                         return;

BasicCompiler32/Compile_Var.cpp

@@ -445 +445 @@
 
             for(i=0;i<pobj_CompilingClass->iMemberNum;i++){
-                if(lstrcmp(VarName,pobj_CompilingClass->ppobj_Member[i]->name)==0) break;
+                if( pobj_CompilingClass->ppobj_Member[i]->GetName() == VarName ){
+                    break;
+                }
             }
             if(i==pobj_CompilingClass->iMemberNum) goto NonClassMember;
@@ -452 +454 @@
         //Const修飾子のメソッド内でメンバ書き込みアクセスが発生したとき
         //（コンストラクタ、デストラクタ内を除く）
-        CMethod *pMethod = pobj_DBClass->GetNowCompilingMethodInfo();
+        const CMethod *pMethod = pobj_DBClass->GetNowCompilingMethodInfo();
         if( isWriteAccess &&
-            pMethod->isConst &&
+            pMethod->IsConst() &&
             pobj_CompilingClass->IsCompilingConstructor() == false &&
             pobj_CompilingClass->IsCompilingDestructor() == false
@@ -750 +752 @@
                 i=GetOneParameter(InitBuf,i,temporary);
 
-                i3=objClass.GetMemberOffset( objClass.ppobj_Member[i2]->name, NULL );
+                i3=objClass.GetMemberOffset( objClass.ppobj_Member[i2]->GetName().c_str(), NULL );
 
                 if(!SetInitGlobalData(offset+i3,
@@ -886 +888 @@
                 i=GetOneParameter(InitBuf,i,temporary);
 
-                i3=objClass.GetMemberOffset( objClass.ppobj_Member[i2]->name, NULL );
+                i3=objClass.GetMemberOffset( objClass.ppobj_Member[i2]->GetName().c_str(), NULL );
 
                 if(!InitLocalVar(offset+i3,

BasicCompiler32/NumOpe.cpp

@@ -181 +181 @@
     GetVarFormatString(methodName,parameter,lpPtrOffset,dummy,refType);
 
-    objClass.EnumMethod( methodName, userProcs );
+    objClass.GetMethods().Enum( methodName, userProcs );
     UserProc *pUserProc;
     if(userProcs.size()){

BasicCompiler32/OperatorProc.cpp

@@ -5 +5 @@
     if(!IsSafeReg(reg)) SetError(300,NULL,cp);
 
-    CMethod *method = pobj_c->GetDestructorMethod();
+    const CMethod *method = pobj_c->GetDestructorMethod();
     if( method ){
         //push reg
@@ -28 +28 @@
 
     std::vector<UserProc *> subs;
-    pobj_c->EnumMethod( idCalc, subs );
+    pobj_c->GetMethods().Enum( idCalc, subs );
     if( subs.size() == 0 ){
         return 0;
@@ -250 +250 @@
 void CallIndexerGetterProc(const CClass *pobj_Class,char *ObjectName,char *Parameter,Type &resultType){
     std::vector<UserProc *> subs;
-    pobj_Class->EnumMethod( CALC_ARRAY_GET, subs );
+    pobj_Class->GetMethods().Enum( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){
         return;