Changeset 50 in dev for BasicCompiler32/Compile_Object.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler32/Compile_Object.cpp (modified) (3 diffs)

BasicCompiler32/Compile_Object.cpp

@@ -2 +2 @@
 #include "opcode.h"
 
-void CallConstructor(CClass *pobj_c,char *CreateParameter,int ObjectSize,BOOL bSomeObjects){
+void _call_constructor(CClass *pobj_c,char *CreateParameter,int ObjectSize,BOOL bSomeObjects){
     ////////////////////////////
     // コンストラクタの呼び出し
@@ -31 +31 @@
     ////////////////////////
 
-    SUBINFO **ppsi;
+    std::vector<SUBINFO *> subs;
+    pobj_c->EnumMethod( pobj_c->name, subs );
+
     SUBINFO *psi;
-    int num;
-    ppsi=GetOverloadObjectSubHash(pobj_c->name,pobj_c,&num);
-    if(num){
+    if( subs.size() > 0 ){
         //オーバーロードを解決
         psi=OverloadSolutionWithStrParam(pobj_c->name,
-            ppsi,num,CreateParameter,"",NULL);
-        HeapDefaultFree(ppsi);
+            subs,CreateParameter,"",NULL);
 
         if(!psi) return;
@@ -253 +252 @@
     if(ObjectSize[0]) bSomeObjects=1;
     else bSomeObjects=0;
-    CallConstructor(pobj_c,CreateParameter,TypeSize,bSomeObjects);
+    _call_constructor(pobj_c,CreateParameter,TypeSize,bSomeObjects);
 
     return DEF_PTR_OBJECT;