Changeset 637 in dev

Timestamp:

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

Author:

dai_9181

Message:

リンカの依存関係解決モジュールを製作中

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/BreakPoint.cpp (modified) (1 diff)
• BasicCompiler_Common/Compile.cpp (modified) (1 diff)
• BasicCompiler_Common/Debug.cpp (modified) (1 diff)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (2 diffs)
• BasicCompiler_Common/VarList.cpp (modified) (1 diff)
• BasicCompiler_Common/VariableOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (1 diff)
• BasicCompiler_Common/src/Compiler.cpp (modified) (1 diff)
• BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp (modified) (3 diffs)
• BasicCompiler_Common/src/LexicalAnalyzer_Const.cpp (modified) (3 diffs)
• BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp (modified) (4 diffs)
• BasicCompiler_Common/src/LexicalAnalyzer_TypeDef.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/ProcedureGenerator.cpp (modified) (1 diff)
• ab_common/ab_common.vcproj (modified) (1 diff)
• ab_common/include/Environment.h (modified) (2 diffs)
• ab_common/include/Lexical/Class.h (modified) (4 diffs)
• ab_common/include/Lexical/Const.h (modified) (10 diffs)
• ab_common/include/Lexical/DataTable.h (modified) (1 diff)
• ab_common/include/Lexical/Delegate.h (modified) (3 diffs)
• ab_common/include/Lexical/Meta.h (modified) (1 diff)
• ab_common/include/Lexical/NativeCode.h (modified) (4 diffs)
• ab_common/include/Lexical/ObjectModule.h (modified) (2 diffs)
• ab_common/include/Lexical/Procedure.h (modified) (15 diffs)
• ab_common/include/Lexical/Prototype.h (modified) (3 diffs)
• ab_common/include/Lexical/RelationalObjectModuleItem.h (added)
• ab_common/include/Lexical/Source.h (modified) (3 diffs)
• ab_common/include/Lexical/Symbol.h (modified) (2 diffs)
• ab_common/include/Lexical/Type.h (modified) (1 diff)
• ab_common/include/Lexical/TypeDef.h (modified) (5 diffs)
• ab_common/include/Lexical/Variable.h (modified) (4 diffs)
• ab_common/include/ab_common.h (modified) (2 diffs)
• ab_common/src/Environment.cpp (modified) (1 diff)
• ab_common/src/Lexical/Class.cpp (modified) (4 diffs)
• ab_common/src/Lexical/Const.cpp (modified) (3 diffs)
• ab_common/src/Lexical/DataTable.cpp (modified) (1 diff)
• ab_common/src/Lexical/Delegate.cpp (modified) (1 diff)
• ab_common/src/Lexical/Meta.cpp (modified) (12 diffs)
• ab_common/src/Lexical/NativeCode.cpp (modified) (5 diffs)
• ab_common/src/Lexical/ObjectModule.cpp (modified) (2 diffs)
• ab_common/src/Lexical/Procedure.cpp (modified) (3 diffs)
• ab_common/src/Lexical/Source.cpp (modified) (1 diff)
• ab_common/src/Lexical/TypeDef.cpp (modified) (2 diffs)
• ab_common/src/Lexical/Variable.cpp (modified) (3 diffs)
• abdev/src/MainFrame.cpp (modified) (2 diffs)
• compiler_x86/Compile_ProcOp.cpp (modified) (1 diff)
• compiler_x86/MakePeHdr.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/BreakPoint.cpp

@@ -104 +104 @@
             int i3;
             for(i3=0;i3<(int)oldSourceLines.size()-1;i3++){
-                if(oldSourceLines[i3].GetSourceCodePos()==tempCp) break;
+                if(oldSourceLines[i3].GetSourceCodePosition().GetPos()==tempCp) break;
             }
             if(i3==oldSourceLines.size()-1){

trunk/ab5.0/abdev/BasicCompiler_Common/Compile.cpp

@@ -747 +747 @@
             }
 
