Changeset 73 in dev for BasicCompiler32/OperatorProc.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

BasicCompiler32/OperatorProc.cpp

@@ -18 +18 @@
 
     //call free
-    extern SUBINFO *pSub_free;
+    extern SubInfo *pSub_free;
     op_call(pSub_free);
 }
@@ -27 +27 @@
     pobj_c=(CClass *)index_stack[sp-2];
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_c->EnumMethod( idCalc, subs );
     if( subs.size() == 0 ){
@@ -42 +42 @@
     BOOL bReturnTypeIsObject=1;
     TYPEINFO ReturnType={DEF_OBJECT,subs[0]->u.ReturnIndex};
-    foreach( SUBINFO *psi, subs ){
+    foreach( SubInfo *psi, subs ){
         if(psi->ReturnType!=DEF_OBJECT)
             bReturnTypeIsObject=0;
@@ -79 +79 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=OverloadSolution(temporary,subs,ppi,iParmNum,pBaseTypeInfo);
 
@@ -88 +88 @@
     else{
         //オーバーロードされていないが、パラメータ個数が一致しないとき
-        if(iParmNum!=psi->ParmNum){
+        if(iParmNum!=psi->params.size()){
             HeapDefaultFree(ppi);
             return -1;
@@ -96 +96 @@
     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,
@@ -109 +109 @@
 
     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;
@@ -128 +128 @@
 
         //call calloc
-        extern SUBINFO *pSub_calloc;
+        extern SubInfo *pSub_calloc;
         op_call(pSub_calloc);
 
@@ -180 +180 @@
         }
 
-        if( !psi->pRealParmInfo[1].bByVal ){
+        if( psi->realParams[1]->IsRef() ){
             //一時参照を作成
 
@@ -203 +203 @@
 
     if(bTwoTerm){
-        if( !psi->pRealParmInfo[1].bByVal ){
+        if( psi->realParams[1]->IsRef() ){
             //一時参照を破棄
             op_pop( REG_NON );
@@ -273 +273 @@
 }
 void CallIndexerGetterProc(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 ){