Changeset 190 in dev for trunk/jenga/include/smoothie

Timestamp:

Jun 26, 2007, 12:05:36 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/jenga/include/smoothie

Files:

• Class.h (modified) (6 diffs)
• ObjectModule.h (modified) (4 diffs)
• Prototype.h (modified) (5 diffs)
• Smoothie.h (modified) (2 diffs)
• Symbol.h (modified) (3 diffs)

trunk/jenga/include/smoothie/Class.h

@@ -1 +1 @@
 #pragma once
+
+#include <jenga/include/common/BoostXmlSupport.h>
 
 #include "Prototype.h"
@@ -83 +85 @@
 
     CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name );
+    CClass()
+        : Prototype()
+    {
+    }
     ~CClass();
 
@@ -259 +265 @@
     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 );
+    }
+
+
+public:
     static bool SplitName( const char *desc, char *object, char *member, CClass::RefType &refType ){
         int lastIndex = -1;
@@ -305 +321 @@
 class Classes
 {
-    int hash(const char *name) const;
+    int GetHashCode(const char *name) const;
     void DestroyClass(CClass *pobj_c);
 public:
@@ -318 +334 @@
 
     virtual CClass *Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name) = 0;
+    bool Insert( CClass *pClass );
     CClass *Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine);
 
@@ -360 +377 @@
     /////////////////////
 private:
-    CClass **ppobj_IteClass;
-    int iIteMaxNum;
-    int iIteNextNum;
-public:
-    void Iterator_Init(void);
-    void Iterator_Reset(void);
-    BOOL Iterator_HasNext(void);
-    CClass *Iterator_GetNext(void);
-    int Iterator_GetMaxCount(void);
+    mutable CClass **ppobj_IteClass;
+    mutable int iIteMaxNum;
+    mutable int iIteNextNum;
+public:
+    void Iterator_Init() const;
+    void Iterator_Reset() const;
+    BOOL Iterator_HasNext() const;
+    CClass *Iterator_GetNext() const;
+    int Iterator_GetMaxCount() const;
 };

trunk/jenga/include/smoothie/ObjectModule.h

@@ -1 +1 @@
 #pragma once
-
-#include <jenga/include/common/BoostXmlSupport.h>
 
 #include "TypeDef.h"
@@ -9 +7 @@
 
 // プロジェクト中に存在するメタ情報
-class Meta : public Jenga::Common::BoostXmlSupport<Meta>
+class Meta
 {
-    Classes *pClasses;
     ProcPointers *pProcPointers;
 public:
 
-    Meta( Classes *pNewClasses, ProcPointers *pNewProcPointers )
-        : pClasses( pNewClasses )
-        , pProcPointers( pNewProcPointers )
+    Meta( ProcPointers *pNewProcPointers )
+        : pProcPointers( pNewProcPointers )
+    {
+    }
+    Meta()
     {
     }
     ~Meta()
     {
-        delete pClasses;
         delete pProcPointers;
     }
@@ -30 +28 @@
 
     // クラス
-    Classes &GetClasses()
-    {
-        return *pClasses;
-    }
-    void SetClasses( Classes *pClasses )
-    {
-        this->pClasses = pClasses;
-    }
+    virtual Classes &GetClasses() = 0;
+    virtual void SetClasses( Classes *pClasses ) = 0;
+    virtual bool AutoWrite( const std::string &filePath ) = 0;
 
     // TypeDef
@@ -53 +46 @@
     // XMLシリアライズ用
 private:
-    virtual const char *RootTagName() const
-    {
-        return "meta";
-    }
     friend class boost::serialization::access;
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
-        //ar & BOOST_SERIALIZATION_NVP( pClasses );
     }
 };
-
-
-#define DEF_XML_SCHEMA( node ) BOOST_CLASS_IMPLEMENTATION( node, boost::serialization::object_serializable );
-
-// ノード クラスを追加したらここでも定義する
-DEF_XML_SCHEMA( Meta )
-
-#undef DEF_XML_SCHEMA

trunk/jenga/include/smoothie/Prototype.h

@@ -4 +4 @@
 #include <vector>
 
-#include "Namespace.h"
+#include <jenga/include/common/BoostXmlSupport.h>
+
+#include "Symbol.h"
 
 using namespace std;
@@ -11 +13 @@
 class UserProc;
 
-class Prototype
+class Prototype : public Symbol
 {
 public:
@@ -22 +24 @@
 
 private:
-    // 名前空間
-    NamespaceScopes namespaceScopes;
-
-    //名前
-    string name;
-
     mutable bool isUsing;
 
@@ -33 +29 @@
 
     Prototype( const NamespaceScopes &namespaceScopes, const string &name )
-        : namespaceScopes( namespaceScopes )
-        , name( name )
+        : Symbol( namespaceScopes, name )
         , isUsing( false )
+    {
+    }
+    Prototype()
+        : Symbol()
     {
     }
     ~Prototype()
     {
-    }
-
-    // 名前空間
-    const NamespaceScopes &GetNamespaceScopes() const
-    {
-        return namespaceScopes;
-    }
-
-    const string &GetName() const
-    {
-        return name;
     }
 
@@ -75 +63 @@
     {
         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/Smoothie.h

@@ -7 +7 @@
 class Smoothie{
     static bool isUnicode;
-
-    static Meta meta;
 public:
 
@@ -20 +18 @@
     }
 
-    static Meta &GetMeta()
-    {
-        return meta;
-    }
+    static Meta &GetMeta();
 
     class Lexical{

trunk/jenga/include/smoothie/Symbol.h

@@ -3 +3 @@
 #include <vector>
 #include <string>
+
+#include <jenga/include/common/BoostXmlSupport.h>
 
 #include "Namespace.h"
@@ -20 +22 @@
     Symbol( const char *fullName );
     Symbol( const string &fullName );
+    Symbol()
+    {
+    }
 
     const NamespaceScopes &GetNamespaceScopes() const
@@ -29 +34 @@
         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 );
+    }
 };