-            compiler.codeGenerator.NextSourceLine( compiler.GetCurrentRelationalObjectModuleIndexForSource() );
+            compiler.codeGenerator.NextSourceLine( SourceCodePosition( compiler.GetCurrentRelationalObjectModuleIndexForSource(), cp ) );
 
             if(Command[0]==1){

trunk/ab5.0/abdev/BasicCompiler_Common/Debug.cpp

@@ -121 +121 @@
             int i3;
             for(i3=0;i3<(int)oldSourceLines.size()-1;i3++){
-                if(oldSourceLines[i3].GetSourceCodePos()==tempCp) break;
+                if(oldSourceLines[i3].GetSourceCodePosition().GetPos()==tempCp) break;
             }
             if(i3==oldSourceLines.size()-1){

trunk/ab5.0/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -141 +141 @@
     BOOST_FOREACH( const SourceLine &sourceLine, oldSourceLines )
     {
-        *(long *)(buffer+i2) = sourceLine.GetLineNum();
-        i2+=sizeof(long);
-
         *(long *)(buffer+i2) = sourceLine.GetNativeCodePos();
         i2+=sizeof(long);
 
-        *(long *)(buffer+i2) = sourceLine.GetRelationalObjectModuleIndex();
-        i2+=sizeof(long);
-
-        *(long *)(buffer+i2) = sourceLine.GetSourceCodePos();
-        i2+=sizeof(long);
-
         *(long *)(buffer+i2) = sourceLine.GetCodeType();
+        i2+=sizeof(long);
+
+        *(long *)(buffer+i2) = sourceLine.GetSourceCodePosition().GetRelationalObjectModuleIndex();
+        i2+=sizeof(long);
+
+        *(long *)(buffer+i2) = sourceLine.GetSourceCodePosition().GetPos();
         i2+=sizeof(long);
 
@@ -245 +242 @@
     i2+=sizeof(long);
     for(i3=0;i3<maxLineInfoNum;i3++){
-        int lineNum = *(long *)(buffer+i2);
-        i2+=sizeof(long);
-
         int nativeCodePos = *(long *)(buffer+i2);
         i2+=sizeof(long);
 
-        int sourceIndex = *(long *)(buffer+i2);
+        DWORD sourceLineType = *(DWORD *)(buffer+i2);
+        i2+=sizeof(long);
+
+        int relationalObjectModuleIndex = *(long *)(buffer+i2);
         i2+=sizeof(long);
 
         int sourceCodePos = *(long *)(buffer+i2);
-        i2+=sizeof(long);
-
-        DWORD sourceLineType = *(DWORD *)(buffer+i2);
         i2+=sizeof(long);
 
         _oldSourceLines.push_back(
             SourceLine(
-                lineNum,
                 nativeCodePos,
-                sourceIndex,
-                sourceCodePos,
-                sourceLineType
+                sourceLineType,
+                SourceCodePosition( relationalObjectModuleIndex, sourceCodePos )
             )
         );

trunk/ab5.0/abdev/BasicCompiler_Common/VarList.cpp

@@ -620 +620 @@
         else
         {
-            pobj_dti->lpdwCp[i3]=oldSourceLines[i2].GetSourceCodePos();
-            pobj_dti->relationalObjectModuleIndexes[i3]=oldSourceLines[i2].GetRelationalObjectModuleIndex();
+            pobj_dti->lpdwCp[i3]=oldSourceLines[i2].GetSourceCodePosition().GetPos();
+            pobj_dti->relationalObjectModuleIndexes[i3]=oldSourceLines[i2].GetSourceCodePosition().GetRelationalObjectModuleIndex();
         }
     }

trunk/ab5.0/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -962 +962 @@
 
     Variable *pVar = new Variable(
-        compiler.GetNamespaceSupporter().GetLivingNamespaceScopes(),
-        name,
+        Symbol( compiler.GetNamespaceSupporter().GetLivingNamespaceScopes(), name ),
         type,
         isConst,

trunk/ab5.0/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -241 +241 @@
     }
 
-    void NextSourceLine( int currentSourceIndex )
-    {
-        extern int cp;
-        pNativeCode->NextSourceLine( currentSourceIndex, cp );
+    void NextSourceLine( const SourceCodePosition &sourceCodePosition )
+    {
+        pNativeCode->NextSourceLine( sourceCodePosition );
     }
 

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

@@ -50 +50 @@
 
         // メタ情報
-        this->GetObjectModule().StaticLink( *pStaticLibrary );
+        this->GetObjectModule().StaticLink( *pStaticLibrary, this->IsSll() );
     }
 }

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

@@ -117 +117 @@
 
             //クラスを追加
-            CClass *pClass = new CClass( namespaceScopes, importedNamespaces, temporary );
+            CClass *pClass = new CClass( Symbol( namespaceScopes, temporary ), importedNamespaces );
             if( classes.IsExist( pClass ) )
             {
@@ -575 +575 @@
         //関数ハッシュへ登録
         UserProc *pUserProc = new UserProc(
-            NamespaceScopes(),
+            Symbol( NamespaceScopes(), methodName ),
             NamespaceScopesCollection(),
-            methodName,
             Procedure::Function,
             false,
@@ -1434 +1433 @@
     // クラスをコピー
     CClass *pNewClass = new CClass(
-        _class.GetNamespaceScopes(),
+        _class,
         _class.GetImportedNamespaces(),
-        _class.GetName(),
         _class.GetClassType(),
         _class.GetFormalGenericTypes(),

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

@@ -74 +74 @@
 
         //定数を追加
-        consts.Add( namespaceScopes, temporary, NextValue);
+        consts.Add( Symbol( namespaceScopes, temporary ), NextValue);
     }
 }
@@ -178 +178 @@
                     if( StaticCalculation(false, expression, 0, &i64data, resultType) )
                     {
-                        consts.Add( namespaceScopes, name, i64data, resultType );
+                        consts.Add( Symbol( namespaceScopes, name ), i64data, resultType );
                     }
                 }
@@ -185 +185 @@
                     // 定数マクロ
                     const char *params = temporary + i2;
-                    if( !constMacros.Add( namespaceScopes, name, params ) )
+                    if( !constMacros.Add( Symbol( namespaceScopes, name ), params ) )
                     {
                         compiler.errorMessenger.Output( 1, NULL, i );

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

@@ -115 +115 @@
             }
 
-            delegates.Put( new Delegate( namespaceScopes, importedNamespaces, name, procKind, paramStr, returnTypeName, nowLine ) );
+            delegates.Put( new Delegate( Symbol( namespaceScopes, name ), importedNamespaces, procKind, paramStr, returnTypeName, nowLine ) );
         }
     }
@@ -131 +131 @@
         const Delegate &dg = *delegates.Iterator_GetNext();
 
-        if( !dg.isTargetObjectModule )
+        if( dg.IsExternal() )
         {
             // 静的リンクライブラリの場合は飛ばす（既にインスタンスが定義済みであるため）

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

@@ -156 +156 @@
 
     //ソースコードの位置
-    userProc.SetSourceCodePosition( SourceCodePosition( compiler.GetObjectModule().GetName(), nowLine ) );
+    userProc.SetSourceCodePosition( SourceCodePosition( compiler.GetCurrentRelationalObjectModuleIndexForSource(), nowLine ) );
 
     //パラメータ
@@ -286 +286 @@
 
     //ソースコードの位置
-    pProc->SetSourceCodePosition( SourceCodePosition( compiler.GetObjectModule().GetName(), nowLine ) );
+    pProc->SetSourceCodePosition( SourceCodePosition( compiler.GetCurrentRelationalObjectModuleIndexForSource(), nowLine ) );
 
     //パラメータ
@@ -615 +615 @@
     }
 
-    UserProc *pUserProc = new UserProc( namespaceScopes, importedNamespaces, temporary, kind, isMacro, isCdecl, isExport );
+    UserProc *pUserProc = new UserProc( Symbol( namespaceScopes, temporary ), importedNamespaces, kind, isMacro, isCdecl, isExport );
     pUserProc->SetParentClass( pobj_c );
 
@@ -737 +737 @@
 
     // オブジェクトを生成
