Changeset 640 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Method.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/Method.cpp (modified) (4 diffs)

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

@@ -1 +1 @@
 #include "stdafx.h"
 
-bool CMethod::Resolve( const ObjectModule &resolver )
+bool CMethod::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
-    if( pUserProc )
+    if( this->pUserProc )
     {
-        if( pUserProc->IsNeedResolve() )
+        if( this->pUserProc->IsNeedResolve() )
         {
-            pUserProc = resolver.meta.GetUserProcs().FindLike( pUserProc );
+            const UserProc *pTempUserProc = resolver.meta.GetUserProcs().FindLike( this->pUserProc );
+            if( pTempUserProc )
+            {
+                this->pUserProc = pTempUserProc;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pUserProc->GetRelationalObjectModuleIndex(), this->pUserProc->GetFullName() ) );
+            }
         }
     }
@@ -41 +49 @@
 }
 
-bool DynamicMethod::Resolve( const ObjectModule &resolver )
+bool DynamicMethod::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
-    CMethod::Resolve( resolver );
+    CMethod::Resolve( resolver, resolveErrors );
 
     if( this->pInheritsClass )
@@ -49 +57 @@
         if( this->pInheritsClass->IsNeedResolve() )
         {
-            this->pInheritsClass = resolver.meta.GetClasses().FindLike( pInheritsClass );
+            const CClass *pTempClass = resolver.meta.GetClasses().FindLike( pInheritsClass );
+            if( pTempClass )
+            {
+                this->pInheritsClass = pTempClass;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pInheritsClass->GetRelationalObjectModuleIndex(), this->pInheritsClass->GetFullName() ) );
+            }
         }
     }
@@ -62 +78 @@
 }
 
-bool StaticMethod::Resolve( const ObjectModule &resolver )
+bool StaticMethod::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
-    CMethod::Resolve( resolver );
+    CMethod::Resolve( resolver, resolveErrors );
     return true;
 }