Changeset 636 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/Compiler.cpp

Timestamp:

Jun 10, 2008, 11:40:17 PM (16 years ago)

Author:

dai_9181

Message:

libファイルを跨ったテンプレート展開に対応。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/Compiler.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -5 +5 @@
 Compiler compiler;
 
+Compiler::Compiler()
+    : isBuildSuccessful( false )
+    , targetModuleType( ActiveBasic::Common::TargetModuleType::Exe )
+    , isDebug( false )
+    , isUnicode( false )
+    , isCore( false )
+    , currentRelationalObjectModuleIndexForSource( 0 )
+{
+    // 生成先のオブジェクトモジュールを登録
+    ObjectModule *pObjectModule = new ObjectModule();
+    staticLibraries.push_back( pObjectModule );
+    SelectObjectModule( pObjectModule );
+
+    namespaceSupporter.RegistAllNamespaceScopesCollection( &GetObjectModule().meta.GetNamespaces() );
+
+    Symbol::RegistNamespaceSupporter( &namespaceSupporter );
+}
+Compiler::~Compiler()
+{
+    BOOST_FOREACH( ObjectModule *pStaticLibrary, staticLibraries )
+    {
+        delete pStaticLibrary;
+    }
+    staticLibraries.clear();
+}
+
+void Compiler::PreStaticLink( const ObjectModules &staticLibraries )
+{
+    BOOST_FOREACH( const ObjectModule *pStaticLibrary, staticLibraries )
+    {
+        // 関連オブジェクトモジュールの名前リスト
+        this->GetObjectModule().relationalObjectModuleNames.push_back( pStaticLibrary->GetName() );
+    }
+}
 void Compiler::StaticLink( ObjectModules &staticLibraries )
 {
     BOOST_FOREACH( ObjectModule *pStaticLibrary, staticLibraries )
     {
+        if( &this->GetObjectModule() == pStaticLibrary )
+        {
+            // 自分自身の場合はリンクしない
+            continue;
+        }
+
         // メタ情報
-        pNowObjectModule->StaticLink( *pStaticLibrary );
+        this->GetObjectModule().StaticLink( *pStaticLibrary );
     }
 }