Changeset 344 in dev for trunk

Timestamp:

Oct 9, 2007, 11:37:45 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (1 diff)
• BasicCompiler_Common/include/Class.h (modified) (3 diffs)
• BasicCompiler_Common/src/Class.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -84 +84 @@
                 ProgramDatabaseFile=".\Debug/BasicCompiler32.pdb"
                 SubSystem="2"
+                StackReserveSize="4194304"
                 TargetMachine="1"
             />

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -12 +12 @@
 class Delegate;
 
-class ClassPrototype : public Prototype
+class DynamicMethodsPrototype
 {
     // 動的メソッド
@@ -22 +22 @@
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
+        ar & BOOST_SERIALIZATION_NVP( dynamicMethods );
+    }
+
+public:
+    DynamicMethodsPrototype(){}
+    DynamicMethodsPrototype( const DynamicMethodsPrototype &dynamicMethodsPrototype )
+        : dynamicMethods( dynamicMethodsPrototype.dynamicMethods )
+    {
+    }
+    ~DynamicMethodsPrototype(){}
+
+    const Methods &GetDynamicMethods() const
+    {
+        return dynamicMethods;
+    }
+    Methods &GetDynamicMethods()
+    {
+        return dynamicMethods;
+    }
+
+    void AddDynamicMethods( CMethod *pMethod )
+    {
+        dynamicMethods.push_back( pMethod );
+    }
+};
+
+class ClassPrototype : public Prototype, public DynamicMethodsPrototype
+{
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Prototype );
-        ar & BOOST_SERIALIZATION_NVP( dynamicMethods );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( DynamicMethodsPrototype );
     }
 
@@ -29 +62 @@
     ClassPrototype( const NamespaceScopes &namespaceScopes, const string &name )
         : Prototype( namespaceScopes, name )
+        , DynamicMethodsPrototype()
     {
     }
     ClassPrototype()
         : Prototype()
-    {
-    }
-    const Methods &GetDynamicMethods() const
-    {
-        return dynamicMethods;
-    }
-    Methods &GetDynamicMethods()
-    {
-        return dynamicMethods;
+        , DynamicMethodsPrototype()
+    {
     }
 };
 
-class Interface : public ClassPrototype
+class Interface : public DynamicMethodsPrototype
 {
     const CClass *pInterfaceClass;
     mutable int vtblOffset;
+
 public:
     Interface( const CClass *pInterfaceClass );
+    Interface( const Interface &objInterface )
+        : DynamicMethodsPrototype( objInterface )
+        , pInterfaceClass( objInterface.pInterfaceClass )
+        , vtblOffset( objInterface.vtblOffset )
+    {
+    }
 
     const CClass &GetClass() const{

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -77 +77 @@
 
 Interface::Interface( const CClass *pInterfaceClass )
-    : pInterfaceClass( pInterfaceClass )
+    : DynamicMethodsPrototype()
+    , pInterfaceClass( pInterfaceClass )
     , vtblOffset( -1 )
 {
@@ -102 +103 @@
         }
 
-        GetDynamicMethods().push_back( pMethod );
+        AddDynamicMethods( pMethod );
     }
 }