Changeset 53 in dev for BasicCompiler_Common/DebugMiddleFile.cpp

Timestamp:

Feb 11, 2007, 12:30:12 AM (18 years ago)

Author:

dai_9181

Message:

ppobj_StaticMemberを廃止し、vectorに統一した（staticMember）。

File:

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

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -382 +382 @@
 
         //静的メンバ
-        *(long *)(buffer+i2)=pobj_c->iStaticMemberNum;
-        i2+=sizeof(long);
-        for(i4=0;i4<pobj_c->iStaticMemberNum;i4++){
-            lstrcpy(buffer+i2,pobj_c->ppobj_StaticMember[i4]->name);
+        *(long *)(buffer+i2)=(long)pobj_c->staticMembers.size();
+        i2+=sizeof(long);
+        foreach( CMember *member, pobj_c->staticMembers ){
+            lstrcpy(buffer+i2,member->name);
             i2+=lstrlen(buffer+i2)+1;
 
-            memcpy(buffer+i2,pobj_c->ppobj_StaticMember[i4]->SubScripts,sizeof(int)*MAX_ARRAYDIM);
+            memcpy(buffer+i2,member->SubScripts,sizeof(int)*MAX_ARRAYDIM);
             i2+=sizeof(int)*MAX_ARRAYDIM;
 
             //型
-            *(long *)(buffer+i2)=pobj_c->ppobj_StaticMember[i4]->TypeInfo.type;
+            *(long *)(buffer+i2)=member->TypeInfo.type;
             i2+=sizeof(long);
 
             //型の拡張情報
-            SetLpIndex_DebugFile(buffer,&i2,pobj_c->ppobj_StaticMember[i4]->TypeInfo.type,pobj_c->ppobj_StaticMember[i4]->TypeInfo.u.lpIndex);
-
-            *(long *)(buffer+i2)=pobj_c->ppobj_StaticMember[i4]->dwAccess;
+            SetLpIndex_DebugFile(buffer,&i2,member->TypeInfo.type,member->TypeInfo.u.lpIndex);
+
+            *(long *)(buffer+i2)=member->dwAccess;
             i2+=sizeof(long);
 
@@ -772 +772 @@
 
         //静的メンバ
-        pobj_c->iStaticMemberNum=*(long *)(buffer+i2);
-        i2+=sizeof(long);
-        pobj_c->ppobj_StaticMember=
-            (CMember **)HeapAlloc(hHeap,0,pobj_c->iStaticMemberNum*sizeof(CMember *));
-        for(i4=0;i4<pobj_c->iStaticMemberNum;i4++){
-            pobj_c->ppobj_StaticMember[i4]=new CMember();
-
-            pobj_c->ppobj_StaticMember[i4]->name=(char *)HeapAlloc(hHeap,0,lstrlen(buffer+i2)+1);
-            lstrcpy(pobj_c->ppobj_StaticMember[i4]->name,buffer+i2);
+        int nStaticMember = *(long *)(buffer+i2);
+        i2+=sizeof(long);
+        for( i4=0; i4<nStaticMember; i4++ ){
+            CMember *member=new CMember();
+
+            member->name=(char *)HeapAlloc(hHeap,0,lstrlen(buffer+i2)+1);
+            lstrcpy(member->name,buffer+i2);
             i2+=lstrlen(buffer+i2)+1;
 
-            memcpy(pobj_c->ppobj_StaticMember[i4]->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
+            memcpy(member->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
             i2+=sizeof(int)*MAX_ARRAYDIM;
 
             //型
-            pobj_c->ppobj_StaticMember[i4]->TypeInfo.type=*(long *)(buffer+i2);
+            member->TypeInfo.type=*(long *)(buffer+i2);
             i2+=sizeof(long);
 
             //型の拡張情報
-            GetLpIndex_DebugFile(buffer,&i2,pobj_c->ppobj_StaticMember[i4]->TypeInfo.type,&pobj_c->ppobj_StaticMember[i4]->TypeInfo.u.lpIndex);
-
-            pobj_c->ppobj_StaticMember[i4]->dwAccess=*(long *)(buffer+i2);
-            i2+=sizeof(long);
+            GetLpIndex_DebugFile(buffer,&i2,member->TypeInfo.type,&member->TypeInfo.u.lpIndex);
+
+            member->dwAccess=*(long *)(buffer+i2);
+            i2+=sizeof(long);
+
+            pobj_c->staticMembers.push_back( member );
         }
     }