-    DllProc *pDllProc = new DllProc( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
+    DllProc *pDllProc = new DllProc( Symbol( namespaceScopes, procName ), kind, isCdecl, dllFileName, alias );
 
     // パラメータを解析

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

@@ -75 +75 @@
     typeDefs.push_back(
         TypeDef(
-            namespaceScopes,
-            temporary,
+            Symbol( namespaceScopes, temporary ),
             pTemp,
             baseType
@@ -176 +175 @@
                 typeDefs.push_back(
                     TypeDef(
-                        namespaceScopes,
-                        temporary,
+                        Symbol( namespaceScopes, temporary ),
                         "Long",
                         baseType

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

@@ -21 +21 @@
     while(classes.Iterator_HasNext()){
         CClass &objClass = *classes.Iterator_GetNext();
-        if( objClass.isTargetObjectModule == false )
+        if( objClass.IsExternal() )
         {
             // 静的リンクライブラリの場合は飛ばす（既にインスタンスが定義済みであるため）

trunk/ab5.0/abdev/ab_common/ab_common.vcproj

@@ -530 +530 @@
                 </File>
                 <File
+                    RelativePath=".\include\Lexical\RelationalObjectModuleItem.h"
+                    >
+                </File>
+                <File
                     RelativePath=".\include\Lexical\Source.h"
                     >

trunk/ab5.0/abdev/ab_common/include/Environment.h

@@ -27 +27 @@
 {
     static std::string rootPath;
+    static bool isRemoveExternal;
 public:
     static void SetAbdevRootPath( const std::string &rootPath );
@@ -38 +39 @@
 
     static const std::string GetCompilerExePath( Platform::EnumType platform );
+
+    static bool IsRemoveExternal()
+    {
+        return isRemoveExternal;
+    }
+    static void SetRemoveExternalMark( bool isRemoveExternalMark )
+    {
+        Environment::isRemoveExternal = isRemoveExternalMark;
+    }
 };
 

trunk/ab5.0/abdev/ab_common/include/Lexical/Class.h

@@ -18 +18 @@
 
 public:
-    ClassPrototype( const NamespaceScopes &namespaceScopes, const std::string &name )
-        : Prototype( namespaceScopes, name )
+    ClassPrototype( const Symbol &symbol )
+        : Prototype( symbol )
         , DynamicMethodsPrototype()
     {
@@ -92 +92 @@
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( ClassPrototype );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( classType );
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
@@ -112 +122 @@
 public:
 
-    CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name );
-    CClass( const NamespaceScopes &namespaceScopes,
+    CClass( const Symbol &symbol, const NamespaceScopesCollection &importedNamespaces );
+    CClass( const Symbol &symbol,
         const NamespaceScopesCollection &importedNamespaces,
-        const std::string &name, ClassType classType,
+        ClassType classType,
         const GenericTypes &formalGenericTypes,
         const Types &superClassActualTypeParameters,
@@ -455 +465 @@
     std::string GetStaticDefiningStringAsMemberOffsets() const;
     void GetReferenceOffsetsInitializeBuffer( std::string &referenceOffsetsBuffer, int &numOfReference, int baseOffset = 0 ) const;
+
+    virtual bool Resolve();
 };
 

trunk/ab5.0/abdev/ab_common/include/Lexical/Const.h

@@ -2 +2 @@
 
 //定数
-class CConst : public Symbol, public Jenga::Common::ObjectInHashmap<CConst>
+class CConst
+    : public RelationalObjectModuleItem
+    , public Jenga::Common::ObjectInHashmap<CConst>
 {
     Type type;
@@ -14 +16 @@
         trace_for_serialize( "serializing - CConst" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( type );
         ar & BOOST_SERIALIZATION_NVP( i64data );
@@ -20 +32 @@
 
 public:
-    CConst( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &newType, _int64 i64data)
-        : Symbol( namespaceScopes, name )
+    CConst( const Symbol &symbol, const Type &newType, _int64 i64data)
+        : RelationalObjectModuleItem( symbol )
         , type( newType )
         , i64data( i64data )
     {
     }
-    CConst( const NamespaceScopes &namespaceScopes, const std::string &name, int value)
-        : Symbol( namespaceScopes, name )
+    CConst( const Symbol &symbol, int value)
+        : RelationalObjectModuleItem( symbol )
         , type( Type(DEF_LONG) )
         , i64data( value )
@@ -53 +65 @@
     }
     double GetDoubleData();
+
+    virtual bool Resolve();
 };
 class Consts : public Jenga::Common::Hashmap<CConst>
@@ -69 +83 @@
 public:
 
-    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, _int64 i64data, const Type &type );
-    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, int value);
+    void Add( const Symbol &symbol, _int64 i64data, const Type &type );
+    void Add( const Symbol &symbol, int value);
 
 private:
@@ -83 +97 @@
 
 //定数マクロ
-class ConstMacro : public Symbol, public Jenga::Common::ObjectInHashmap<ConstMacro>
+class ConstMacro
+    : public RelationalObjectModuleItem
+    , public Jenga::Common::ObjectInHashmap<ConstMacro>
 {
     std::vector<std::string> parameters;
@@ -95 +111 @@
         trace_for_serialize( "serializing - ConstMacro" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( parameters );
         ar & BOOST_SERIALIZATION_NVP( expression );
@@ -101 +127 @@
 
 public:
-    ConstMacro( const NamespaceScopes &namespaceScopes, const std::string &name, const std::vector<std::string> &parameters, const std::string &expression )
-        : Symbol( namespaceScopes, name )
+    ConstMacro( const Symbol &symbol, const std::vector<std::string> &parameters, const std::string &expression )
+        : RelationalObjectModuleItem( symbol )
         , parameters( parameters )
         , expression( expression )
@@ -127 +153 @@
         return expression;
     }
+
+    virtual bool Resolve();
 };
-class ConstMacros : public Jenga::Common::Hashmap<ConstMacro>
+class ConstMacros
+    : public Jenga::Common::Hashmap<ConstMacro>
 {
     // XMLシリアライズ用
@@ -142 +171 @@
 
 public:
-    bool Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *parameterStr );
+    bool Add( const Symbol &symbol, const char *parameterStr );
     ConstMacro *Find( const Symbol &name );
 };

trunk/ab5.0/abdev/ab_common/include/Lexical/DataTable.h

@@ -149 +149 @@
 
     void ResetDataSectionBaseOffset( long dataSectionBaseOffset );
+
+    void Resolve();
 };

trunk/ab5.0/abdev/ab_common/include/Lexical/Delegate.h

@@ -22 +22 @@
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
         ar & BOOST_SERIALIZATION_NVP( dynamicParams );
@@ -27 +37 @@
 
 public:
-    Delegate( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name, Procedure::Kind procKind, const char *paramStr, const std::string &returnTypeName, int sourceIndex )
-        : Procedure( namespaceScopes, name, procKind, false )
+    Delegate( const Symbol &symbol, const NamespaceScopesCollection &importedNamespaces, Procedure::Kind procKind, const char *paramStr, const std::string &returnTypeName, int sourceIndex )
+        : Procedure( symbol, procKind, false )
         , importedNamespaces( importedNamespaces )
         , paramStr( paramStr )
@@ -81 +91 @@
     */
     bool IsSimilar( const Delegate &dgt ) const;
+
+    virtual bool Resolve();
 };
 typedef Jenga::Common::Hashmap<Delegate> Delegates;

trunk/ab5.0/abdev/ab_common/include/Lexical/Meta.h

@@ -157 +157 @@
 
     const CClass *FindClassSupportedTypeDef( const Symbol &symbol );
+
+    void Resolve();
 };

trunk/ab5.0/abdev/ab_common/include/Lexical/NativeCode.h

@@ -123 +123 @@
 class SourceLine
 {
-    int lineNum;
     long nativeCodePos;
-    int relationalObjectModuleIndex;
-    long sourceCodePos;
     DWORD codeType;
+    SourceCodePosition sourceCodePosition;
 
     // XMLシリアライズ用
@@ -136 +134 @@
         trace_for_serialize( "serializing - SourceLine" );
 
-        ar & BOOST_SERIALIZATION_NVP( lineNum );
         ar & BOOST_SERIALIZATION_NVP( nativeCodePos );
-        ar & BOOST_SERIALIZATION_NVP( relationalObjectModuleIndex );
-        ar & BOOST_SERIALIZATION_NVP( sourceCodePos );
         ar & BOOST_SERIALIZATION_NVP( codeType );
-    }
-
-public:
-    SourceLine( int lineNum, int nativeCodePos, int relationalObjectModuleIndex, int sourceCodePos, DWORD codeType )
-        : lineNum( lineNum )
-        , nativeCodePos( nativeCodePos )
-        , relationalObjectModuleIndex( relationalObjectModuleIndex )
-        , sourceCodePos( sourceCodePos )
+        ar & BOOST_SERIALIZATION_NVP( sourceCodePosition );
+    }
+
+public:
+    SourceLine( int nativeCodePos, DWORD codeType, const SourceCodePosition &sourceCodePosition )
+        : nativeCodePos( nativeCodePos )
         , codeType( codeType )
+        , sourceCodePosition( sourceCodePosition )
     {
     }
@@ -156 +150 @@
     }
 
