Changeset 637 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Meta.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/ab_common/src/Lexical/Meta.cpp (modified) (12 diffs)

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();
+    }
+}