Changeset 447 in dev for trunk/ab5.0

Timestamp:

Mar 21, 2008, 2:23:20 PM (16 years ago)

Author:

dai_9181

Message:

共変戻り値のオーバーロードをサポートした。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/Type.h (modified) (1 diff)
• src/Class.cpp (modified) (2 diffs)
• src/Procedure.cpp (modified) (1 diff)
• src/Type.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Type.h

@@ -153 +153 @@
 
     bool Equals( const Type &type ) const;
+    bool IsCovariant( const Type &type ) const;
 
     int GetBasicSize() const;

trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

@@ -130 +130 @@
 
 //自身の派生クラスかどうかを確認
-bool CClass::IsSubClass( const CClass *pClass ) const
-{
-    if( !pClass->HasSuperClass() )
+bool CClass::IsSubClass( const CClass *pSubClass ) const
+{
+    if( !pSubClass->HasSuperClass() )
     {
         return false;
     }
 
-    const CClass *pTempClass = &pClass->GetSuperClass();
+    const CClass *pTempClass = &pSubClass->GetSuperClass();
     while( pTempClass ){
         if( this == pTempClass ) return true;
@@ -146 +146 @@
 
 //自身と等しいまたは派生クラスかどうかを確認
-bool CClass::IsEqualsOrSubClass( const CClass *pClass ) const
-{
-    if( IsEquals( pClass ) ) return true;
-    return IsSubClass( pClass );
+bool CClass::IsEqualsOrSubClass( const CClass *pSubClass ) const
+{
+    if( IsEquals( pSubClass ) ) return true;
+    return IsSubClass( pSubClass );
 }
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -26 +26 @@
             return true;
         }
-
-        if( this->returnType.IsTypeParameter() )
+        else if( this->returnType.IsCovariant( pUserProc->returnType ) )
+        {
+            // 戻り値が共変
+            return true;
+        }
+        else if( this->returnType.IsTypeParameter() )
         {
             // 型パラメータだったとき
+
             if( actualTypeParametersForThisProc[this->returnType.GetFormalTypeIndex()].Equals( pUserProc->returnType ) )
             {
                 // 戻り値が等しい
+                return true;
+            }
+            else if( actualTypeParametersForThisProc[this->returnType.GetFormalTypeIndex()].IsCovariant( pUserProc->returnType ) )
+            {
+                // 戻り値が共変
                 return true;
             }

trunk/ab5.0/abdev/BasicCompiler_Common/src/Type.cpp

@@ -150 +150 @@
     }
     return false;
+}
+
+bool Type::IsCovariant( const Type &type ) const
+{
+    if( !this->IsObject() || !type.IsObject() )
+    {
+        // 共変性の判別はクラス型のみ
+        return false;
+    }
+
+    return this->GetClass().IsSubClass( &type.GetClass() );
 }