Changeset 50 in dev for BasicCompiler_Common/Class.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler_Common/Class.cpp (modified) (8 diffs)

BasicCompiler_Common/Class.cpp

@@ -142 +142 @@
                 cp=pobj_c->ppobj_StaticMember[i]->source_code_address;
 
-                CallConstractor(temporary,
+                CallConstructor(temporary,
                     pobj_c->ppobj_StaticMember[i]->SubScripts,
                     pobj_c->ppobj_StaticMember[i]->TypeInfo,
@@ -225 +225 @@
     }
 
-    if(ppobj_StaticMethod){
-        //静的メソッド
-        for(i=0;i<iStaticMethodNum;i++){
-            delete ppobj_StaticMethod[i];
-        }
-        HeapDefaultFree(ppobj_StaticMethod);
-        ppobj_StaticMethod=0;
+    foreach( CMethod *method, StaticMethods ){
+        delete method;
     }
 }
@@ -306 +301 @@
 }
 void CClass::AddStaticMethod(SUBINFO *psi,DWORD dwAccess){
-    ppobj_StaticMethod=(CMethod **)HeapReAlloc(hHeap,0,ppobj_StaticMethod,(iStaticMethodNum+1)*sizeof(CMethod *));
-    ppobj_StaticMethod[iStaticMethodNum]=new CMethod();
-    ppobj_StaticMethod[iStaticMethodNum]->psi=psi;
-    ppobj_StaticMethod[iStaticMethodNum]->dwAccess=dwAccess;
-    ppobj_StaticMethod[iStaticMethodNum]->bAbstract=0;
-    ppobj_StaticMethod[iStaticMethodNum]->bVirtual=0;
-    ppobj_StaticMethod[iStaticMethodNum]->pobj_InheritsClass=0;
-
-    iStaticMethodNum++;
+    CMethod *method = new CMethod();
+    method->psi=psi;
+    method->dwAccess=dwAccess;
+    method->bAbstract=0;
+    method->bVirtual=0;
+    method->pobj_InheritsClass=0;
+
+    StaticMethods.push_back( method );
 }
 BOOL CClass::DupliCheckAll(const char *name){
@@ -355 +349 @@
 }
 CMethod *CClass::GetMethodInfo( SUBINFO *psi ){
-    int i;
-    for( i=0; i<iMethodNum; i++ ){
-        if( psi == ppobj_Method[i]->psi ) break;
-    }
-    if( i == iMethodNum ){
-        return NULL;
-    }
-    return ppobj_Method[i];
+    for( int i=iMethodNum-1; i>=0; i-- ){
+        if( psi == ppobj_Method[i]->psi ) return ppobj_Method[i];
+    }
+    return NULL;
 }
 CMethod *CClass::GetStaticMethodInfo( SUBINFO *psi ){
-    int i;
-    for( i=0; i<iStaticMethodNum; i++ ){
-        if( psi == ppobj_StaticMethod[i]->psi ) break;
-    }
-    if( i == iStaticMethodNum ){
-        return NULL;
-    }
-    return ppobj_StaticMethod[i];
+    for( int i=(int)StaticMethods.size()-1; i>=0; i-- ){
+        if( psi == StaticMethods[i]->psi ) return StaticMethods[i];
+    }
+    return NULL;
 }
 bool CClass::IsExistMethod( const char *name ){
@@ -381 +367 @@
 }
 bool CClass::IsExistStaticMethod( const char *name ){
-    for( int i=0; i<iStaticMethodNum; i++ ){
-        if( lstrcmp( ppobj_StaticMethod[i]->psi->name, name ) == 0 ) return true;
+    foreach( CMethod *method, StaticMethods ){
+        if( lstrcmp( method->psi->name, name ) == 0 ) return true;
     }
     return false;
+}
+
+void CClass::EnumStaticMethod( const char *methodName, std::vector<SUBINFO *> &subs ) const
+{
+    foreach( CMethod *method, StaticMethods ){
+        if(lstrcmp(methodName,method->psi->name)==0){
+            subs.push_back( method->psi );
+        }
+    }
+}
+
+void CClass::EnumMethod( const char *methodName, std::vector<SUBINFO *> &subs ) const
+{
+    //オブジェクトのメンバ関数の場合
+    //※オーバーライドされた関数を先にサーチする必要があるため、バックサーチを行う
+    for(int i=iMethodNum-1;i>=0;i--){
+        if(lstrcmp(name,ppobj_Method[i]->psi->name)==0){
+            subs.push_back( ppobj_Method[i]->psi );
+        }
+    }
+}
+
+void CClass::EnumMethod( const BYTE idOperatorCalc, std::vector<SUBINFO *> &subs ) const
+{
+    for(int i=0;i<iMethodNum;i++){
+        char *temp;
+        temp=ppobj_Method[i]->psi->name;
+        if(temp[0]==1&&temp[1]==ESC_OPERATOR){
+            if((BYTE)temp[2]==idOperatorCalc){
+                subs.push_back( ppobj_Method[i]->psi );
+            }
+        }
+    }
 }
 
@@ -465 +484 @@
 
     return false;
-}
-
-
-SUBINFO **CClass::GetOperatorSubInfo(BYTE idCalc,int &num){
-    //格納のための構造体配列を用意
-    SUBINFO **ppArray_si;
-    ppArray_si=(SUBINFO **)HeapAlloc(hHeap,0,sizeof(SUBINFO *)*1024);
-    num=0;
-
-    int i;
-    for(i=0;i<iMethodNum;i++){
-        char *temp;
-        temp=ppobj_Method[i]->psi->name;
-        if(temp[0]==1&&temp[1]==ESC_OPERATOR){
-            if((BYTE)temp[2]==idCalc){
-                ppArray_si[num]=ppobj_Method[i]->psi;
-                num++;
-            }
-        }
-    }
-
-    return ppArray_si;
 }
 
@@ -895 +892 @@
             pobj_c->ppobj_Method=(CMethod **)HeapAlloc(hHeap,0,1);
             pobj_c->iMethodNum=0;
-            pobj_c->ppobj_StaticMethod=(CMethod **)HeapAlloc(hHeap,0,1);
-            pobj_c->iStaticMethodNum=0;
 
             pobj_c->ConstructorMemberSubIndex=-1;
@@ -1057 +1052 @@
             pobj_c->ppobj_Method=(CMethod **)HeapAlloc(hHeap,0,1);
             pobj_c->iMethodNum=0;
-            pobj_c->ppobj_StaticMethod=(CMethod **)HeapAlloc(hHeap,0,1);
-            pobj_c->iStaticMethodNum=0;
 
             pobj_c->ConstructorMemberSubIndex=-1;