Changeset 270 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

Aug 9, 2007, 3:18:40 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (5 diffs)
• Compiler.h (modified) (4 diffs)
• Hashmap.h (modified) (3 diffs)
• Linker.h (modified) (1 diff)
• Meta.h (modified) (1 diff)
• ObjectModule.h (added)
• Procedure.h (modified) (2 diffs)
• option.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -31 +31 @@
 typedef vector<InheritedInterface> Interfaces;
 
-class CClass: public Prototype
+class CClass: public Prototype, public Jenga::Common::ObjectInHashmap<CClass>
 {
 public:
@@ -148 +148 @@
     }
 
+    virtual const std::string &GetKeyName() const
+    {
+        return GetName();
+    }
+    virtual bool IsDuplication( const CClass *pClass ) const
+    {
+        if( pClass->IsEqualSymbol( *this ) )
+        {
+            return true;
+        }
+        return false;
+    }
+
     void Readed(){
         isReady = true;
@@ -355 +368 @@
 };
 
-#define MAX_CLASS_HASH 65535
-class Classes
+class Classes : public Jenga::Common::Hashmap<CClass>
 {
-    CClass *pobj_ClassHash[MAX_CLASS_HASH];
-    int GetHashCode(const char *name) const;
-
     // XMLシリアライズ用
-private:
-    friend class boost::serialization::access;
-    BOOST_SERIALIZATION_SPLIT_MEMBER();
-    template<class Archive> void load(Archive& ar, const unsigned int version)
-    {
-        trace_for_serialize( "serializing(load) - Classes" );
-
-        std::vector<CClass *> vectorClasses;
-        ar & BOOST_SERIALIZATION_NVP( vectorClasses );
-
-        // 読み込み後の処理
-        Clear();
-        BOOST_FOREACH( CClass *pClass, vectorClasses )
-        {
-            Insert( pClass );
-        }
-        Iterator_Init();
-    }
-    template<class Archive> void save(Archive& ar, const unsigned int version) const
-    {
-        trace_for_serialize( "serializing(save) - Classes" );
-
-        // 保存準備
-        std::vector<CClass *> vectorClasses;
-        vectorClasses.clear();
-        Iterator_Reset();
-        while( Iterator_HasNext() )
-        {
-            vectorClasses.push_back( dynamic_cast<CClass *>(Iterator_GetNext()) );
-        }
-
-        ar & BOOST_SERIALIZATION_NVP( vectorClasses );
-    }
-
 public:
     Classes()
@@ -401 +376 @@
         , pStringClass( NULL )
         , pObjectClass( NULL )
-        , ppobj_IteClass( NULL )
-        , iIteMaxNum( 0 )
-        , iIteNextNum( 0 )
-    {
-        memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) );
+    {
     }
     ~Classes()
     {
-        for(int i=0;i<MAX_CLASS_HASH;i++){
-            if(pobj_ClassHash[i]) DestroyClass(pobj_ClassHash[i]);
-        }
-    }
-    void DestroyClass(CClass *pobj_c)
-    {
-        if(pobj_c->pobj_NextClass){
-            DestroyClass(pobj_c->pobj_NextClass);
-        }
-
-        delete pobj_c;
-    }
-    void Clear()
-    {
-        if(ppobj_IteClass)
-        {
-            free(ppobj_IteClass);
-            ppobj_IteClass = NULL;
-        }
-        // TODO: ここはこれでいいのか…
-        memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) );
     }
 
@@ -473 +423 @@
     CClass *GetStringClassPtr() const;
     CClass *GetObjectClassPtr() const;
-
-
-    /////////////////////
-    // イテレータ
-    /////////////////////
-private:
-    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/abdev/BasicCompiler_Common/include/Compiler.h

@@ -6 +6 @@
 #include <DataTable.h>
 #include <CodeGenerator.h>
+#include <ObjectModule.h>
 #include <Linker.h>
 
@@ -28 +29 @@
     {
         delete pObjectModule;
+        Clear();
     }
+    void Clear()
+    {
+        BOOST_FOREACH( ObjectModule *pStaticLibrary, staticLibraries )
+        {
+            delete pStaticLibrary;
+        }
+        staticLibraries.clear();
+    }
+
+    void StaticLink( ObjectModules &staticLibraries );
 
     NamespaceSupporter &GetNamespaceSupporter()
@@ -46 +58 @@
     // 静的リンクするオブジェクトファイル
     std::vector<std::string> staticLibraryFilePaths;
+
+    // 静的リンクするオブジェクトモジュール
+    ObjectModules staticLibraries;
 
     // オブジェクトモジュール
@@ -98 +113 @@
 
 
-
     static bool StringToType( const std::string &typeName, Type &type );
     static const std::string TypeToString( const Type &type );

trunk/abdev/BasicCompiler_Common/include/Hashmap.h

@@ -52 +52 @@
     }
 
+    // 内容を破棄せずにすべて抜き取る
+    void PullOutAll()
+    {
+        memset( hashArray, 0, MAX_HASHMAP*sizeof(T*) );
+    }
+
     bool Put( T* value )
     {
@@ -81 +87 @@
 
     T* GetHashArrayElement( const char *keyName )
+    {
+        return hashArray[GetHash(keyName)];
+    }
+    const T* GetHashArrayElement( const char *keyName ) const
     {
         return hashArray[GetHash(keyName)];
@@ -222 +232 @@
         return pNextObject;
     }
+    const T *GetChainNext() const
+    {
+        return pNextObject;
+    }
     void SetChainNext( T *pNextObject )
     {

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -1 +1 @@
 #pragma once
-
-class ObjectModule : public Jenga::Common::BoostSerializationSupport<ObjectModule>
-{
-public:
-    // メタ情報
-    Meta meta;
-
-    // グローバル領域のネイティブコード
-    NativeCode globalNativeCode;
-
-    // データテーブル
-    DataTable dataTable;
-
-    // XMLシリアライズ用
-private:
-    virtual const char *RootTagName() const
-    {
-        return "objectModule";
-    }
-    friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
-    {
-        trace_for_serialize( "serializing - objectModule" );
-
-        ar & BOOST_SERIALIZATION_NVP( meta );
-        ar & BOOST_SERIALIZATION_NVP( globalNativeCode );
-        ar & BOOST_SERIALIZATION_NVP( dataTable );
-    }
-};
 
 class Linker

trunk/abdev/BasicCompiler_Common/include/Meta.h

@@ -70 +70 @@
     {
     }
+
+    // 静的リンク
+    void StaticLink( Meta &meta );
 
     const NamespaceScopesCollection &GetNamespaces() const

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -58 +58 @@
 
 public:
+    bool isTargetObjectModule;
     Procedure( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl )
         : Symbol( namespaceScopes, name )
@@ -64 +65 @@
         , isUsing( false )
         , codePos( -1 )
+        , isTargetObjectModule( true )
     {
     }
     Procedure()
+        : isTargetObjectModule( true )
     {
     }

trunk/abdev/BasicCompiler_Common/include/option.h

@@ -37 +37 @@
 
     // XMLシリアライズに関するログを生成する
-    #define USE_TRACE_FOR_SERIALIZE
+    //#define USE_TRACE_FOR_SERIALIZE
 
     // ソースコードステップに関するログを生成する