Changeset 271 in dev for trunk

Timestamp:

Aug 10, 2007, 3:16:42 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler_Common/Intermediate_Step1.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Const.h (modified) (1 diff)
• BasicCompiler_Common/include/Procedure.h (modified) (3 diffs)
• BasicCompiler_Common/include/Symbol.h (modified) (2 diffs)
• BasicCompiler_Common/include/Type.h (modified) (1 diff)
• BasicCompiler_Common/include/Variable.h (modified) (1 diff)
• BasicCompiler_Common/src/Meta.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Symbol.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -141 +141 @@
     if( compiler.IsDll() ) bUse_ExportSection=1;
     else bUse_ExportSection=0;
+
+
+    // 静的リンク
+    compiler.StaticLink( compiler.staticLibraries );
 
 

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -254 +254 @@
                 compiler.staticLibraryFilePaths.push_back( temporary );
 
-                ObjectModule *pStaticLibrary = new ObjectModule();
-                pStaticLibrary->ReadText( temporary );
-                compiler.staticLibraries.push_back( pStaticLibrary );
+                compiler.staticLibraries.push_back( new ObjectModule() );
+                compiler.staticLibraries.back()->ReadText( temporary );
 
                 for(;;i2++){

trunk/abdev/BasicCompiler_Common/include/Const.h

@@ -26 +26 @@
 
 public:
-
     CConst( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &newType, _int64 i64data)
         : Symbol( namespaceScopes, name )

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 )
@@ -65 +64 @@
         , isUsing( false )
         , codePos( -1 )
-        , isTargetObjectModule( true )
     {
     }
     Procedure()
-        : isTargetObjectModule( true )
     {
     }
@@ -553 +550 @@
     }
 
-    virtual int Add( const string &typeExpression );
-    virtual void Clear();
-};
+    int Add( const string &typeExpression );
+    void Clear();
+    void PullOutAll()
+    {
+        clear();
+    }
+};

trunk/abdev/BasicCompiler_Common/include/Symbol.h

@@ -41 +41 @@
 
 public:
+    bool isTargetObjectModule;
     Symbol( const NamespaceScopes &namespaceScopes, const string &name )
         : namespaceScopes( namespaceScopes )
         , name( name )
+        , isTargetObjectModule( true )
     {
     }
@@ -51 +53 @@
         : namespaceScopes( symbol.namespaceScopes )
         , name( symbol.name )
+        , isTargetObjectModule( true )
     {
     }
     Symbol()
+        : isTargetObjectModule( true )
     {
     }

trunk/abdev/BasicCompiler_Common/include/Type.h

@@ -182 +182 @@
 
 public:
+    bool isTargetObjectModule;
     BlittableType( const Type &basicType, CClass *pClass )
         : basicType( basicType )
         , pClass( pClass )
+        , isTargetObjectModule( true )
     {
     }
     BlittableType()
+        : isTargetObjectModule( true )
     {
     }

trunk/abdev/BasicCompiler_Common/include/Variable.h

@@ -217 +217 @@
     Variables(){}
     ~Variables(){
-        clear();
-    }
-
-    void clear(){
+        Clear();
+    }
+
+    void Clear(){
         for( int i=0; i<(int)this->size(); i++ ){
             delete (*this)[i];
         }
 
-        vector<Variable *>::clear();
+        clear();
+    }
+    void PullOutAll()
+    {
+        clear();
     }
 

trunk/abdev/BasicCompiler_Common/src/Meta.cpp

@@ -35 +35 @@
 
     // クラス
+    meta.GetClasses().Iterator_Reset();
+    while( meta.GetClasses().Iterator_HasNext() )
+    {
+        CClass *pClass = meta.GetClasses().Iterator_GetNext();
+        pClass->isTargetObjectModule = false;
+        this->GetClasses().Put( pClass );
+    }
+    meta.GetClasses().PullOutAll();
 
     // グローバル変数
+    BOOST_FOREACH( Variable *pVar, meta.globalVars )
+    {
+        pVar->isTargetObjectModule = false;
+        this->globalVars.push_back( pVar );
+    }
+    meta.globalVars.PullOutAll();
 
     // グローバル定数
+    meta.GetGlobalConsts().Iterator_Reset();
+    while( meta.GetGlobalConsts().Iterator_HasNext() )
+    {
+        CConst *pConst = meta.GetGlobalConsts().Iterator_GetNext();
+        pConst->isTargetObjectModule = false;
+        this->GetGlobalConsts().Put( pConst );
+    }
+    meta.GetGlobalConsts().PullOutAll();
 
     // グローバル定数マクロ
+    meta.GetGlobalConstMacros().Iterator_Reset();
+    while( meta.GetGlobalConstMacros().Iterator_HasNext() )
+    {
+        ConstMacro *pConstMacro = meta.GetGlobalConstMacros().Iterator_GetNext();
+        pConstMacro->isTargetObjectModule = false;
+        this->GetGlobalConstMacros().Put( pConstMacro );
+    }
+    meta.GetGlobalConstMacros().PullOutAll();
 
     // blittable型
+    BOOST_FOREACH( BlittableType &blittableType, meta.blittableTypes )
+    {
+        blittableType.isTargetObjectModule = false;
+        this->blittableTypes.push_back( blittableType );
+    }
+    meta.blittableTypes.clear();
 
     // TypeDef
+    BOOST_FOREACH( TypeDef &typeDef, meta.typeDefs )
+    {
+        typeDef.isTargetObjectModule = false;
+        this->typeDefs.push_back( typeDef );
+    }
+    meta.typeDefs.clear();
 
     // 関数ポインタ
+    BOOST_FOREACH( ProcPointer *pProcPointer, meta.procPointers )
+    {
+        pProcPointer->isTargetObjectModule = false;
+        this->procPointers.push_back( pProcPointer );
+    }
+    meta.procPointers.PullOutAll();
 }

trunk/abdev/BasicCompiler_Common/src/Symbol.cpp

@@ -8 +8 @@
 
 Symbol::Symbol( const char *fullName )
+    : isTargetObjectModule( true )
 {
     char areaName[VN_SIZE] = "";        //オブジェクト変数
@@ -17 +18 @@
 }
 Symbol::Symbol( const string &fullName )
+    : isTargetObjectModule( true )
 {
     char areaName[VN_SIZE] = "";        //オブジェクト変数