[svn] r6085: nemerle/trunk: lib/list.n lib/set.n snippets/designpatt/proxy-p.n

malekith svnadmin at nemerle.org
Tue Jan 24 16:06:21 CET 2006


Log:
Don't shadow type parameters.

Author: malekith
Date: Tue Jan 24 16:06:20 2006
New Revision: 6085

Modified:
   nemerle/trunk/lib/list.n
   nemerle/trunk/lib/set.n
   nemerle/trunk/snippets/designpatt/proxy-p.n

Modified: nemerle/trunk/lib/list.n
==============================================================================
--- nemerle/trunk/lib/list.n	(original)
+++ nemerle/trunk/lib/list.n	Tue Jan 24 16:06:20 2006
@@ -160,7 +160,7 @@
       Nemerle.Collections.ListEnumerator(this)
     }
 
-    public static @+ ['a] (x : list ['a], y : list ['a]) : list ['a]
+    public static @+ (x : list ['a], y : list ['a]) : list ['a]
     {
       NCL.Append (x, y)
     }

Modified: nemerle/trunk/lib/set.n
==============================================================================
--- nemerle/trunk/lib/set.n	(original)
+++ nemerle/trunk/lib/set.n	Tue Jan 24 16:06:20 2006
@@ -32,14 +32,12 @@
   public class Set ['a]
     where 'a : System.IComparable ['a]
   {
-    public static Singleton ['a] (elem : 'a) : Set ['a]
-      where 'a : System.IComparable ['a]
+    public static Singleton (elem : 'a) : Set ['a]
     {
       Set ().Add (elem)
     }
 
-    public static FromList ['a] (elems : list ['a]) : Set ['a]
-      where 'a : System.IComparable ['a]
+    public static FromList (elems : list ['a]) : Set ['a]
     {
       Set ().AddList (elems)
     }
@@ -155,8 +153,7 @@
       Fold ([], fun (e, a) { e :: a })
     }
 
-    public static Sum['a] (sets : list [Set ['a]]) : Set ['a]
-      where 'a : System.IComparable ['a]
+    public static Sum (sets : list [Set ['a]]) : Set ['a]
     {
       List.FoldLeft (sets, Set (), fun (e, s : Set ['a]) { s.Sum (e) })
     }

Modified: nemerle/trunk/snippets/designpatt/proxy-p.n
==============================================================================
--- nemerle/trunk/snippets/designpatt/proxy-p.n	(original)
+++ nemerle/trunk/snippets/designpatt/proxy-p.n	Tue Jan 24 16:06:20 2006
@@ -61,7 +61,7 @@
   }
   public Gene (x : 'a) : 'a { x }
   
-  public Gene ['a] (x : 'a) : 'a { x }
+  public Gene ['b] (x : 'b) : 'b { x }
 }
 
 [Record]



More information about the svn mailing list