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

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

@@ -33 +33 @@
 }
 
+bool Interface::Equals( const Interface *pInterface ) const
+{
+    // ポインタが等しいかどうかを見てみる
+    if( this == pInterface )
+    {
+        return true;
+    }
+    else if( this->pInterfaceClass->IsNeedResolve() || pInterface->pInterfaceClass->IsNeedResolve() )
+    {
+        // 依存関係解決前の状態であれば、パスが等しいかどうかを見てみる
+        if( this-pInterfaceClass->IsDuplication( pInterface->pInterfaceClass ) )
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
 std::string Interface::GetFullNameWithActualGenericTypeParameters() const
 {
@@ -53 +71 @@
 }
 
-bool Interface::Resolve( const ObjectModule &resolver )
+bool Interface::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
     // 動的メソッド
     BOOST_FOREACH( CMethod *pMethod, GetDynamicMethods() )
     {
-        pMethod->Resolve( resolver );
+        pMethod->Resolve( resolver, resolveErrors );
     }
 
@@ -66 +84 @@
         if( this->pInterfaceClass->IsNeedResolve() )
         {
-            this->pInterfaceClass = resolver.meta.GetClasses().FindLike( pInterfaceClass );
+            const CClass *pTempClass = resolver.meta.GetClasses().FindLike( this->pInterfaceClass );
+            if( pTempClass )
+            {
+                this->pInterfaceClass = pTempClass;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pInterfaceClass->GetRelationalObjectModuleIndex(), this->pInterfaceClass->GetFullName() ) );
+            }
         }
     }
@@ -72 +98 @@
     BOOST_FOREACH( Type &actualTypeParameter, actualTypeParameters )
     {
-        actualTypeParameter.Resolve( resolver );
+        actualTypeParameter.Resolve( resolver, resolveErrors );
     }