Changeset 51 in dev for BasicCompiler64/Compile_ProcOp.cpp

Timestamp:

Feb 10, 2007, 8:30:19 PM (18 years ago)

Author:

dai_9181

Message:

ppobj_Member及びppobj_StaticMemberを廃止し、vectorに統一した（methods及びstaticMethods）。

File:

• BasicCompiler64/Compile_ProcOp.cpp (modified) (10 diffs)

BasicCompiler64/Compile_ProcOp.cpp

@@ -209 +209 @@
     extern SUBINFO **ppSubHash;
     extern BOOL bDebugCompile;
-    int i3,i4,i5,VarSize,BufferSize;
+    int i3,i4,VarSize,BufferSize;
     char temporary[VN_SIZE];
 
@@ -466 +466 @@
         if(psi->ReturnType==DEF_OBJECT && psi->isReturnRef == false){
             //戻り値用オブジェクトのコンストラクタを呼び出す
-            if(psi->u.Return_pobj_c->ConstructorMemberSubIndex!=-1){
+            if( psi->u.Return_pobj_c->GetConstructorMethod() ){
                 sprintf(temporary,"%s.%s()",temp,psi->u.Return_pobj_c->name);
                 OpcodeOthers(temporary);
@@ -517 +517 @@
             BOOL bThisIsSuperClass;
             if(pobj_CompilingClass->pobj_InheritsClass==0) bThisIsSuperClass=1;
-            else if(pobj_CompilingClass->pobj_InheritsClass->ConstructorMemberSubIndex==-1){
+            else if( pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod() == NULL ){
                 //インターフェイスを継承したときはコンストラクタを持たない
                 bThisIsSuperClass=1;
@@ -552 +552 @@
                     RemoveStringPare(temporary);
 
-                    i3=pobj_CompilingClass->pobj_InheritsClass->ConstructorMemberSubIndex;
                     Opcode_CallProc(temporary,
-                        pobj_CompilingClass->ppobj_Method[i3]->psi,
+                        pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->psi,
                         0,
                         "",
@@ -561 +560 @@
                 else{
                     //基底クラスのコンストラクタを暗黙的に呼び出す
-                    i3=pobj_CompilingClass->pobj_InheritsClass->ConstructorMemberSubIndex;
                     Opcode_CallProc("",
-                        pobj_CompilingClass->ppobj_Method[i3]->psi,
+                        pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->psi,
                         0,
                         "",
@@ -588 +586 @@
 
                 if(pMember->TypeInfo.type==DEF_OBJECT && pMember->IsRef() == false){
-                    if(pMember->TypeInfo.u.pobj_Class->ConstructorMemberSubIndex!=-1){
-                        i5=pMember->TypeInfo.u.pobj_Class->ConstructorMemberSubIndex;
-                        if(pMember->TypeInfo.u.pobj_Class->ppobj_Method[i5]->psi->RealParmNum==1){  //Thisポインタを第一引数に持ち合わせるため、引数なしの場合はこの値が1になる
+                    CMethod *method = pMember->TypeInfo.u.pobj_Class->GetConstructorMethod();
+                    if( method ){
+                        if( method->psi->RealParmNum == 1 ){    //Thisポインタを第一引数に持ち合わせるため、引数なしの場合はこの値が1になる
                             for(i4=0;i4<MemberObjectNum;i4++){
                                 //Thisポインタをrcxにコピー
@@ -599 +597 @@
 
                                 //call constructor
-                                op_call(pMember->TypeInfo.u.pobj_Class->ppobj_Method[i5]->psi);
+                                op_call( method->psi );
                             }
                         }
@@ -662 +660 @@
                     基底クラスのデストラクタを呼び出す */
 
-                i3=pobj_CompilingClass->pobj_InheritsClass->DestructorMemberSubIndex;
-                if(i3!=-1){
+                CMethod *method = pobj_CompilingClass->pobj_InheritsClass->GetDestructorMethod();
+                if( method ){
                     Opcode_CallProc("",
-                        pobj_CompilingClass->ppobj_Method[i3]->psi,
+                        method->psi,
                         0,
                         "",
@@ -689 +687 @@
 
                 if(pMember->TypeInfo.type==DEF_OBJECT && pMember->IsRef() == false){
-                    if(pMember->TypeInfo.u.pobj_Class->DestructorMemberSubIndex!=-1){
+                    CMethod *method = pMember->TypeInfo.u.pobj_Class->GetDestructorMethod();
+                    if( method ){
                         for(i4=MemberObjectNum-1;i4>=0;i4--){
                             //Thisポインタをrcxにコピー
@@ -698 +697 @@
 
                             //call destructor
-                            i5=pMember->TypeInfo.u.pobj_Class->DestructorMemberSubIndex;
-                            op_call(pMember->TypeInfo.u.pobj_Class->ppobj_Method[i5]->psi);
+                            op_call(method->psi);
                         }
                     }