Changeset 140 in dev for BasicCompiler_Common/VarList.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

BasicCompiler_Common/VarList.cpp

@@ -155 +155 @@
 }
 void VarList_Member(HWND hVarTree,HTREEITEM hParent,LONG_PTR pTopOffset,const CClass &objClass,BOOL bPtr){
-    int i;
     char VarData[VN_SIZE],VarName[VN_SIZE];
     TV_INSERTSTRUCT tv;
@@ -165 +164 @@
     tv.item.pszText=VarData;
 
-    for(i=0;i<objClass.iMemberNum;i++){
+    BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
         if(bPtr){
             lstrcpy(VarName,"->");
-            lstrcat(VarName,objClass.ppobj_Member[i]->GetName().c_str());
+            lstrcat(VarName,pMember->GetName().c_str());
         }
         else{
             lstrcpy(VarName,".");
-            lstrcat(VarName,objClass.ppobj_Member[i]->GetName().c_str());
+            lstrcat(VarName,pMember->GetName().c_str());
         }
 
         LONG_PTR offset;
         int i2;
-        offset=objClass.GetMemberOffset( objClass.ppobj_Member[i]->GetName().c_str(), &i2 );
-
-        if(objClass.ppobj_Member[i]->SubScripts[0]!=-1){
+        offset=objClass.GetMemberOffset( pMember->GetName().c_str(), &i2 );
+
+        if(pMember->SubScripts[0]!=-1){
             //構造体内の配列
             sprintf(VarData,"%s %s(&H%X)",VarName,STRING_ARRAY,pTopOffset+offset);
@@ -188 +187 @@
             VarList_Array(hVarTree,hParent,
                 pTopOffset+offset,
-                objClass.ppobj_Member[i]->GetType(),
-                objClass.ppobj_Member[i]->SubScripts);
+                pMember->GetType(),
+                pMember->SubScripts);
         }
         else{
@@ -196 +195 @@
                 &tv,
                 VarName,
-                objClass.ppobj_Member[i]->GetType(),
+                pMember->GetType(),
                 pTopOffset+offset);
         }
@@ -323 +322 @@
 }
 void RefreshLocalVar(void){
-    int i,i2,i3,sw;
+    int i2,i3,sw;
     char temporary[VN_SIZE];
     TV_INSERTSTRUCT tv;
@@ -415 +414 @@
     //Thisポインタを取得
     LONG_PTR pThis;
-    const Variable *pVar = pUserProc->localVars.Find( "_System_LocalThis" );
+    const Variable *pVar = pUserProc->localVars.Find( Symbol( "_System_LocalThis" ) );
     if( !pVar ){
         return;
@@ -422 +421 @@
     ReadProcessMemory(hDebugProcess,(void *)lpData,&pThis,sizeof(LONG_PTR),&accessBytes);
 
-    for(i=0;i<pUserProc->GetParentClassPtr()->iMemberNum;i++){
-        offset=pUserProc->GetParentClassPtr()->GetMemberOffset( pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetName().c_str(),&i2);
-
-        if(pUserProc->GetParentClassPtr()->ppobj_Member[i]->SubScripts[0]!=-1){
+    BOOST_FOREACH( CMember *pMember, pUserProc->GetParentClassPtr()->GetDynamicMembers() ){
+        offset=pUserProc->GetParentClassPtr()->GetMemberOffset( pMember->GetName().c_str(),&i2);
+
+        if(pMember->SubScripts[0]!=-1){
             //配列
             sprintf(temporary,"%s %s(&H%X)",
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetName().c_str(),
+                pMember->GetName().c_str(),
                 STRING_ARRAY,
                 (ULONG_PTR)offset);
@@ -437 +436 @@
             VarList_Array(hVarTree_This,hParent,
                 pThis+offset,
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetType(),
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->SubScripts);
+                pMember->GetType(),
+                pMember->SubScripts);
         }
         else{
             VarList_Insert(hVarTree_This,&tv,
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetName().c_str(),
-                pUserProc->GetParentClassPtr()->ppobj_Member[i]->GetType(),
+                pMember->GetName().c_str(),
+                pMember->GetType(),
                 pThis+offset);
         }