Changeset 640 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/NativeCode.cpp

Timestamp:

Jun 14, 2008, 12:16:27 PM (16 years ago)

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/ab_common/src/Lexical/NativeCode.cpp (modified) (4 diffs)

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

@@ -19 +19 @@
 }
 
-bool Schedule::Resolve( const ObjectModule &resolver )
+bool Schedule::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
     switch( type )
@@ -26 +26 @@
     case AddressOf:
     case CatchAddress:
-        if( pUserProc->IsNeedResolve() )
-        {
-            pUserProc = resolver.meta.GetUserProcs().FindLike( pUserProc );
+        if( this->pUserProc->IsNeedResolve() )
+        {
+            const ::UserProc *pTempUserProc = resolver.meta.GetUserProcs().FindLike( this->pUserProc );
+            if( pTempUserProc )
+            {
+                this->pUserProc = pTempUserProc;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pUserProc->GetRelationalObjectModuleIndex(), this->pUserProc->GetFullName() ) );
+            }
         }
         break;
     case DllProc:
-        if( pDllProc->IsNeedResolve() )
-        {
-            pDllProc = resolver.meta.GetDllProcs().FindLike( pDllProc );
+        if( this->pDllProc->IsNeedResolve() )
+        {
+            const ::DllProc *pTempDllProc = resolver.meta.GetDllProcs().FindLike( this->pDllProc );
+            if( pTempDllProc )
+            {
+                this->pDllProc = pTempDllProc;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pDllProc->GetRelationalObjectModuleIndex(), this->pDllProc->GetFullName() ) );
+            }
         }
         break;
@@ -40 +56 @@
     case Vtbl:
     case TypeInfo:
-        if( pClass->IsNeedResolve() )
-        {
-            pClass = resolver.meta.GetClasses().FindLike( pClass );
+        if( this->pClass->IsNeedResolve() )
+        {
+            const CClass *pTempClass = resolver.meta.GetClasses().FindLike( this->pClass );
+            if( pTempClass )
+            {
+                this->pClass = pTempClass;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pClass->GetRelationalObjectModuleIndex(), this->pClass->GetFullName() ) );
+            }
         }
         break;
@@ -191 +215 @@
 }
 
-void NativeCode::Resolve( const ObjectModule &resolver )
+void NativeCode::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
     BOOST_FOREACH( Schedule &schedule, schedules )
     {
-        schedule.Resolve( resolver );
-    }
-}
+        schedule.Resolve( resolver, resolveErrors );
+    }
+}