[svn] r6864: nemerle/trunk/ncc: hierarchy/TypeBuilder.n testsuite/positive/operators.n

[nazgul]

Log:
Fix overloading check

Author: nazgul
Date: Sat Nov 11 11:05:55 2006
New Revision: 6864

Modified:
   nemerle/trunk/ncc/hierarchy/TypeBuilder.n
   nemerle/trunk/ncc/testsuite/positive/operators.n

Modified: nemerle/trunk/ncc/hierarchy/TypeBuilder.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/TypeBuilder.n	(original)
+++ nemerle/trunk/ncc/hierarchy/TypeBuilder.n	Sat Nov 11 11:05:55 2006
@@ -1476,7 +1476,7 @@
             par_amount == 1 && (m.Name == "op_Implicit" || m.Name == "op_Explicit")
             && (m is BuiltinMethod || (m.IsStatic && (m.Attributes %&& NemerleAttributes.Public)))
           }
-          def return_type_overload = sig_matches && // m.DeclaringType.Equals (this) &&
+          def return_type_overload = sig_matches && m.DeclaringType.Equals (this) &&
             match ((sub_current, meth.GetMemType ())) {
               | (MType.Fun (t1, r1), MType.Fun (t2, r2))
                 when t1.Fix ().Equals (t2.Fix ()) && ! r1.Fix ().Equals (r2.Fix ()) =>

Modified: nemerle/trunk/ncc/testsuite/positive/operators.n
==============================================================================
--- nemerle/trunk/ncc/testsuite/positive/operators.n	(original)
+++ nemerle/trunk/ncc/testsuite/positive/operators.n	Sat Nov 11 11:05:55 2006
@@ -129,12 +129,12 @@
 }
 
 public class OpOverloaded {
-  public static @:> (x : OpOverloaded) : int {  1 }
-  public static @:> (x : OpOverloaded) : string { "ss" }
-  public static @:> (x : int) : OpOverloaded {  null }
-  public static @: (x : OpOverloaded) : int {  1 }
-  public static @: (x : OpOverloaded) : string { "ss" }
-  public static @: (x : int) : OpOverloaded {  null }
+  public static @:> (_x : OpOverloaded) : int {  1 }
+  public static @:> (_x : OpOverloaded) : string { "ss" }
+  public static @:> (_x : int) : OpOverloaded {  null }
+  public static @: (_x : OpOverloaded) : int {  1 }
+  public static @: (_x : OpOverloaded) : string { "ss" }
+  public static @: (_x : int) : OpOverloaded {  null }
 }
 
 class B1 {