Changeset 140 in dev for BasicCompiler_Common/DebugMiddleFile.cpp

Timestamp:

Jun 15, 2007, 4:00:25 AM (17 years ago)

Author:

dai_9181

Message:

traceログ機能を搭載
動的メンバをstl::vectorにまとめた
シンボルをクラス化した

File:

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

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -50 +50 @@
 void CDebugSection::make(void){
     extern INCLUDEFILEINFO IncludeFileInfo;
-    int i2,i3,i4,i5,BufferSize;
+    int i2,i3,i5,BufferSize;
 
     if(buffer){
@@ -324 +324 @@
 
         //メンバ
-        *(long *)(buffer+i2)=pobj_c->iMemberNum;
-        i2+=sizeof(long);
-        for(i4=0;i4<pobj_c->iMemberNum;i4++){
+        *(long *)(buffer+i2)=(int)pobj_c->dynamicMembers.size();
+        i2+=sizeof(long);
+        foreach( CMember *member, pobj_c->dynamicMembers ){
             // 名前
-            lstrcpy(buffer+i2,pobj_c->ppobj_Member[i4]->GetName().c_str());
+            lstrcpy(buffer+i2,member->GetName().c_str());
             i2+=lstrlen(buffer+i2)+1;
 
             // 型
-            *(long *)(buffer+i2)=pobj_c->ppobj_Member[i4]->GetType().GetBasicType();
+            *(long *)(buffer+i2)=member->GetType().GetBasicType();
             i2+=sizeof(long);
 
             // 型の拡張情報
-            SetLpIndex_DebugFile(buffer,&i2,pobj_c->ppobj_Member[i4]->GetType());
+            SetLpIndex_DebugFile(buffer,&i2,member->GetType());
 
             // アクセシビリティ
-            *(Prototype::Accessibility *)(buffer+i2)=pobj_c->ppobj_Member[i4]->GetAccessibility();
+            *(Prototype::Accessibility *)(buffer+i2)=member->GetAccessibility();
             i2+=sizeof(Prototype::Accessibility);
 
-            memcpy(buffer+i2,pobj_c->ppobj_Member[i4]->SubScripts,sizeof(int)*MAX_ARRAYDIM);
+            memcpy(buffer+i2,member->SubScripts,sizeof(int)*MAX_ARRAYDIM);
             i2+=sizeof(int)*MAX_ARRAYDIM;
 
@@ -705 +705 @@
         i2+=sizeof(long);
 
-        //メンバ
-        pobj_c->iMemberNum=*(long *)(buffer+i2);
-        i2+=sizeof(long);
-        pobj_c->ppobj_Member=
-            (CMember **)HeapAlloc(hHeap,0,pobj_c->iMemberNum*sizeof(CMember *));
-        for(i4=0;i4<pobj_c->iMemberNum;i4++){
-
+        //静的メンバ
+        int nDynamicMember = *(long *)(buffer+i2);
+        i2+=sizeof(long);
+        for( i4=0; i4<nDynamicMember; i4++ ){
             // 名前
             string name = (char *)(buffer+i2);
@@ -727 +724 @@
             i2+=sizeof(Prototype::Accessibility);
 
-            pobj_c->ppobj_Member[i4]=new CMember( accessibility, name, type, false );
-
-            memcpy(pobj_c->ppobj_Member[i4]->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
+            CMember *member=new CMember( accessibility, name, type, false );
+
+            memcpy(member->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
             i2+=sizeof(int)*MAX_ARRAYDIM;
+
+            pobj_c->dynamicMembers.push_back( member );
         }