Changeset 204 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jul 3, 2007, 3:49:56 AM (17 years ago)

Author:

dai_9181

Message:

pobj_InheritsClassメンバをprivateにした

Location:

trunk/abdev/BasicCompiler_Common

Files:

• error.cpp (modified) (1 diff)
• src/ClassImpl.cpp (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/error.cpp

@@ -480 +480 @@
                 pobj_tempClass=(CClass *)lpCalcIndex;
                 while(pobj_tempClass&&(!IS_LITERAL((LONG_PTR)pobj_tempClass))){
-                    pobj_tempClass=pobj_tempClass->pobj_InheritsClass;
+                    pobj_tempClass=&pobj_tempClass->GetSuperClass();
 
                     if(lpVarIndex==(LONG_PTR)pobj_tempClass){

trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp

@@ -241 +241 @@
 
     //継承先のクラスをメンバとして保持する
-    pobj_InheritsClass = &inheritsClass;
+    SetSuperClass( &inheritsClass );
 
     return true;
@@ -807 +807 @@
             else{
                 //継承無し
-                pobj_c->pobj_InheritsClass=0;
-
-                //仮想関数の数を初期化
-                pobj_c->SetVtblNum( 0 );
+                if( &pobj_c->GetSuperClass() || pobj_c->GetVtblNum() )
+                {
+                    // TODO: ここに来ないことが実証できたらこの分岐は消す
+                    throw;
+                }
             }
 Interface_InheritsError:
@@ -939 +940 @@
 
             if( pobj_c->GetName() == "Object" || dwClassType == ESC_TYPE ){
-                // 継承無し
-                pobj_c->pobj_InheritsClass = NULL;
-
-                // 仮想関数の数を初期化
-                pobj_c->SetVtblNum( 0 );
+                if( &pobj_c->GetSuperClass() || pobj_c->GetVtblNum() )
+                {
+                    // TODO: ここに来ないことが実証できたらこの分岐は消す
+                    throw;
+                }
             }
             else{
@@ -1243 +1244 @@
         }
 
-        if( objClass.pobj_InheritsClass ){
+        if( objClass.HasSuperClass() ){
             sprintf( temporary
                 , "tempType=Search(\"%s\",\"%s\")"
@@ -1256 +1257 @@
                 , "tempType.SetBaseType(Search(\"%s\",\"%s\"))"
                 , ""                                // 名前空間 (TODO: 実装)
-                , objClass.pobj_InheritsClass->GetName().c_str()    // 基底クラス名
+                , objClass.GetSuperClass().GetName().c_str()    // 基底クラス名
                 );