Changeset 75 in dev for BasicCompiler32/OperatorProc.cpp

Timestamp:

Mar 20, 2007, 4:36:16 AM (17 years ago)

Author:

dai_9181

Message:

TYPEINFO→Typeへのリファクタリングを実施。64bitはほぼ完了。32bitが全般的に未完成。

File:

• BasicCompiler32/OperatorProc.cpp (modified) (16 diffs)

BasicCompiler32/OperatorProc.cpp

@@ -11 +11 @@
 
         //call DestructorProcAddr
-        op_call( method->psi );
+        op_call( method->pUserProc );
     }
 
@@ -18 +18 @@
 
     //call free
-    extern SubInfo *pSub_free;
+    extern UserProc *pSub_free;
     op_call(pSub_free);
 }
 
-int CallOperatorProc(int idCalc,TYPEINFO *pBaseTypeInfo,int *type,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp){
+int CallOperatorProc(int idCalc,Type *pBaseTypeInfo,int *type,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp){
     //オーバーロードされたオペレータ関数を呼び出す
     CClass *pobj_c;
     pobj_c=(CClass *)index_stack[sp-2];
 
-    std::vector<SubInfo *> subs;
+    std::vector<UserProc *> subs;
     pobj_c->EnumMethod( idCalc, subs );
     if( subs.size() == 0 ){
@@ -41 +41 @@
     int i;
     BOOL bReturnTypeIsObject=1;
-    TYPEINFO ReturnType={DEF_OBJECT,subs[0]->u.ReturnIndex};
-    foreach( SubInfo *psi, subs ){
-        if(psi->ReturnType!=DEF_OBJECT)
+    Type ReturnType={DEF_OBJECT,subs[0]->ReturnType().GetIndex()};
+    foreach( UserProc *pUserProc, subs ){
+        if(pUserProc->ReturnType().IsObject())
             bReturnTypeIsObject=0;
     }
@@ -61 +61 @@
     /////////////////////////////////////////////
 
-    PARAMETER_INFO *ppi = (PARAMETER_INFO *)HeapAlloc(hHeap,0,sizeof(PARAMETER_INFO)*3);
-    int iParmNum=0;
-
-    if(bTwoTerm){
-        ppi[iParmNum].bArray=0;
-        ppi[iParmNum].bByVal=0;
-        ppi[iParmNum].name=0;
-        ppi[iParmNum].type=type[sp-1];
-        ppi[iParmNum].u.index=index_stack[sp-1];
-        ppi[iParmNum].SubScripts[0]=-1;
-        iParmNum++;
-    }
-
+    Parameters params;
+
+    if(bTwoTerm){
+        params.push_back( new Parameter( "", Type( type[sp-1], index_stack[sp-1] ) ) );
+    }
 
     //オーバーロードを解決
@@ -79 +71 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    SubInfo *psi;
-    psi=OverloadSolution(temporary,subs,ppi,iParmNum,pBaseTypeInfo);
-
-    if(!psi){
-        HeapDefaultFree(ppi);
+    Type returnType;
+    if( pBaseTypeInfo ){
+        returnType.SetBasicType( pBaseTypeInfo->type );
+        returnType.SetIndex( pBaseTypeInfo->u.lpIndex );
+    }
+    UserProc *pUserProc = OverloadSolution( temporary, subs, params, returnType );
+
+    if(!pUserProc){
+        if(bTwoTerm){
+            delete params[0];
+        }
         return -1;
     }
     else{
         //オーバーロードされていないが、パラメータ個数が一致しないとき
-        if(iParmNum!=psi->params.size()){
-            HeapDefaultFree(ppi);
+        if(params.size()!=pUserProc->Params().size()){
+            if(bTwoTerm){
+                delete params[0];
+            }
             return -1;
         }
     }
 
-    for(i=0;i<iParmNum;i++){
+    for(i=0;i<(int)params.size();i++){
         CheckDifferentType(
-            psi->params[i]->GetBasicType(),
-            psi->params[i]->GetIndex(),
-            ppi[i].type,
-            ppi[i].u.index,
+            pUserProc->Params()[i]->GetBasicType(),
+            pUserProc->Params()[i]->GetIndex(),
+            params[i]->GetBasicType(),
+            params[i]->GetIndex(),
             "",
             i);
     }
 
-    HeapDefaultFree(ppi);
+    if(bTwoTerm){
+        delete params[0];
+    }
 
     int right_side_size = GetTypeSize(type[sp-1],index_stack[sp-1]);
 
     if(bTwoTerm){
-        if( psi->realParams[1]->IsStruct() &&psi->realParams[1]->IsRef() == false ){
+        if( pUserProc->RealParams()[1]->IsStruct() &&pUserProc->RealParams()[1]->IsRef() == false ){
             //一時オブジェクトはメソッド内で破棄される
             bUseHeap[sp-1]=0;
@@ -116 +118 @@
 
 
-    if(psi->ReturnType==DEF_STRUCT){
+    if( pUserProc->ReturnType().IsStruct() ){
         //////////////////////////////////////////////////////
         // 戻り値に構造体インスタンスを持つ場合
@@ -122 +124 @@
         //////////////////////////////////////////////////////
 
-        int object_size = psi->u.Return_pobj_c->GetSize();
+        int object_size = pUserProc->ReturnType().GetClass().GetSize();
 
         //push object_size
@@ -128 +130 @@
 
         //call calloc
-        extern SubInfo *pSub_calloc;
+        extern UserProc *pSub_calloc;
         op_call(pSub_calloc);
 
@@ -180 +182 @@
         }
 
-        if( psi->realParams[1]->IsRef() ){
+        if( pUserProc->RealParams()[1]->IsRef() ){
             //一時参照を作成
 
@@ -191 +193 @@
     }
 
-    if(psi->ReturnType==DEF_STRUCT){
+    if( pUserProc->ReturnType().IsStruct() ){
         //push ebx
         op_push(REG_EBX);
@@ -200 +202 @@
 
     //call operator_proc
-    op_call(psi);
-
-    if(bTwoTerm){
-        if( psi->realParams[1]->IsRef() ){
+    op_call(pUserProc);
+
+    if(bTwoTerm){
+        if( pUserProc->RealParams()[1]->IsRef() ){
             //一時参照を破棄
             op_pop( REG_NON );
@@ -209 +211 @@
     }
 
-    if(psi->ReturnType!=DEF_NON){
+    if( !pUserProc->ReturnType().IsNull() ){
         //スタックへプッシュ
-        PushReturnValue(psi->ReturnType);
+        PushReturnValue(pUserProc->ReturnType().GetBasicType());
     }
 
@@ -222 +224 @@
 
     sp--;
-    type[sp-1]=psi->ReturnType;
-    index_stack[sp-1]=psi->u.ReturnIndex;
-
-    if(psi->ReturnType==DEF_STRUCT){
+    type[sp-1]=pUserProc->ReturnType().GetBasicType();
+    index_stack[sp-1]=pUserProc->ReturnType().GetIndex();
+
+    if( pUserProc->ReturnType().IsStruct() ){
         //構造体が戻ったときはヒープ領域にインスタンスが格納されている
         //※後にfreeする必要あり
@@ -254 +256 @@
     array_bUseHeap[1]=0;
 
-    TYPEINFO BaseTypeInfo={ToType,lpToIndex};
+    Type BaseTypeInfo={ToType,lpToIndex};
 
     int iRet;
@@ -272 +274 @@
     SetError(-1,"キャスト演算子がオーバーロードされていません。",cp);
 }
-void CallIndexerGetterProc(CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
-    std::vector<SubInfo *> subs;
+void CallIndexerGetterProc(CClass *pobj_Class,char *ObjectName,char *Parameter,Type &RetTypeInfo){
+    std::vector<UserProc *> subs;
     pobj_Class->EnumMethod( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){
@@ -280 +282 @@
 
     Opcode_CallProc(Parameter,subs[0],0,ObjectName,DEF_OBJECT);
-    RetTypeInfo.type = subs[0]->ReturnType;
-    RetTypeInfo.u.lpIndex = subs[0]->u.ReturnIndex;
-}
+    RetTypeInfo.type = subs[0]->ReturnType().GetBasicType();
+    RetTypeInfo.u.lpIndex = subs[0]->ReturnType().GetIndex();
+}