Changeset 206 in dev for trunk/abdev/BasicCompiler_Common/include/MetaImpl.h

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

File:

• trunk/abdev/BasicCompiler_Common/include/MetaImpl.h (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/include/MetaImpl.h

@@ -3 +3 @@
 #include <jenga/include/common/BoostXmlSupport.h>
 
-#include <jenga/include/smoothie/ObjectModule.h>
+#include <option.h>
+#include <Program.h>
+#include <Class.h>
+#include <Procedure.h>
+#include <TypeDef.h>
+#include <Variable.h>
+#include <Const.h>
 
-#include <ClassImpl.h>
-#include <ProcedureImpl.h>
-#include <TypeDef.h>
-
-class MetaImpl : public Meta, public Jenga::Common::BoostXmlSupport<MetaImpl>
+class MetaImpl : public Jenga::Common::BoostXmlSupport<MetaImpl>
 {
     // 名前空間
     NamespaceScopesCollection namespaceScopesCollection;
 
+    // 関数・メソッド
+    UserProcs userProcs;
+
     // クラス
-    ClassesImpl classesImpl;
-    Classes *pNowClassesForDebugger;
+    Classes classesImpl;
+
+    // グローバル変数
+    Variables globalVars;
+
+    // グローバル定数
+    Consts globalConsts;
+
+    // グローバル定数マクロ
+    ConstMacros globalConstMacros;
 
     // blittable型
@@ -24 +37 @@
     TypeDefCollection typeDefs;
 
+    // 関数ポインタ
+    ProcPointers procPointers;
+
+    // XMLシリアライズ用
+private:
+    virtual const char *RootTagName() const
+    {
+        return "metaImpl";
+    }
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - MetaImpl" );
+
+        ar & BOOST_SERIALIZATION_NVP( namespaceScopesCollection );
+        ar & BOOST_SERIALIZATION_NVP( userProcs );
+        ar & BOOST_SERIALIZATION_NVP( classesImpl );
+        ar & BOOST_SERIALIZATION_NVP( globalVars );
+        ar & BOOST_SERIALIZATION_NVP( globalConsts );
+        ar & BOOST_SERIALIZATION_NVP( globalConstMacros );
+        ar & BOOST_SERIALIZATION_NVP( blittableTypes );
+        ar & BOOST_SERIALIZATION_NVP( typeDefs );
+        ar & BOOST_SERIALIZATION_NVP( procPointers );
+    }
+
+    Classes *pNowClassesForDebugger;
+
 public:
     MetaImpl()
-        : Meta( new ProcPointersImpl() )
-        , classesImpl()
+        : classesImpl()
         , pNowClassesForDebugger( &classesImpl )
     {
@@ -41 +80 @@
     }
 
-    virtual Classes &GetClasses()
+    const UserProcs &GetUserProcs() const
+    {
+        return userProcs;
+    }
+    UserProcs &GetUserProcs()
+    {
+        return userProcs;
+    }
+
+    Classes &GetClasses()
     {
         return *pNowClassesForDebugger;
     }
-    virtual void SetClasses( Classes *pClasses )
+    void SetClasses( Classes *pClasses )
     {
         this->pNowClassesForDebugger = pClasses;
+    }
+
+    const Variables &GetGlobalVars() const
+    {
+        return globalVars;
+    }
+    Variables &GetGlobalVars()
+    {
+        return globalVars;
+    }
+
+    const Consts &GetGlobalConsts() const
+    {
+        return globalConsts;
+    }
+    Consts &GetGlobalConsts()
+    {
+        return globalConsts;
+    }
+
+    const ConstMacros &GetGlobalConstMacros() const
+    {
+        return globalConstMacros;
+    }
+    ConstMacros &GetGlobalConstMacros()
+    {
+        return globalConstMacros;
     }
 
@@ -60 +135 @@
     }
 
-    virtual bool AutoWrite( const std::string &filePath )
+    // 関数ポインタ
+    ProcPointers &GetProcPointers()
+    {
+        return procPointers;
+    }
+
+    bool AutoWrite( const std::string &filePath )
     {
         std::ofstream ofs( filePath.c_str() );
@@ -82 +163 @@
         return isSuccessful;
     }
-
-
-    // XMLシリアライズ用
-private:
-    virtual const char *RootTagName() const
-    {
-        return "metaImpl";
-    }
-    friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
-    {
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Meta );
-        ar & BOOST_SERIALIZATION_NVP( classesImpl );
-    }
 };
-BOOST_IS_ABSTRACT( Meta );