Changeset 206 in dev for trunk/abdev/BasicCompiler_Common/WatchList.cpp

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

File:

• trunk/abdev/BasicCompiler_Common/WatchList.cpp (modified) (27 diffs)

trunk/abdev/BasicCompiler_Common/WatchList.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
+
+#include <Compiler.h>
 
 #include "common.h"
@@ -12 +16 @@
 #include "debug.h"
 
-int Debugging_GetArray( const int *SubScripts,char *array,const Type &type,LONG_PTR *plpOffset);
+int Debugging_GetArray( const Subscripts &subscripts,char *array,const Type &type,LONG_PTR *plpOffset);
 
 ULONG_PTR Debugging_GetVarPtr(RELATIVE_VAR *pRelativeVar){
@@ -117 +121 @@
     char lpPtrOffset[VN_SIZE];  //第2次配列
     char NestMember[VN_SIZE];   //入れ子メンバ
-    CClass::RefType refType;
+    ReferenceKind refType;
     lstrcpy(VarName,member);
     if(!GetVarFormatString(VarName,array,lpPtrOffset,NestMember, refType ) ) return 0;
@@ -145 +149 @@
     //ポインタ変数の場合
     if( resultType.IsPointer() ){
-        if(pMember->SubScripts[0]==-1){
+        if( pMember->GetSubscripts().size() == 0 ){
             lstrcpy(lpPtrOffset,array);
             array[0]=0;
@@ -159 +163 @@
         //配列オフセット
         i2=Debugging_GetArray(
-            pMember->SubScripts,
+            pMember->GetSubscripts(),
             array,
             resultType,
@@ -172 +176 @@
         }
     }
-    else if(pMember->SubScripts[0]!=-1){
+    else if( pMember->GetSubscripts().size() > 0 ){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
     }
@@ -180 +184 @@
 
         if( resultType.IsObject() || resultType.IsStruct() ){
-            if( refType != CClass::Dot ) return 0;
+            if( refType != RefDot ) return 0;
 
             if( resultType.IsObject() ){
@@ -195 +199 @@
 
             if(lpPtrOffset[0]){
-                if( refType != CClass::Dot ) return 0;
+                if( refType != RefDot ) return 0;
 
                 //直接参照に切り替え
@@ -203 +207 @@
             }
             else{
-                if( refType != CClass::Pointer ) return 0;
+                if( refType != RefPointer ) return 0;
 
                 extern HANDLE hDebugProcess;
@@ -235 +239 @@
     return 1;
 }
-int Debugging_GetArray( const int *SubScripts,char *array,const Type &type,LONG_PTR *plpOffset){
+int Debugging_GetArray( const Subscripts &subscripts,char *array,const Type &type,LONG_PTR *plpOffset){
     extern HANDLE hHeap;
     int i,i2,i3,i4,i5,array_offset;
@@ -254 +258 @@
         }
         if(array[i]==','||array[i]=='\0'){
-            if(SubScripts[i3]==-1){
+            if( i3 >= (int)subscripts.size() )
+            {
                 for(i3--;i3>=0;i3--) HeapDefaultFree(pParm[i3]);
                 return 0;
@@ -267 +272 @@
 
             if(array[i]=='\0'){
-                if(SubScripts[i3]!=-1){
+                if( i3 < (int)subscripts.size() )
+                {
                     for(i3--;i3>=0;i3--) HeapDefaultFree(pParm[i3]);
                     return 0;
@@ -302 +308 @@
         i5=(int)i64data;
 
-        for(i2=i+1,i4=1;i2<i3;i2++) i4*=SubScripts[i2]+1;
+        for(i2=i+1,i4=1;i2<i3;i2++) i4*=subscripts[i2]+1;
 
         array_offset+=i5*i4;
@@ -316 +322 @@
 }
 ULONG_PTR Debugging_GetThisPtrOffset(LONG_PTR obp_Rip){
-    GlobalProc *pUserProc = GetSubFromObp(obp_Rip);
-
-    BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
+    UserProc *pUserProc = GetSubFromObp(obp_Rip);
+
+    BOOST_FOREACH( Variable *pVar, pUserProc->GetLocalVars() ){
         if( pVar->GetName() == "_System_LocalThis" ){
-            return pVar->offset;
+            return pVar->GetOffsetAddress();
         }
     }
     return 0;
 }
-int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, int *pss){
+int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, Subscripts *pResultSubscripts){
     extern HANDLE hDebugProcess;
     int i2,i3;
@@ -333 +339 @@
 
     lstrcpy(VarName,variable);
-    CClass::RefType refType;
+    ReferenceKind refType;
     GetVarFormatString(VarName,array,lpPtrOffset,member,refType);
 
-    const int *pSubScripts;
+    const Subscripts *pSubscripts;
     bool isArray;
 
@@ -344 +350 @@
     /////////////////
     if( UserProc::IsLocalAreaCompiling() ){
-        const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( Symbol( VarName ) );
+        const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().Find( Symbol( VarName ) );
 
         if( pVar ){
             //ポインタ変数の場合
-            if( pVar->IsPointer() ){
+            if( pVar->GetType().IsPointer() ){
                 if( !pVar->IsArray() ){
                     lstrcpy(lpPtrOffset,array);
@@ -358 +364 @@
             }
 
-            pRelativeVar->offset = pVar->offset;
+            pRelativeVar->offset = pVar->GetOffsetAddress();
             if( pVar->IsRef() ){
                 pRelativeVar->dwKind=VAR_REFLOCAL;
@@ -365 +371 @@
                 pRelativeVar->dwKind=VAR_LOCAL;
             }
-            resultType = *pVar;
+            resultType = pVar->GetType();
             isArray = pVar->IsArray();
-            pSubScripts = pVar->GetSubScriptsPtr();
-        }
-    }
-
-    if(Smoothie::Temp::pCompilingClass){
+            pSubscripts = &pVar->GetSubscripts();
+        }
+    }
+
+    if(compiler.pCompilingClass){
         ///////////////////////
         // クラスメンバの参照
@@ -385 +391 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, compiler.pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -414 +420 @@
         pRelativeVar->dwKind=VAR_DIRECTMEM;
 
-        i3=Debugging_GetMember(*Smoothie::Temp::pCompilingClass,variable,pRelativeVar,resultType,1);
+        i3=Debugging_GetMember(*compiler.pCompilingClass,variable,pRelativeVar,resultType,1);
         if(i3==0){
             //式エラー
@@ -434 +440 @@
         ///////////////////
 
-        const Variable *pVar = globalVars.Find( VarName );
+        const Variable *pVar = compiler.GetMeta().GetGlobalVars().Find( VarName );
         if( !pVar ){
             //一致しないとき
@@ -441 +447 @@
 
         //ポインタ変数の場合
-        if( pVar->IsPointer() ){
+        if( pVar->GetType().IsPointer() ){
             if( !pVar->IsArray() ){
                 lstrcpy(lpPtrOffset,array);
@@ -451 +457 @@
         }
 
-        pRelativeVar->offset=pVar->offset;
+        pRelativeVar->offset=pVar->GetOffsetAddress();
         if(pVar->IsRef()) pRelativeVar->dwKind=VAR_REFGLOBAL;
         else pRelativeVar->dwKind=VAR_GLOBAL;
-        resultType = *pVar;
+        resultType = pVar->GetType();
         isArray = pVar->IsArray();
-        pSubScripts=pVar->GetSubScriptsPtr();
+        pSubscripts = &pVar->GetSubscripts();
     }
 
@@ -463 +469 @@
         //配列の先頭ポインタを示す場合
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
-        if(pss) memcpy(pss,pSubScripts,MAX_ARRAYDIM*sizeof(int));
+        if( pResultSubscripts )
+        {
+            (*pResultSubscripts) = *pSubscripts;
+        }
         return 1;
     }
 
     if(array[0]){
-        i3=Debugging_GetArray(pSubScripts,array,resultType,&pRelativeVar->offset);
+        i3=Debugging_GetArray( *pSubscripts, array,resultType,&pRelativeVar->offset);
         if(i3==0){
             //式エラー
@@ -481 +490 @@
         if( resultType.IsObject() || resultType.IsStruct() ){
             //実態オブジェクトのメンバを参照（obj.member）
-            if( refType != CClass::Dot ){
+            if( refType != RefDot ){
                 return 0;
             }
@@ -499 +508 @@
             if(lpPtrOffset[0]){
                 //pObj[n].member
-                if( refType != CClass::Dot ) return 0;
+                if( refType != RefDot ) return 0;
                 Debugging_SetRelativeOffset(resultType,pRelativeVar,lpPtrOffset);
 
@@ -514 +523 @@
             else{
                 //pObj->member
-                if( refType != CClass::Pointer ) return 0;
+                if( refType != RefPointer ) return 0;
 
                 pRelativeVar->offset=Debugging_GetVarPtr(pRelativeVar);