Changeset 409 in dev for trunk/abdev/BasicCompiler_Common/VarList.cpp

Timestamp:

Mar 3, 2008, 6:33:29 PM (17 years ago)

Author:

dai_9181

Message:

クラス継承を行う際、dynamicMembersの中身をコピーする方式をやめ、基底クラスのものを参照するように修正した。

File:

• trunk/abdev/BasicCompiler_Common/VarList.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/VarList.cpp

@@ -160 +160 @@
     TreeView_InsertItem(hVarTree,lptv);
 }
-void VarList_Member(HWND hVarTree,HTREEITEM hParent,LONG_PTR pTopOffset,const CClass &objClass,BOOL bPtr){
+void VarList_Member(HWND hVarTree,HTREEITEM hParent,LONG_PTR pTopOffset,const CClass &objClass,BOOL bPtr)
+{
     char VarData[VN_SIZE],VarName[VN_SIZE];
+    if( objClass.HasSuperClass() )
+    {
+        TV_INSERTSTRUCT tv;
+
+        memset(&tv,0,sizeof(TV_INSERTSTRUCT));
+        tv.hInsertAfter=TVI_LAST;
+        tv.item.mask=TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE;
+        tv.hParent=hParent;
+        tv.item.pszText=VarData;
+
+        // 基底クラス
+        sprintf(tv.item.pszText,"Inherits %s",objClass.GetSuperClass().GetName().c_str());
+        tv.item.iImage=1;
+        tv.item.iSelectedImage=1;
+        HTREEITEM hTempParent=TreeView_InsertItem(hVarTree,&tv);
+
+        VarList_Member(hVarTree,hTempParent,pTopOffset,objClass.GetSuperClass(),0);
+    }
+
     TV_INSERTSTRUCT tv;
 
@@ -181 +201 @@
 
         LONG_PTR offset;
-        int i2;
-        offset=objClass.GetMemberOffset( pMember->GetName().c_str(), &i2 );
+        offset=objClass.GetMemberOffset( pMember->GetName().c_str() );
 
         if( pMember->GetSubscripts().size() > 0 ){
@@ -435 +454 @@
     ReadProcessMemory(hDebugProcess,(void *)lpData,&pThis,sizeof(LONG_PTR),&accessBytes);
 
+    if( pUserProc->GetParentClassPtr()->HasSuperClass() )
+    {
+        TV_INSERTSTRUCT tv;
+
+        memset(&tv,0,sizeof(TV_INSERTSTRUCT));
+        tv.hInsertAfter=TVI_LAST;
+        tv.item.mask=TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE;
+        tv.hParent=NULL;
+        tv.item.pszText=temporary;
+
+        // 基底クラス
+        sprintf(tv.item.pszText,"Inherits %s",pUserProc->GetParentClassPtr()->GetSuperClass().GetName().c_str());
+        tv.item.iImage=1;
+        tv.item.iSelectedImage=1;
+        HTREEITEM hTempParent=TreeView_InsertItem(hVarTree_This,&tv);
+
+        VarList_Member(hVarTree_This,hTempParent,pThis,pUserProc->GetParentClassPtr()->GetSuperClass(),0);
+    }
+
     BOOST_FOREACH( CMember *pMember, pUserProc->GetParentClassPtr()->GetDynamicMembers() ){
-        offset=pUserProc->GetParentClassPtr()->GetMemberOffset( pMember->GetName().c_str(),&i2);
+        offset=pUserProc->GetParentClassPtr()->GetMemberOffset( pMember->GetName().c_str());
 
         if( pMember->GetSubscripts().size() > 0 ){