Changeset 51 in dev for BasicCompiler_Common/DebugMiddleFile.cpp

Timestamp:

Feb 10, 2007, 8:30:19 PM (17 years ago)

Author:

dai_9181

Message:

ppobj_Member及びppobj_StaticMemberを廃止し、vectorに統一した（methods及びstaticMethods）。

File:

• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (6 diffs)

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -364 +364 @@
 
         //メソッド
-        *(long *)(buffer+i2)=pobj_c->iMethodNum;
-        i2+=sizeof(long);
-        for(i4=0;i4<pobj_c->iMethodNum;i4++){
-            *(long *)(buffer+i2)=pobj_c->ppobj_Method[i4]->dwAccess;
-            i2+=sizeof(long);
-            if(pobj_c->ppobj_Method[i4]->pobj_InheritsClass){
-                lstrcpy(buffer+i2,pobj_c->ppobj_Method[i4]->pobj_InheritsClass->name);
+        *(long *)(buffer+i2)=(long)pobj_c->methods.size();
+        i2+=sizeof(long);
+        foreach( CMethod *method, pobj_c->methods ){
+            *(long *)(buffer+i2)=method->dwAccess;
+            i2+=sizeof(long);
+            if(method->pobj_InheritsClass){
+                lstrcpy(buffer+i2,method->pobj_InheritsClass->name);
                 i2+=lstrlen(buffer+i2)+1;
             }
@@ -377 +377 @@
                 i2+=lstrlen(buffer+i2)+1;
             }
-            lstrcpy(buffer+i2,pobj_c->ppobj_Method[i4]->psi->name);
+            lstrcpy(buffer+i2,method->psi->name);
             i2+=lstrlen(buffer+i2)+1;
         }
@@ -738 +738 @@
 
         //メソッド
-        pobj_c->iMethodNum=*(long *)(buffer+i2);
-        i2+=sizeof(long);
-        pobj_c->ppobj_Method=
-            (CMethod **)HeapAlloc(hHeap,0,pobj_c->iMethodNum*sizeof(CMethod *));
-        for(i4=0;i4<pobj_c->iMethodNum;i4++){
-            pobj_c->ppobj_Method[i4]=new CMethod();
-
-            pobj_c->ppobj_Method[i4]->dwAccess=*(long *)(buffer+i2);
+        int nMethod = *(long *)(buffer+i2);
+        i2+=sizeof(long);
+        for( i4=0; i4<nMethod; i4++ ){
+            CMethod *method = new CMethod();
+
+            method->dwAccess=*(long *)(buffer+i2);
             i2+=sizeof(long);
 
@@ -753 +751 @@
 
             if(szInherits[0])
-                pobj_c->ppobj_Method[i4]->pobj_InheritsClass=pobj_DBClass->check(szInherits);
-            else pobj_c->ppobj_Method[i4]->pobj_InheritsClass=0;
+                method->pobj_InheritsClass=pobj_DBClass->check(szInherits);
+            else method->pobj_InheritsClass=0;
 
             lstrcpy(temp2,buffer+i2);
@@ -760 +758 @@
 
             CClass *pobj_temp_c;
-            pobj_temp_c=pobj_c->ppobj_Method[i4]->pobj_InheritsClass;
+            pobj_temp_c=method->pobj_InheritsClass;
             if(pobj_temp_c==0) pobj_temp_c=pobj_c;
             i5=hash_default(temp2);
@@ -768 +766 @@
                 psi=psi->pNextData;
             }
-            pobj_c->ppobj_Method[i4]->psi=psi;
+            method->psi=psi;
+
+            pobj_c->methods.push_back( method );
         }