Changeset 73 in dev for BasicCompiler64/OperatorProc.cpp

Timestamp:

Mar 16, 2007, 11:07:14 PM (18 years ago)

Author:

dai_9181

Message:

Parameterクラスを適用。32bit側は動くようになったので、64bitのほうを調整する。

File:

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

BasicCompiler64/OperatorProc.cpp

@@ -23 +23 @@
 
     //call free
-    extern SUBINFO *pSub_free;
+    extern SubInfo *pSub_free;
     op_call(pSub_free);
 }
@@ -32 +32 @@
     pobj_c=(CClass *)index_stack[sp-2];
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_c->EnumMethod( idCalc, subs );
     if( subs.size() == 0 ){
@@ -84 +84 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=OverloadSolution(temporary,subs,ppi,iParmNum,pBaseTypeInfo);
 
@@ -94 +94 @@
     else{
         //オーバーロードされていないが、パラメータ個数が一致しないとき
-        if(iParmNum!=psi->ParmNum){
+        if(iParmNum!=psi->params.size()){
             HeapDefaultFree(ppi);
             return -1;
@@ -102 +102 @@
     for(i=0;i<iParmNum;i++){
         CheckDifferentType(
-            psi->pParmInfo[i].type,
-            psi->pParmInfo[i].u.index,
+            psi->params[i]->GetBasicType(),
+            psi->params[i]->GetIndex(),
             ppi[i].type,
             ppi[i].u.index,
@@ -113 +113 @@
 
     if(bTwoTerm){
-        if(psi->pRealParmInfo[1].type==DEF_STRUCT&&psi->pRealParmInfo[1].bByVal){
+        if( psi->realParams[1]->IsStruct() && psi->realParams[1]->IsRef() == false ){
             //一時オブジェクトはメソッド内で破棄される
             bUseHeap[sp-1]=0;
@@ -137 +137 @@
 
             //call calloc
-            extern SUBINFO *pSub_calloc;
+            extern SubInfo *pSub_calloc;
             op_call(pSub_calloc);
 
@@ -154 +154 @@
         SetOneTermToReg_Whole64Calc(type[sp-1],&reg2);
         pobj_reg->UnlockReg();
-        if( !psi->pRealParmInfo[1].bByVal ){
+        if( !psi->realParams[1]->IsRef() == false ){
             //一時参照を作成
             pobj_sf->push( reg2 );
@@ -253 +253 @@
 
     if(bTwoTerm){
-        if( !psi->pRealParmInfo[1].bByVal ){
+        if( !psi->realParams[1]->IsRef() == false ){
             //一時参照を破棄
             pobj_sf->pop();
@@ -341 +341 @@
 void CallIndexerGetterProc(int reg,CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_Class->EnumMethod( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){