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

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

@@ -129 +129 @@
 bool Type::Equals( const Type &type ) const
 {
-    if( basicType == type.basicType ){
-        if( NATURAL_TYPE( basicType ) == DEF_OBJECT
-            || NATURAL_TYPE( basicType ) == DEF_STRUCT ){
-
-                if( index == type.index ){
+    if( basicType == type.basicType )
+    {
+        if( NATURAL_TYPE( basicType ) == DEF_OBJECT || NATURAL_TYPE( basicType ) == DEF_STRUCT )
+        {
+            // ポインタが等しいかどうかを見てみる
+            if( this->pClass == type.pClass )
+            {
+                return true;
+            }
+            else if( this->pClass->IsNeedResolve() || type.pClass->IsNeedResolve() )
+            {
+                // 依存関係解決前の状態であれば、パスが等しいかどうかを見てみる
+                if( this->pClass->IsDuplication( type.pClass ) )
+                {
                     return true;
                 }
-
-        }
-        else{
+            }
+        }
+        else
+        {
             return true;
         }
@@ -556 +566 @@
 }
 
-bool Type::Resolve( const ObjectModule &resolver )
+bool Type::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
 {
     if( this->HasMember() )
@@ -562 +572 @@
         if( this->pClass->IsNeedResolve() )
         {
-            this->pClass = resolver.meta.GetClasses().FindLike( this->pClass );
+            const CClass *pTempClass = resolver.meta.GetClasses().FindLike( this->pClass );
+            if( pTempClass )
+            {
+                this->pClass = pTempClass;
+            }
+            else
+            {
+                resolveErrors.Add( ResolveError( this->pClass->GetRelationalObjectModuleIndex(), this->pClass->GetFullName() ) );
+            }
         }
 
         BOOST_FOREACH( GenericType &actualGenericType, actualGenericTypes )
         {
-            actualGenericType.GetType().Resolve( resolver );
+            actualGenericType.GetType().Resolve( resolver, resolveErrors );
         }
     }
@@ -655 +673 @@
     return pClass->GetNamespaceScopes().ToString() + "." + pClass->GetName() + "._Create";
 }
+
+bool BlittableType::Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors )
+{
+    basicType.Resolve( resolver, resolveErrors );
+
+    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() ) );
+        }
+    }
+
+    return true;
+}