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

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

@@ -12 +12 @@
 }
 
-bool Procedure::Resolve( const ObjectModule &resolver )
+bool Procedure::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
     BOOST_FOREACH( Parameter *pParameter, params )
     {
-        pParameter->Resolve( resolver );
-    }
-
-    returnType.Resolve( resolver );
+        pParameter->Resolve( resolver, resolveErrors );
+    }
+
+    returnType.Resolve( resolver, resolveErrors );
 
     return true;
@@ -170 +170 @@
 }
 
-bool UserProc::Resolve( const ObjectModule &resolver )
-{
-    Procedure::Resolve( resolver );
-
-    if( pParentClass )
-    {
-        if( pParentClass->IsNeedResolve() )
-        {
-            pParentClass = resolver.meta.GetClasses().FindLike( pParentClass );
+bool UserProc::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
+{
+    Procedure::Resolve( resolver, resolveErrors );
+
+    if( this->pParentClass )
+    {
+        if( this->pParentClass->IsNeedResolve() )
+        {
+            const CClass *pTempClass = resolver.meta.GetClasses().FindLike( this->pParentClass );
+            if( pTempClass )
+            {
+                this->pParentClass = pTempClass;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pParentClass->GetRelationalObjectModuleIndex(), this->pParentClass->GetFullName() ) );
+            }
         }
     }
@@ -184 +192 @@
     if( pInterface )
     {
-        const_cast<Interface *>(pInterface)->Resolve( resolver );
+        const_cast<Interface *>(pInterface)->Resolve( resolver, resolveErrors );
     }
 
     if( pMethod )
     {
-        pMethod->Resolve( resolver );
+        pMethod->Resolve( resolver, resolveErrors );
     }
 
     BOOST_FOREACH( Parameter *pParameter, realParams )
     {
-        pParameter->Resolve( resolver );
+        pParameter->Resolve( resolver, resolveErrors );
     }
 
     BOOST_FOREACH( Variable *pLocalVar, localVars )
     {
-        pLocalVar->Resolve( resolver );
-    }
-
-    nativeCode.Resolve( resolver );
+        pLocalVar->Resolve( resolver, resolveErrors );
+    }
+
+    nativeCode.Resolve( resolver, resolveErrors );
     return true;
 }
@@ -228 +236 @@
 }
 
-bool DllProc::Resolve( const ObjectModule &resolver )
-{
-    Procedure::Resolve( resolver );
-    return true;
-}
-
-bool ProcPointer::Resolve( const ObjectModule &resolver )
-{
-    Procedure::Resolve( resolver );
+bool DllProc::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
+{
+    Procedure::Resolve( resolver, resolveErrors );
+    return true;
+}
+
+bool ProcPointer::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
+{
+    Procedure::Resolve( resolver, resolveErrors );
     return true;
 }