Changeset 383 in dev

Timestamp:

Jan 2, 2008, 1:21:43 AM (17 years ago)

Author:

dai_9181

Message:

ジェネリクスインターフェイス実装時のオーバーロード解決ロジックを改良。（型パラメータを引数に持つメソッドのオーバーロードをミスしてしまうバグを修正）

Location:

trunk/abdev

Files:

• BasicCompiler32/BasicCompiler.rc (modified) (1 diff)
• BasicCompiler_Common/include/Parameter.h (modified) (2 diffs)
• BasicCompiler_Common/include/ver.h (modified) (1 diff)
• BasicCompiler_Common/src/Parameter.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Procedure.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/BasicCompiler.rc

@@ -369 +369 @@
             VALUE "InternalName", "ActiveBasic"
             VALUE "LegalCopyright", "Copyright (C) 2007"
-            VALUE "OriginalFilename", "abc.exe"
+            VALUE "OriginalFilename", "BasicCompiler32.exe"
             VALUE "ProductName", "ActiveBasic"
             VALUE "ProductVersion", "5, 0, 0, 0"

trunk/abdev/BasicCompiler_Common/include/Parameter.h

@@ -85 +85 @@
     }
 
-    bool Equals( const Parameter &param ) const
-    {
-        if( Type::Equals( param ) ){
-            return true;
-        }
-        else{
-
-            if( this->isRef && this->GetBasicType() == DEF_ANY &&
-                param.isRef == false && param.IsPointer()
-                ||
-                this->isRef == false && this->IsPointer() &&
-                param.isRef && param.GetBasicType() == DEF_ANY ){
-                    /* ByRef var As Any
-                            と
-                        var As VoidPtr
-                        は同等
-                    */
-                    return true;
-            }
-        }
-
-        return false;
-    }
+    bool Equals( const Parameter &param ) const;
+    bool Equals( const Types &actualTypeParametersForThisProc, const Parameter &param ) const;
 };
 
@@ -124 +103 @@
 public:
 
-    bool Equals( const Parameters &params ) const
-    {
-        if( this->size() != params.size() ){
-            return false;
-        }
-
-        int max = (int)this->size();
-        for( int i=0; i<max; i++ ){
-            if( !(*this)[i]->Equals( *params[i] ) ){
-                return false;
-            }
-        }
-
-        return true;
-    }
+    bool Equals( const Parameters &params ) const;
+    bool Equals( const Types &actualTypeParametersForThisProc, const Parameters &params ) const;
 
     int GetMemorySize() const

trunk/abdev/BasicCompiler_Common/include/ver.h

@@ -6 +6 @@
 // バージョン付加文字列
 #ifdef _AMD64_
-#define VER_INFO        "(x64) (rev.396)"
+#define VER_INFO        "(x64) (rev.397)"
 #else
-#define VER_INFO        "(rev.396)"
+#define VER_INFO        "(rev.397)"
 #endif

trunk/abdev/BasicCompiler_Common/src/Parameter.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
+
+bool Parameter::Equals( const Parameter &param ) const
+{
+    if( Type::Equals( param ) )
+    {
+        return true;
+    }
+    else
+    {
+        if( this->isRef && this->GetBasicType() == DEF_ANY &&
+            param.isRef == false && param.IsPointer()
+            ||
+            this->isRef == false && this->IsPointer() &&
+            param.isRef && param.GetBasicType() == DEF_ANY )
+        {
+            /* ByRef var As Any
+                    と
+                var As VoidPtr
+                は同等
+            */
+            return true;
+        }
+    }
+
+    return false;
+}
+bool Parameter::Equals( const Types &actualTypeParametersForThisProc, const Parameter &param ) const
+{
+    if( Equals( param ) )
+    {
+        return true;
+    }
+    
+    if( this->IsTypeParameter() )
+    {
+        // 型パラメータだったとき
+        if( actualTypeParametersForThisProc[this->GetFormalTypeIndex()].Equals( param ) )
+        {
+            // 戻り値が等しい
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool Parameters::Equals( const Parameters &params ) const
+{
+    if( this->size() != params.size() ){
+        return false;
+    }
+
+    int max = (int)this->size();
+    for( int i=0; i<max; i++ ){
+        if( !(*this)[i]->Equals( *params[i] ) ){
+            return false;
+        }
+    }
+
+    return true;
+}
+bool Parameters::Equals( const Types &actualTypeParametersForThisProc, const Parameters &params ) const
+{
+    if( this->size() != params.size() ){
+        return false;
+    }
+
+    int max = (int)this->size();
+    for( int i=0; i<max; i++ ){
+        if( !(*this)[i]->Equals( actualTypeParametersForThisProc, *params[i] ) ){
+            return false;
+        }
+    }
+
+    return true;
+}
 
 bool Parameters::Analyze( const char *sourceOfParams, int nowLine )

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -20 +20 @@
 {
     if( this->GetName() == pUserProc->GetName()                     // 名前空間及び名前が等しい
-        && this->Params().Equals( pUserProc->Params() ) )           // パラメータが等しい
+        && this->Params().Equals( actualTypeParametersForThisProc, pUserProc->Params() ) )          // パラメータが等しい
     {
         if( this->returnType.Equals( pUserProc->returnType ) )