-    int GetLineNum() const
-    {
-        return lineNum;
-    }
     long GetNativeCodePos() const
     {
         return nativeCodePos;
     }
-    int GetRelationalObjectModuleIndex() const
-    {
-        return relationalObjectModuleIndex;
-    }
-    void SetRelationalObjectModuleIndex( int relationalObjectModuleIndex )
-    {
-        this->relationalObjectModuleIndex = relationalObjectModuleIndex;
-    }
-    long GetSourceCodePos() const
-    {
-        return sourceCodePos;
-    }
-    void SetSourceCodePos( int sourceCodePos )
-    {
-        this->sourceCodePos = sourceCodePos;
-    }
     DWORD GetCodeType() const
     {
         return codeType;
+    }
+    const SourceCodePosition &GetSourceCodePosition() const
+    {
+        return sourceCodePosition;
+    }
+    SourceCodePosition &GetSourceCodePosition()
+    {
+        return sourceCodePosition;
+    }
+    void SetSourceCodePosition( const SourceCodePosition &sourceCodePosition )
+    {
+        this->sourceCodePosition = sourceCodePosition;
     }
     bool IsInSystemProc() const
@@ -256 +242 @@
         return sourceLines;
     }
-    void NextSourceLine( int currentSourceIndex, int nowLine );
+    void NextSourceLine( const SourceCodePosition &sourceCodePosition );
 
     void ResetDataSectionBaseOffset( long dataSectionBaseOffset );
-    void ResetSourceIndexes( const std::vector<int> &relationTable );
+    void ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable );
+
+    void Resolve();
 };

trunk/ab5.0/abdev/ab_common/include/Lexical/ObjectModule.h

@@ -43 +43 @@
 
 public:
-    void StaticLink( ObjectModule &objectModule );
 
     const std::string &GetName() const
@@ -62 +61 @@
     }
 
+    // 静的リンクを行う
+    void StaticLink( ObjectModule &objectModule, bool isSll );
+
+    // 依存関係の解決を行う
+    void Resolve();
+
     // 下記の関連になるようなテーブルを取得する
     // 要素 = 古いインデックス、値 = 新しいインデックス

trunk/ab5.0/abdev/ab_common/include/Lexical/Procedure.h

@@ -1 +1 @@
 #pragma once
 
-class Procedure : public Symbol
+class Procedure
+    : public RelationalObjectModuleItem
 {
 public:
@@ -35 +36 @@
         trace_for_serialize( "serializing - Procedure" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
         ar & BOOST_SERIALIZATION_NVP( kind );
         ar & BOOST_SERIALIZATION_NVP( isCdecl );
@@ -45 +46 @@
 
 public:
-    Procedure( const NamespaceScopes &namespaceScopes, const std::string &name, Kind kind, bool isCdecl )
-        : Symbol( namespaceScopes, name )
+    Procedure( const Symbol &symbol, Kind kind, bool isCdecl )
+        : RelationalObjectModuleItem( symbol )
         , kind( kind )
         , isCdecl( isCdecl )
@@ -91 +92 @@
         this->sourceCodePosition = sourceCodePosition;
     }
+    virtual void ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable );
 
     const Parameters &Params() const
@@ -156 +158 @@
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( _paramStr );
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
@@ -178 +190 @@
 public:
 
-    UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport );
+    UserProc( const Symbol &symbol, const NamespaceScopesCollection &importedNamespaces, Kind kind, bool isMacro, bool isCdecl, bool isExport );
     UserProc( const UserProc &userProc, const CClass *pParentClass );
     UserProc();
@@ -206 +218 @@
     }
 
