Changeset 632 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/Class.h

Timestamp:

Jun 5, 2008, 10:04:39 PM (16 years ago)

Author:

dai_9181

Message:

ジェネリッククラスの型パラメータに値型が指定されたときに限り、テンプレート展開を行うようにした。

TODO: libファイルを跨ってテンプレート展開ができていないため、ソースコード管理部分に手を加える必要あり。

File:

• trunk/ab5.0/abdev/ab_common/include/Lexical/Class.h (modified) (8 diffs)

trunk/ab5.0/abdev/ab_common/include/Lexical/Class.h

@@ -2 +2 @@
 
 class UserProc;
+class UserProcs;
 class Delegate;
+class Classes;
 
 class ClassPrototype : public Prototype, public DynamicMethodsPrototype
@@ -78 +80 @@
     //アラインメント値
     int fixedAlignment;
+
+public:
+    ActiveBasic::Common::Lexical::ExpandedTemplateClasses expandedTemplateClasses;
 
     // XMLシリアライズ用
@@ -101 +106 @@
         ar & BOOST_SERIALIZATION_NVP( staticMethods );
         ar & BOOST_SERIALIZATION_NVP( fixedAlignment );
+        ar & BOOST_SERIALIZATION_NVP( expandedTemplateClasses );
     }
 
@@ -106 +112 @@
 public:
 
-    CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name )
-        : ClassPrototype( namespaceScopes, name )
-        , importedNamespaces( importedNamespaces )
-        , classType( Class )
-        , pSuperClass( NULL )
-        , blittableType( Type() )
-        , isReady( false )
-        , fixedAlignment( 0 )
-        , ConstructorMemberSubIndex( -1 )
-        , DestructorMemberSubIndex( -1 )
-        , vtblNum( 0 )
-        , vtbl_offset( -1 )
-        , comVtblOffset( 0 )
-        , isCompilingConstructor( false )
-        , isCompilingDestructor( false )
-        , cacheSize( 0 )
-    {
-    }
-    CClass()
-        : ClassPrototype()
-        , importedNamespaces()
-        , classType()
-        , pSuperClass( NULL )
-        , blittableType( Type() )
-        , isReady( false )
-        , fixedAlignment( 0 )
-        , ConstructorMemberSubIndex( -1 )
-        , DestructorMemberSubIndex( -1 )
-        , vtblNum( 0 )
-        , vtbl_offset( -1 )
-        , comVtblOffset( 0 )
-        , isCompilingConstructor( false )
-        , isCompilingDestructor( false )
-        , cacheSize( 0 )
-    {
-    }
-    ~CClass()
-    {
-        // 動的メンバ
-        BOOST_FOREACH( Member *member, dynamicMembers )
-        {
-            delete member;
-        }
-
-        // 静的メンバ
-        BOOST_FOREACH( Member *member, staticMembers )
-        {
-            delete member;
-        }
-
-        // インターフェイス
-        BOOST_FOREACH( ::Interface *pInterface, interfaces )
-        {
-            delete pInterface;
-        }
-    }
+    CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name );
+    CClass( const NamespaceScopes &namespaceScopes,
+        const NamespaceScopesCollection &importedNamespaces,
+        const std::string &name, ClassType classType,
+        const GenericTypes &formalGenericTypes,
+        const Types &superClassActualTypeParameters,
+        int ConstructorMemberSubIndex,
+        int DestructorMemberSubIndex,
+        int vtblNum,
+        int fixedAlignment );
+    CClass();
+    ~CClass();
 
     virtual const std::string &GetKeyName() const
@@ -273 +235 @@
         this->classType = classType;
     }
+    ClassType GetClassType() const
+    {
+        return classType;
+    }
 
 
@@ -314 +280 @@
         return interfaces;
     }
+    Interfaces &GetInterfaces()
+    {
+        return interfaces;
+    }
     bool IsInheritsInterface( const CClass *pInterfaceClass ) const;
 
@@ -372 +342 @@
         this->ConstructorMemberSubIndex = constructorMemberSubIndex;
     }
+    int GetConstructorMemberSubIndex() const
+    {
+        return ConstructorMemberSubIndex;
+    }
 
     //デストラクタ メソッドを取得
@@ -382 +356 @@
     {
         this->DestructorMemberSubIndex = destructorMemberSubIndex;
+    }
+    int GetDestructorMemberSubIndex() const
+    {
+        return DestructorMemberSubIndex;
     }