Changeset 140 in dev for BasicCompiler_Common/WatchList.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

BasicCompiler_Common/WatchList.cpp

@@ -104 +104 @@
 
 int Debugging_GetMember( const CClass &objClass,char *member,RELATIVE_VAR *pRelativeVar, Type &resultType, BOOL bPrivateAccess){
-    int i,i2;
+    int i2;
 
     //直接参照に切り替え
@@ -124 +124 @@
     ////////////////////////////
 
-    int offset = objClass.GetMemberOffset( VarName, &i );
-    if(i==objClass.iMemberNum) return 0;
+    int memberIndex;
+    int offset = objClass.GetMemberOffset( VarName, &memberIndex );
+    if(memberIndex==objClass.GetDynamicMembers().size()) return 0;
+
+    CMember *pMember = objClass.GetDynamicMembers()[memberIndex];
 
 
     //アクセシビリティをチェック
-    if(( bPrivateAccess==0 && objClass.ppobj_Member[i]->IsPrivate() )||
-        objClass.ppobj_Member[i]->IsNoneAccess() ){
+    if(( bPrivateAccess==0 && pMember->IsPrivate() )||
+        pMember->IsNoneAccess() ){
         return 0;
     }
-    else if(bPrivateAccess==0&&objClass.ppobj_Member[i]->IsProtected())
+    else if(bPrivateAccess==0&&pMember->IsProtected())
         return 0;
 
-    resultType = objClass.ppobj_Member[i]->GetType();
+    resultType = pMember->GetType();
 
     //ポインタ変数の場合
     if( resultType.IsPointer() ){
-        if(objClass.ppobj_Member[i]->SubScripts[0]==-1){
+        if(pMember->SubScripts[0]==-1){
             lstrcpy(lpPtrOffset,array);
             array[0]=0;
@@ -154 +157 @@
         //配列オフセット
         i2=Debugging_GetArray(
-            objClass.ppobj_Member[i]->SubScripts,
+            pMember->SubScripts,
             array,
             resultType,
@@ -167 +170 @@
         }
     }
-    else if(objClass.ppobj_Member[i]->SubScripts[0]!=-1){
+    else if(pMember->SubScripts[0]!=-1){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
     }
@@ -209 +212 @@
         }
 
-        i2=Debugging_GetMember(objClass.ppobj_Member[i]->GetType().GetClass(),
+        i2=Debugging_GetMember(pMember->GetType().GetClass(),
             NestMember,
             pRelativeVar,
@@ -322 +325 @@
 int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, int *pss){
     extern HANDLE hDebugProcess;
-    int i,i2,i3;
+    int i2,i3;
     char member[VN_SIZE],VarName[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
     LONG_PTR lpData;
@@ -339 +342 @@
     /////////////////
     if( UserProc::IsLocalAreaCompiling() ){
-        const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( VarName );
+        const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( Symbol( VarName ) );
 
         if( pVar ){
@@ -379 +382 @@
             //クラス内メンバを参照するとき（通常）
 
-            for(i=0;i<pobj_CompilingClass->iMemberNum;i++){
-                if( pobj_CompilingClass->ppobj_Member[i]->GetName() == VarName ){
+            bool isFound = false;
+            BOOST_FOREACH( CMember *pMember, pobj_CompilingClass->GetDynamicMembers() ){
+                if( pMember->GetName() == VarName ){
+                    isFound = true;
                     break;
                 }
             }
-            if(i==pobj_CompilingClass->iMemberNum) goto NonClassMember;
+            if( !isFound ) goto NonClassMember;
         }