+    virtual void ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable );
+
     /*!
     @brief  オーバーライド用に関数同士が等しいかどうかをチェックする
@@ -360 +374 @@
     const CMethod &GetMethod() const;
 
+    virtual bool Resolve();
 
     static const UserProc *pGlobalProc;
@@ -389 +404 @@
 };
 
-class DllProc : public Procedure, public Jenga::Common::ObjectInHashmap<DllProc>
+class DllProc
+    : public Procedure
+    , public Jenga::Common::ObjectInHashmap<DllProc>
 {
     std::string dllFileName;
@@ -403 +420 @@
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( dllFileName );
         ar & BOOST_SERIALIZATION_NVP( alias );
@@ -409 +436 @@
 
 public:
-    DllProc( const NamespaceScopes &namespaceScopes, const std::string &name, Kind kind, bool isCdecl, const std::string &dllFileName, const std::string &alias )
-        : Procedure( namespaceScopes, name, kind, isCdecl )
+    DllProc( const Symbol &symbol, Kind kind, bool isCdecl, const std::string &dllFileName, const std::string &alias )
+        : Procedure( symbol, kind, isCdecl )
         , dllFileName( dllFileName )
         , alias( alias )
@@ -454 +481 @@
         return lookupAddress;
     }
+
+    virtual bool Resolve();
 };
 class DllProcs : public Jenga::Common::Hashmap<DllProc>
@@ -469 +498 @@
 };
 
-class ProcPointer : public Procedure
+class ProcPointer
+    : public Procedure
 {
     // XMLシリアライズ用
@@ -483 +513 @@
 public:
     ProcPointer( Kind kind )
-        : Procedure( NamespaceScopes(), std::string(), kind, false )
+        : Procedure( Symbol( NamespaceScopes(), std::string() ), kind, false )
     {
     }
@@ -489 +519 @@
     {
     }
-    ~ProcPointer(){}
+    ~ProcPointer()
+    {
+    }
+
+    virtual bool Resolve();
 };
 

trunk/ab5.0/abdev/ab_common/include/Lexical/Prototype.h

@@ -4 +4 @@
 
 
-class Prototype : public Symbol
+class Prototype
+    : public RelationalObjectModuleItem
 {
 public:
@@ -23 +24 @@
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
         ar & BOOST_SERIALIZATION_NVP( isUsing );
     }
@@ -30 +31 @@
 public:
 
-    Prototype( const NamespaceScopes &namespaceScopes, const std::string &name )
-        : Symbol( namespaceScopes, name )
+    Prototype( const Symbol &symbol )
+        : RelationalObjectModuleItem( symbol )
         , isUsing( false )
     {
     }
     Prototype()
-        : Symbol()
     {
     }

trunk/ab5.0/abdev/ab_common/include/Lexical/Source.h

@@ -265 +265 @@
 class SourceCodePosition
 {
-    std::string objectModuleName;
+    int relationalObjectModuleIndex;
     int pos;
 
@@ -273 +273 @@
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
-        trace_for_serialize( "serializing - IncludedFilesRelation" );
-
-        ar & BOOST_SERIALIZATION_NVP( objectModuleName );
+        ar & BOOST_SERIALIZATION_NVP( relationalObjectModuleIndex );
         ar & BOOST_SERIALIZATION_NVP( pos );
     }
 
 public:
-    SourceCodePosition( const std::string &objectModuleName, int pos )
-        : objectModuleName( objectModuleName )
+    SourceCodePosition( int relationalObjectModuleIndex, int pos )
+        : relationalObjectModuleIndex( relationalObjectModuleIndex )
         , pos( pos )
     {
     }
     SourceCodePosition()
-        : pos( -1 )
-    {
-    }
-
-    const std::string &GetObjectModuleName() const
-    {
-        return objectModuleName;
+        : relationalObjectModuleIndex( -1 )
+        , pos( -1 )
+    {
+    }
+
+    int GetRelationalObjectModuleIndex() const;
+    void SetRelationalObjectModuleIndex( int relationalObjectModuleIndex )
+    {
+        this->relationalObjectModuleIndex = relationalObjectModuleIndex;
     }
     int GetPos() const
@@ -298 +298 @@
         return pos;
     }
-};
+    void SetPos( int pos )
+    {
+        this->pos = pos;
+    }
+
+    bool IsNothing() const;
+};

trunk/ab5.0/abdev/ab_common/include/Lexical/Symbol.h

@@ -38 +38 @@
 
 public:
-    bool isTargetObjectModule;
     Symbol( const NamespaceScopes &namespaceScopes, const std::string &name )
         : namespaceScopes( namespaceScopes )
         , name( name )
-        , isTargetObjectModule( true )
     {
     }
@@ -48 +46 @@
         : namespaceScopes( symbol.namespaceScopes )
         , name( symbol.name )
-        , isTargetObjectModule( true )
     {
     }
     Symbol()
-        : isTargetObjectModule( true )
     {
     }

trunk/ab5.0/abdev/ab_common/include/Lexical/Type.h

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

trunk/ab5.0/abdev/ab_common/include/Lexical/TypeDef.h

@@ -3 +3 @@
 class TypeDefCollection;
 
-class TypeDef : public Symbol
+class TypeDef
+    : public RelationalObjectModuleItem
 {
     friend TypeDefCollection;
@@ -17 +18 @@
         trace_for_serialize( "serializing - TypeDef" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( baseName );
         ar & BOOST_SERIALIZATION_NVP( baseType );
@@ -23 +34 @@
 
 public:
-    TypeDef( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, const Type &baseType );
+    TypeDef( const Symbol &symbol, const std::string &baseName, const Type &baseType );
     TypeDef()
     {
@@ -39 +50 @@
         return baseType;
     }
+
+    virtual bool Resolve();
 };
 
@@ -58 +71 @@
     ~TypeDefCollection();
 
-    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, int nowLine );
+    void Add( const Symbol &symbol, const std::string &baseName, int nowLine );
     const TypeDef *Find( const Symbol &symbol ) const;
 };

trunk/ab5.0/abdev/ab_common/include/Lexical/Variable.h

@@ -1 +1 @@
 #pragma once
 
-class Variable : public Symbol
+class Variable
+    : public RelationalObjectModuleItem
 {
     Type type;
@@ -36 +37 @@
         trace_for_serialize( "serializing - Variable" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( type );
         ar & BOOST_SERIALIZATION_NVP( isConst );
@@ -53 +64 @@
 public:
     Variable( const Symbol &symbol, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
-    Variable( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
     Variable( const Variable &var );
     Variable();
@@ -165 +175 @@
     }
 
+    virtual bool Resolve();
+
 
     bool isLiving;

trunk/ab5.0/abdev/ab_common/include/ab_common.h

@@ -8 +8 @@
 #include "Lexical/NamespaceSupporter.h"
 #include "Lexical/Symbol.h"
+#include "Lexical/RelationalObjectModuleItem.h"
 #include "Lexical/Prototype.h"
 #include "Lexical/TypeMisc.h"
@@ -13 +14 @@
 using namespace ActiveBasic::Common::Lexical;
 
+#include "Lexical/Source.h"
 #include "Lexical/NativeCode.h"
-#include "Lexical/Source.h"
 #include "Lexical/Type.h"
 #include "Lexical/Method.h"

trunk/ab5.0/abdev/ab_common/src/Environment.cpp

@@ -2 +2 @@
 
 std::string ActiveBasic::Common::Environment::rootPath;
+bool ActiveBasic::Common::Environment::isRemoveExternal = false;
 
 using namespace ActiveBasic::Common;

trunk/ab5.0/abdev/ab_common/src/Lexical/Class.cpp

@@ -2 +2 @@
 
 
-CClass::CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name )
-    : ClassPrototype( namespaceScopes, name )
+CClass::CClass( const Symbol &symbol, const NamespaceScopesCollection &importedNamespaces )
+    : ClassPrototype( symbol )
     , importedNamespaces( importedNamespaces )
     , classType( Class )
@@ -21 +21 @@
 }
 
-CClass::CClass( const NamespaceScopes &namespaceScopes,
+CClass::CClass(
+    const Symbol &symbol,
     const NamespaceScopesCollection &importedNamespaces,
-    const std::string &name,
     ClassType classType,
     const GenericTypes &formalGenericTypes,
@@ -31 +31 @@
     int vtblNum,
     int fixedAlignment )
-    : ClassPrototype( namespaceScopes, name )
+    : ClassPrototype( symbol )
     , importedNamespaces( importedNamespaces )
     , classType( classType )
@@ -868 +868 @@
     }
 }
+
+bool CClass::Resolve()
+{
+    // TODO: Resolve
+    return true;
+}

trunk/ab5.0/abdev/ab_common/src/Lexical/Const.cpp

@@ -7 +7 @@
 }
 
-void Consts::Add( const NamespaceScopes &namespaceScopes, const std::string &name, _int64 i64data, const Type &type )
+bool CConst::Resolve()
 {
-    CConst *newconst = new CConst(namespaceScopes, name, type, i64data);
+    // TODO: Resolve
+    return true;
+}
+
+void Consts::Add( const Symbol &symbol, _int64 i64data, const Type &type )
+{
+    CConst *newconst = new CConst( symbol, type, i64data );
 
     //ハッシュリストに追加
     Put( newconst );
 }
-void Consts::Add(const NamespaceScopes &namespaceScopes, const std::string &name, int value){
-    CConst *newconst = new CConst( namespaceScopes, name, value);
+void Consts::Add(const Symbol &symbol, int value){
+    CConst *newconst = new CConst( symbol, value);
 
     //ハッシュリストに追加
@@ -72 +78 @@
 }
 
+bool ConstMacro::Resolve()
+{
+    // TODO: Resolve
+    return true;
+}
+
 // マクロ定数を追加するための関数
-bool ConstMacros::Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *parameterStr )
+bool ConstMacros::Add( const Symbol &symbol, const char *parameterStr )
 {
     std::vector<std::string> parameters;
@@ -113 +125 @@
     lstrcpy(temporary,parameterStr+i+1);
 
-    this->Put( new ConstMacro( namespaceScopes, name, parameters, temporary ) );
+    this->Put( new ConstMacro( symbol, parameters, temporary ) );
 
     return true;

trunk/ab5.0/abdev/ab_common/src/Lexical/DataTable.cpp

@@ -77 +77 @@
     }
 }
+
+void DataTable::Resolve()
+{
+    // TODO: Resolve
+}

trunk/ab5.0/abdev/ab_common/src/Lexical/Delegate.cpp

@@ -18 +18 @@
     return false;
 }
+
+bool Delegate::Resolve()
+{
+    // TODO: Resolve
+    return true;
+}

trunk/ab5.0/abdev/ab_common/src/Lexical/Meta.cpp

@@ -50 +50 @@
     {
         UserProc *pUserProc = meta.GetUserProcs().Iterator_GetNext();
-        pUserProc->isTargetObjectModule = false;
+        if( pUserProc->IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
+        pUserProc->ResetRelationalObjectModuleIndex( relationTable );
 
         pUserProc->GetNativeCode().ResetDataSectionBaseOffset( dataSectionBaseOffset );
-        pUserProc->GetNativeCode().ResetSourceIndexes( relationTable );
 
         this->userProcs.Put( pUserProc );
@@ -64 +69 @@
     {
         DllProc *pDllProc = meta.GetDllProcs().Iterator_GetNext();
-        pDllProc->isTargetObjectModule = false;
+        if( pDllProc->IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
+        pDllProc->ResetRelationalObjectModuleIndex( relationTable );
         this->dllProcs.Put( pDllProc );
     }
@@ -74 +85 @@
     {
         CClass *pClass = meta.GetClasses().Iterator_GetNext();
-        pClass->isTargetObjectModule = false;
+        if( pClass->IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
+        pClass->ResetRelationalObjectModuleIndex( relationTable );
         pClass->Readed();
         this->GetClasses().Put( pClass );
@@ -84 +101 @@
     BOOST_FOREACH( Variable *pVar, meta.globalVars )
     {
+        if( pVar->IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
         // 基底スコープレベルのグローバル変数の生存値をオンにする
         if( pVar->GetScopeLevel() == 0 )
@@ -99 +122 @@
         }
 
-        pVar->isTargetObjectModule = false;
+        pVar->ResetRelationalObjectModuleIndex( relationTable );
         this->globalVars.Add( pVar, isResetOffsetAddress );
     }
@@ -113 +136 @@
     {
         CConst *pConst = meta.GetGlobalConsts().Iterator_GetNext();
-        pConst->isTargetObjectModule = false;
+        if( pConst->IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
+        pConst->ResetRelationalObjectModuleIndex( relationTable );
         this->GetGlobalConsts().Put( pConst );
     }
@@ -123 +152 @@
     {
         ConstMacro *pConstMacro = meta.GetGlobalConstMacros().Iterator_GetNext();
-        pConstMacro->isTargetObjectModule = false;
+        if( pConstMacro->IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
+        pConstMacro->ResetRelationalObjectModuleIndex( relationTable );
         this->GetGlobalConstMacros().Put( pConstMacro );
     }
@@ -131 +166 @@
     BOOST_FOREACH( BlittableType &blittableType, meta.blittableTypes )
     {
-        blittableType.isTargetObjectModule = false;
+        // TODO: coreモジュール以外でもBlittable型用のクラスモジュールを定義できるようにすべき
         this->blittableTypes.push_back( blittableType );
     }
@@ -139 +174 @@
     BOOST_FOREACH( TypeDef &typeDef, meta.typeDefs )
     {
-        typeDef.isTargetObjectModule = false;
+        if( typeDef.IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
+        typeDef.ResetRelationalObjectModuleIndex( relationTable );
         this->typeDefs.push_back( typeDef );
     }
@@ -147 +188 @@
     BOOST_FOREACH( ProcPointer *pProcPointer, meta.procPointers )
     {
-        pProcPointer->isTargetObjectModule = false;
+        if( pProcPointer->IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
+        pProcPointer->ResetRelationalObjectModuleIndex( relationTable );
         this->procPointers.push_back( pProcPointer );
     }
@@ -157 +204 @@
     {
         Delegate *pDelegate = meta.GetDelegates().Iterator_GetNext();
-        pDelegate->isTargetObjectModule = false;
+        if( pDelegate->IsExternal() )
+        {
+            // 外部参照の場合は取り込まない
+            continue;
+        }
+
+        pDelegate->ResetRelationalObjectModuleIndex( relationTable );
         this->GetDelegates().Put( pDelegate );
     }
@@ -199 +252 @@
     return NULL;
 }
+
+void Meta::Resolve()
+{
+    // 関数・メソッド
+    this->GetUserProcs().Iterator_Init();
+    this->GetUserProcs().Iterator_Reset();
+    while( this->GetUserProcs().Iterator_HasNext() )
+    {
+        UserProc *pUserProc = this->GetUserProcs().Iterator_GetNext();
+        pUserProc->Resolve();
+    }
+
+    // DLL関数
+    this->GetDllProcs().Iterator_Init();
+    this->GetDllProcs().Iterator_Reset();
+    while( this->GetDllProcs().Iterator_HasNext() )
+    {
+        DllProc *pDllProc = this->GetDllProcs().Iterator_GetNext();
+        pDllProc->Resolve();
+    }
+
+    // クラス
+    this->GetClasses().Iterator_Init();
+    this->GetClasses().Iterator_Reset();
+    while( this->GetClasses().Iterator_HasNext() )
+    {
+        CClass *pClass = this->GetClasses().Iterator_GetNext();
+        pClass->Resolve();
+    }
+
+    // グローバル変数
+    BOOST_FOREACH( Variable *pVar, globalVars )
+    {
+        pVar->Resolve();
+    }
+
+    // グローバル定数
+    this->GetGlobalConsts().Iterator_Init();
+    this->GetGlobalConsts().Iterator_Reset();
+    while( this->GetGlobalConsts().Iterator_HasNext() )
+    {
+        CConst *pConst = this->GetGlobalConsts().Iterator_GetNext();
+        pConst->Resolve();
+    }
+
+    // グローバル定数マクロ
+    this->GetGlobalConstMacros().Iterator_Init();
+    this->GetGlobalConstMacros().Iterator_Reset();
+    while( this->GetGlobalConstMacros().Iterator_HasNext() )
+    {
+        ConstMacro *pConstMacro = this->GetGlobalConstMacros().Iterator_GetNext();
+        pConstMacro->Resolve();
+    }
+
+    // TypeDef
+    BOOST_FOREACH( TypeDef &typeDef, typeDefs )
+    {
+        typeDef.Resolve();
+    }
+
+    // 関数ポインタ
+    BOOST_FOREACH( ProcPointer *pProcPointer, procPointers )
+    {
+        pProcPointer->Resolve();
+    }
+
+    // デリゲート
+    this->GetDelegates().Iterator_Init();
+    this->GetDelegates().Iterator_Reset();
+    while( this->GetDelegates().Iterator_HasNext() )
+    {
+        Delegate *pDelegate = this->GetDelegates().Iterator_GetNext();
+        pDelegate->Resolve();
+    }
+}

trunk/ab5.0/abdev/ab_common/src/Lexical/NativeCode.cpp

@@ -43 +43 @@
         this->sourceLines.push_back(
             SourceLine(
-                sourceLine.GetLineNum(),
                 baseOffset + sourceLine.GetNativeCodePos(),
-                sourceLine.GetRelationalObjectModuleIndex(),    // TODO: 複数libの取り込みを想定できていない（ソースコード行番号とネイティブコード位置の対応情報の追加は静的リンクが完了した後に行うべき）
-                sourceLine.GetSourceCodePos(),
-                sourceLine.GetCodeType()
+                sourceLine.GetCodeType(),
+                sourceLine.GetSourceCodePosition()
             )
         );
@@ -106 +104 @@
 }
 
-void NativeCode::NextSourceLine( int currentSourceIndex, int nowLine )
+void NativeCode::NextSourceLine( const SourceCodePosition &sourceCodePosition )
 {
     if( sourceLines.size() )
@@ -112 +110 @@
         if( sourceLines.back().GetNativeCodePos() == GetSize() )
         {
-            sourceLines.back().SetSourceCodePos( nowLine );
+            sourceLines.back().SetSourceCodePosition( sourceCodePosition );
             return;
         }
@@ -130 +128 @@
     sourceLines.push_back(
         SourceLine(
-            (long)sourceLines.size(),
             GetSize(),
-            currentSourceIndex,
-            nowLine,
-            sourceLineType
+            sourceLineType,
+            sourceCodePosition
         )
     );
@@ -152 +148 @@
     }
 }
-void NativeCode::ResetSourceIndexes( const std::vector<int> &relationTable )
+void NativeCode::ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable )
 {
     BOOST_FOREACH( SourceLine &sourceLine, sourceLines )
     {
-        sourceLine.SetRelationalObjectModuleIndex( relationTable[sourceLine.GetRelationalObjectModuleIndex()] );
+        sourceLine.GetSourceCodePosition().SetRelationalObjectModuleIndex(
+            relationTable[sourceLine.GetSourceCodePosition().GetRelationalObjectModuleIndex()]
+        );
     }
 }
+
+void NativeCode::Resolve()
+{
+    // TODO: Resolve
+}

trunk/ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp

@@ -56 +56 @@
 
 
-void ObjectModule::StaticLink( ObjectModule &objectModule )
+void ObjectModule::StaticLink( ObjectModule &objectModule, bool isSll )
 {
     const std::vector<int> relationTable = this->GetRelationTable( objectModule.relationalObjectModuleNames );
@@ -65 +65 @@
     meta.StaticLink( objectModule.meta, dataSectionBaseOffset, relationTable );
 
-    // グローバル ネイティブコードを結合
-    objectModule.globalNativeCode.ResetDataSectionBaseOffset( dataSectionBaseOffset );
-    objectModule.globalNativeCode.ResetSourceIndexes( relationTable );
-    globalNativeCode.PutEx( objectModule.globalNativeCode );
-
-    // データテーブルを結合
-    objectModule.dataTable.ResetDataSectionBaseOffset( dataSectionBaseOffset );
-    dataTable.Add( objectModule.dataTable );
+    if( !isSll )
+    {
+        // グローバル ネイティブコードを結合
+        objectModule.globalNativeCode.ResetDataSectionBaseOffset( dataSectionBaseOffset );
+        objectModule.globalNativeCode.ResetRelationalObjectModuleIndex( relationTable );
+        globalNativeCode.PutEx( objectModule.globalNativeCode );
+
+        // データテーブルを結合
+        objectModule.dataTable.ResetDataSectionBaseOffset( dataSectionBaseOffset );
+        dataTable.Add( objectModule.dataTable );
+    }
+
+    // 依存関係を解決
+    this->Resolve();
 
     // TODO: basbufがいらなくなったら消す
     extern char *basbuf;
     basbuf = this->source.GetBuffer();
+}
+
+void ObjectModule::Resolve()
+{
+    this->meta.Resolve();
+
+    // グローバルネイティブコードを解決（スケジュールを解決する）
+    this->globalNativeCode.Resolve();
+
+    // データテーブルを解決（スケジュールを解決する）
+    this->dataTable.Resolve();
 }
 

trunk/ab5.0/abdev/ab_common/src/Lexical/Procedure.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
+
+void Procedure::ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable )
+{
+    RelationalObjectModuleItem::ResetRelationalObjectModuleIndex( relationTable );
+
+    if( !this->sourceCodePosition.IsNothing() )
+    {
+        this->sourceCodePosition.SetRelationalObjectModuleIndex( relationTable[this->sourceCodePosition.GetRelationalObjectModuleIndex()] );
+    }
+}
+
+void UserProc::ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable )
+{
+    Procedure::ResetRelationalObjectModuleIndex( relationTable );
+
+    this->GetNativeCode().ResetRelationalObjectModuleIndex( relationTable );
+}
+
 int id_base = 0;
 
-UserProc::UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport )
-    : Procedure( namespaceScopes, name, kind, isCdecl )
+UserProc::UserProc( const Symbol &symbol, const NamespaceScopesCollection &importedNamespaces, Kind kind, bool isMacro, bool isCdecl, bool isExport )
+    : Procedure( symbol, kind, isCdecl )
     , importedNamespaces( importedNamespaces )
     , pParentClass( NULL )
@@ -139 +157 @@
 }
 
+bool UserProc::Resolve()
+{
+    // TODO: Resolve
+    return true;
+}
+
 const UserProc *UserProc::pGlobalProc = NULL;
 
@@ -161 +185 @@
 }
 
+bool DllProc::Resolve()
+{
+    // TODO: Resolve
+    return true;
+}
+
+bool ProcPointer::Resolve()
+{
+    // TODO: Resolve
+    return true;
+}
+
 void ProcPointers::Clear()
 {

trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp

@@ -941 +941 @@
     return 1;
 }
+
+int SourceCodePosition::GetRelationalObjectModuleIndex() const
+{
+    if( this->IsNothing() )
+    {
+        _ASSERTE( false );
+        throw;
+    }
+
+    return relationalObjectModuleIndex;
+}
+bool SourceCodePosition::IsNothing() const
+{
+    if( this->relationalObjectModuleIndex == -1 && this->pos == -1 )
+    {
+        return true;
+    }
+
+    if( this->relationalObjectModuleIndex == -1 || this->pos == -1 )
+    {
+        _ASSERTE( false );
+        throw;
+    }
+
+    return false;
+}

trunk/ab5.0/abdev/ab_common/src/Lexical/TypeDef.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-TypeDef::TypeDef( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, const Type &baseType )
-    : Symbol( namespaceScopes, name )
+TypeDef::TypeDef( const Symbol &symbol, const std::string &baseName, const Type &baseType )
+    : RelationalObjectModuleItem( symbol )
     , baseName( baseName )
     , baseType( baseType )
 {
+}
+
+bool TypeDef::Resolve()
+{
+    // TODO: Resolve
+    return true;
 }
 
@@ -12 +18 @@
 TypeDefCollection::~TypeDefCollection(){
 }
-void TypeDefCollection::Add( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, int nowLine ){
-    TypeDef typeDef( namespaceScopes, name, baseName, nowLine );
+void TypeDefCollection::Add( const Symbol &symbol, const std::string &baseName, int nowLine ){
+    TypeDef typeDef( symbol, baseName, nowLine );
     this->push_back( typeDef );
 }

trunk/ab5.0/abdev/ab_common/src/Lexical/Variable.cpp

@@ -2 +2 @@
 
 Variable::Variable( const Symbol &symbol, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
-    : Symbol( symbol )
-    , type( type )
-    , isConst( isConst )
-    , isRef( isRef )
-    , isArray( false )
-    , isParameter( false)
-    , paramStrForConstructor( paramStrForConstructor )
-    , hasInitData( hasInitData )
-{
-}
-Variable::Variable( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
-    : Symbol( namespaceScopes, name )
+    : RelationalObjectModuleItem( symbol )
     , type( type )
     , isConst( isConst )
@@ -24 +13 @@
 }
 Variable::Variable( const Variable &var )
-    : Symbol( var )
+    : RelationalObjectModuleItem( var )
     , type( var.type )
     , isConst( var.isConst )
@@ -37 +26 @@
 Variable::Variable()
 {
+}
+
+bool Variable::Resolve()
+{
+    // TODO: Resolve
+    return true;
 }
 

trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -1228 +1228 @@
         }
 
+        // SLLオプション
+        if( projectInfo.GetModuleType() == ActiveBasic::Common::TargetModuleType::Sll )
+        {
+            lstrcat(temporary," /static_library");
+        }
+
         //Unicodeオプション
         if(projectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");
@@ -1340 +1346 @@
         {
             lstrcat(temporary," /dll");
+        }
+
+        // SLLオプション
+        if( projectInfo.GetModuleType() == ActiveBasic::Common::TargetModuleType::Sll )
+        {
+            lstrcat(temporary," /static_library");
         }
 

trunk/ab5.0/abdev/compiler_x86/Compile_ProcOp.cpp

@@ -328 +328 @@
     }
 
-    char *backupBasbuf = NULL;
-    int backupCurrentRelationalObjectModuleIndexForSource = compiler.GetCurrentRelationalObjectModuleIndexForSource();
-
     if( !pUserProc->IsAutoGeneration() )
     {
-        // テンプレート展開がされている場合、対象のソースコードが現在のオブジェクトモジュールではない場合がある
-        if( compiler.staticLibraries[compiler.GetCurrentRelationalObjectModuleIndexForSource()]->GetName() != pUserProc->GetSourceCodePosition().GetObjectModuleName() )
-        {
-            for( int i=0; i<static_cast<int>(compiler.staticLibraries.size()); i++ )
-            {
-                const ObjectModule *pObjectModule = compiler.staticLibraries[i];
-
-                if( pObjectModule->GetName() == pUserProc->GetSourceCodePosition().GetObjectModuleName() )
-                {
-                    compiler.SetCurrentRelationalObjectModuleIndexForSource( i );
-                    basbuf = const_cast<char *>(compiler.GetCurrentSource().GetBuffer());
-                }
-            }
-        }
+        // 対象のソースコードを含むオブジェクトモジュールのインデックスを指定する
+        // ※テンプレート展開がされている場合、対象のソースコードが現在のオブジェクトモジュールではない場合がある
+        compiler.SetCurrentRelationalObjectModuleIndexForSource( pUserProc->GetSourceCodePosition().GetRelationalObjectModuleIndex() );
+        basbuf = const_cast<char *>(compiler.GetCurrentSource().GetBuffer());
 
         cp=pUserProc->GetSourceCodePosition().GetPos();

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -510 +510 @@
     {
         // 静的リンクライブラリ
+
+        // 外部参照をlibから取り除く
+        ActiveBasic::Common::Environment::SetRemoveExternalMark( true );
 
         // 格納先ディレクトリを作る