Changeset 640 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/Procedure.h

Timestamp:

Jun 14, 2008, 12:16:27 PM (16 years ago)

Author:

dai_9181

Message:

静的リンクリンカの依存関係解決モジュールを製作中

File:

• trunk/ab5.0/abdev/ab_common/include/Lexical/Procedure.h (modified) (7 diffs)

trunk/ab5.0/abdev/ab_common/include/Lexical/Procedure.h

@@ -111 +111 @@
     }
 
-    virtual bool Resolve( const ObjectModule &resolver );
+    virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
 };
 
@@ -161 +161 @@
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
         ar & boost::serialization::make_nvp("pParentClass", const_cast<CClass *&>(pParentClass) );
+        ar & boost::serialization::make_nvp("pInterface", const_cast<Interface *&>(pInterface) );
 
         if( ActiveBasic::Common::Environment::IsRemoveExternal() )
@@ -173 +174 @@
         ar & BOOST_SERIALIZATION_NVP( _paramStr );
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
-        ar & boost::serialization::make_nvp("pInterface", const_cast<Interface *&>(pInterface) );
         ar & BOOST_SERIALIZATION_NVP( pMethod );
         ar & BOOST_SERIALIZATION_NVP( isMacro );
@@ -209 +209 @@
     virtual bool IsDuplication( const UserProc *pUserProc ) const
     {
-        if( this->GetParentClassPtr() == pUserProc->GetParentClassPtr() // 親クラスが等しい
-            && this->pInterface == pUserProc->pInterface                // インターフェイスが等しい
-            && pUserProc->IsEqualSymbol( *this )                        // 名前空間及び名前が等しい
-            && this->Params().Equals( pUserProc->Params() )             // パラメータが等しい
-            && this->returnType.Equals( pUserProc->returnType ) )       // 戻り値が等しい
+        bool isEqualParentClass =
+            this->HasParentClass() && pUserProc->HasParentClass()
+            ? this->GetParentClassPtr()->Equals( pUserProc->GetParentClassPtr() )
+            : this->GetParentClassPtr() == pUserProc->GetParentClassPtr();
+        bool isEqualInterface =
+            this->pInterface && pUserProc->pInterface
+            ? this->pInterface->Equals( pUserProc->pInterface )
+            : this->pInterface == pUserProc->pInterface;
+
+        if( isEqualParentClass                                      // 親クラスが等しい
+            && isEqualInterface                                     // インターフェイスが等しい
+            && pUserProc->IsEqualSymbol( *this )                    // 名前空間及び名前が等しい
+            && this->Params().Equals( pUserProc->Params() )         // パラメータが等しい
+            && this->returnType.Equals( pUserProc->returnType ) )   // 戻り値が等しい
         {
             return true;
@@ -376 +385 @@
     const CMethod &GetMethod() const;
 
-    virtual bool Resolve( const ObjectModule &resolver );
+    virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
 
     static const UserProc *pGlobalProc;
@@ -484 +493 @@
     }
 
-    virtual bool Resolve( const ObjectModule &resolver );
+    virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
 };
 class DllProcs : public Jenga::Common::Hashmap<DllProc>
@@ -525 +534 @@
     }
 
-    virtual bool Resolve( const ObjectModule &resolver );
+    virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
 };