Changeset 200 in dev for trunk

Timestamp:

Jul 2, 2007, 9:55:12 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/jenga/include/smoothie

Files:

• Class.h (modified) (3 diffs)
• Namespace.h (modified) (2 diffs)
• Prototype.h (modified) (2 diffs)
• Symbol.h (modified) (2 diffs)
• Type.h (modified) (2 diffs)

trunk/jenga/include/smoothie/Class.h

@@ -51 +51 @@
     ClassType classType;
 
-    bool isReady;
-
     // importされている名前空間
     NamespaceScopesCollection importedNamespaces;
@@ -76 +74 @@
     // 静的メソッド
     Methods staticMethods;
+
+
+    // 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( classType );
+        ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
+        //ar & BOOST_SERIALIZATION_NVP( interfaces );
+        ar & BOOST_SERIALIZATION_NVP( blittableType );
+        //ar & BOOST_SERIALIZATION_NVP( dynamicMembers );
+        //ar & BOOST_SERIALIZATION_NVP( staticMembers );
+        //ar & BOOST_SERIALIZATION_NVP( methods );
+        ar & BOOST_SERIALIZATION_NVP( ConstructorMemberSubIndex );
+        ar & BOOST_SERIALIZATION_NVP( DestructorMemberSubIndex );
+        ar & BOOST_SERIALIZATION_NVP( vtblNum );
+        //ar & BOOST_SERIALIZATION_NVP( staticMethods );
+    }
+
+
+    bool isReady;
 
 public:
@@ -264 +285 @@
     //線形リスト用
     CClass *pobj_NextClass;
-
-    // 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( classType );
-    }
 
 

trunk/jenga/include/smoothie/Namespace.h

@@ -5 +5 @@
 #include <boost/foreach.hpp>
 
+#include <jenga/include/common/BoostXmlSupport.h>
+
 using namespace std;
 
 class NamespaceScopes : public vector<string>
 {
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & boost::serialization::make_nvp("vector_string", boost::serialization::base_object<vector<string>>(*this));
+    }
+
+
 public:
     NamespaceScopes(){}
@@ -73 +84 @@
 class NamespaceScopesCollection : public vector<NamespaceScopes>
 {
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & boost::serialization::make_nvp("vector_NamespaceScopes", boost::serialization::base_object<vector<NamespaceScopes>>(*this));
+    }
+
 public:
     bool IsExist( const NamespaceScopes &namespaceScopes ) const

trunk/jenga/include/smoothie/Prototype.h

@@ -25 +25 @@
 private:
     mutable bool isUsing;
+
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+    }
+
 
 public:
@@ -64 +74 @@
         isUsing = true;
     }
-
-    // XMLシリアライズ用
-private:
-    friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
-    {
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
-    }
-
 };
 

trunk/jenga/include/smoothie/Symbol.h

@@ -14 +14 @@
     NamespaceScopes namespaceScopes;
     string name;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_NVP( namespaceScopes );
+        ar & BOOST_SERIALIZATION_NVP( name );
+    }
+
 public:
     Symbol( const NamespaceScopes &namespaceScopes, const string &name )
@@ -34 +44 @@
         return name;
     }
-
-private:
-    friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
-    {
-        //ar & BOOST_SERIALIZATION_NVP( namespaceScopes );
-        ar & BOOST_SERIALIZATION_NVP( name );
-    }
 };

trunk/jenga/include/smoothie/Type.h

@@ -6 +6 @@
 #include <boost/foreach.hpp>
 
+#include <jenga/include/common/BoostXmlSupport.h>
+
 #include <windows.h>
-
 #include "BasicFixed.h"
 
@@ -18 +19 @@
         const CClass *pClass;
     };
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_NVP( basicType );
+        if( HasMember() )
+        {
+            ar & boost::serialization::make_nvp("pClass", const_cast<CClass *&>(pClass));
+        }
+        else
+        {
+            ar & BOOST_SERIALIZATION_NVP( index );
+        }
+    }
 
 public: