Changeset 50 in dev for BasicCompiler32/OperatorProc.cpp

Timestamp:

Feb 10, 2007, 5:44:58 PM (18 years ago)

Author:

dai_9181

Message:

オーバーロード解決用の関数保持リストを "SUBINFO " ではなく、"vector<SUBINFO *>" に変更した。

File:

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

BasicCompiler32/OperatorProc.cpp

@@ -26 +26 @@
     pobj_c=(CClass *)index_stack[sp-2];
 
-    SUBINFO **ppsi;
-    int num;
-    ppsi=pobj_c->GetOperatorSubInfo(idCalc,num);
-    if(num==0){
-        HeapDefaultFree(ppsi);
-
+    std::vector<SUBINFO *> subs;
+    pobj_c->EnumMethod( idCalc, subs );
+    if( subs.size() == 0 ){
         return 0;
     }
@@ -43 +40 @@
     int i;
     BOOL bReturnTypeIsObject=1;
-    TYPEINFO ReturnType={DEF_OBJECT,ppsi[0]->u.ReturnIndex};
-    for(i=0;i<num;i++){
-        if(ppsi[i]->ReturnType!=DEF_OBJECT)
+    TYPEINFO ReturnType={DEF_OBJECT,subs[0]->u.ReturnIndex};
+    foreach( SUBINFO *psi, subs ){
+        if(psi->ReturnType!=DEF_OBJECT)
             bReturnTypeIsObject=0;
     }
@@ -83 +80 @@
     else GetCalcName(idCalc,temporary);
     SUBINFO *psi;
-    psi=OverloadSolution(temporary,ppsi,num,ppi,iParmNum,pBaseTypeInfo);
-    HeapDefaultFree(ppsi);
+    psi=OverloadSolution(temporary,subs,ppi,iParmNum,pBaseTypeInfo);
 
     if(!psi){
@@ -263 +259 @@
 }
 void CallIndexerGetterProc(CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
-    SUBINFO **ppsi;
-    int num;
-    ppsi=pobj_Class->GetOperatorSubInfo(CALC_ARRAY_GET,num);
-    if(num==0){
-        HeapDefaultFree(ppsi);
-
+    std::vector<SUBINFO *> subs;
+    pobj_Class->EnumMethod( CALC_ARRAY_GET, subs );
+    if( subs.size() == 0 ){
         return;
     }
 
-    Opcode_CallProc(Parameter,ppsi[0],0,ObjectName,DEF_OBJECT);
-    RetTypeInfo.type=ppsi[0]->ReturnType;
-    RetTypeInfo.u.lpIndex = ppsi[0]->u.ReturnIndex;
-
-    HeapDefaultFree(ppsi);
-}
+    Opcode_CallProc(Parameter,subs[0],0,ObjectName,DEF_OBJECT);
+    RetTypeInfo.type = subs[0]->ReturnType;
+    RetTypeInfo.u.lpIndex = subs[0]->u.ReturnIndex;
+}