Changeset 409 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (6 diffs)
• Member.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -221 +221 @@
         , isCompilingDestructor( false )
         , pobj_NextClass( NULL )
+        , cacheSize( 0 )
     {
     }
@@ -239 +240 @@
         , isCompilingDestructor( false )
         , pobj_NextClass( NULL )
+        , cacheSize( 0 )
     {
     }
@@ -423 +425 @@
 
     //重複チェック
-    bool DupliCheckAll(const char *name);
-    bool DupliCheckMember(const char *name);
+    bool DupliCheckAll(const char *name) const;
+    bool DupliCheckMember(const char *name) const;
 
     const Members &GetDynamicMembers() const
@@ -443 +445 @@
     }
     
-    const CMember *FindDynamicMember( const char *memberName ) const
-    {
-        BOOST_FOREACH( CMember *pMember, GetDynamicMembers() )
-        {
-            if( pMember->GetName() == memberName )
-            {
-                return pMember;
-            }
-        }
-        return NULL;
+    const CMember *FindDynamicMember( const char *memberName ) const;
+    bool HasDynamicMember( const char *memberName ) const
+    {
+        return ( FindDynamicMember( memberName ) != NULL );
     }
 
@@ -503 +499 @@
 
     // メンバの総合サイズを取得
+private:
+    int cacheSize;
+public:
     int GetSize() const;
 
     // メンバのオフセットを取得
-    int GetMemberOffset( const char *memberName, int *pMemberNum = NULL ) const;
+    int GetMemberOffset( const char *memberName ) const;
 private:
     // アラインメント値を取得
@@ -531 +530 @@
     bool IsExistVirtualFunctions() const
     {
-        return ( vtblNum > 0 );
+        // 構造体以外は仮想関数を持つ
+        return !IsStructure();
     }
     

trunk/abdev/BasicCompiler_Common/include/Member.h

@@ -61 +61 @@
     }
 
-    bool IsConst()
+    bool IsConst() const
     {
         return isConst;