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

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

@@ -869 +869 @@
 }
 
-bool CClass::Resolve( const ObjectModule &resolver )
+bool CClass::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
     // 型パラメータ
     BOOST_FOREACH( GenericType &genericType, formalGenericTypes )
     {
-        genericType.GetType().Resolve( resolver );
+        genericType.GetType().Resolve( resolver, resolveErrors );
     }
 
@@ -882 +882 @@
         if( this->pSuperClass->IsNeedResolve() )
         {
-            this->pSuperClass = resolver.meta.GetClasses().FindEx( *pSuperClass );
+            const CClass *pTempClass = resolver.meta.GetClasses().FindLike( this->pSuperClass );
+            if( pTempClass )
+            {
+                this->pSuperClass = pTempClass;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pSuperClass->GetRelationalObjectModuleIndex(), this->pSuperClass->GetFullName() ) );
+            }
         }
     }
@@ -889 +897 @@
     BOOST_FOREACH( Type &superClassActualTypeParameter, superClassActualTypeParameters )
     {
-        superClassActualTypeParameter.Resolve( resolver );
+        superClassActualTypeParameter.Resolve( resolver, resolveErrors );
     }
 
     // Blittable型情報
-    blittableType.Resolve( resolver );
+    blittableType.Resolve( resolver, resolveErrors );
 
     // 実装するインターフェイス
     BOOST_FOREACH( ::Interface *pInterface, interfaces )
     {
-        pInterface->Resolve( resolver );
+        pInterface->Resolve( resolver, resolveErrors );
     }
 
@@ -904 +912 @@
     BOOST_FOREACH( Member *pMember, dynamicMembers )
     {
-        pMember->Resolve( resolver );
+        pMember->Resolve( resolver, resolveErrors );
     }
 
@@ -910 +918 @@
     BOOST_FOREACH( Member *pMember, staticMembers )
     {
-        pMember->Resolve( resolver );
+        pMember->Resolve( resolver, resolveErrors );
     }
 
@@ -916 +924 @@
     BOOST_FOREACH( CMethod *pMethod, GetDynamicMethods() )
     {
-        pMethod->Resolve( resolver );
+        pMethod->Resolve( resolver, resolveErrors );
     }
 
@@ -922 +930 @@
     BOOST_FOREACH( CMethod *pMethod, staticMethods )
     {
-        pMethod->Resolve( resolver );
+        pMethod->Resolve( resolver, resolveErrors );
     }
 
@@ -928 +936 @@
     BOOST_FOREACH( ActiveBasic::Common::Lexical::ExpandedTemplateClass *pExpandedTemplateClass, expandedTemplateClasses )
     {
-        pExpandedTemplateClass->Resolve( resolver );
+        pExpandedTemplateClass->Resolve( resolver, resolveErrors );
     }