more v2 classes some workarounds are here for gmcs bugs

svn path=/trunk/mcs/; revision=29910

mcs/class/corlib/System.Collections.Generic/ChangeLog

@@ -1,3 +1,7 @@
+2004-06-18  Ben Maurer  <[email protected]>
+
+	* Comparer.cs: v2 impl. Some workarounds for gmcs are enabled.
+
 2004-05-26  Sebastien Pouliot  <[email protected]>
 
 	* Queue.cs: Fixed possible integer overflow in CopyTo methods.

mcs/class/corlib/System.Collections.Generic/Comparer.cs

@@ -0,0 +1,100 @@
+//
+// Comparer
+//
+// Authors:
+//	Ben Maurer ([email protected])
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+using System;
+using System.Runtime.InteropServices;
+
+namespace System.Collections.Generic {
+	[CLSCompliant(false)]
+	public abstract class Comparer<T> : IComparer<T>, System.Collections.IKeyComparer,
+		System.Collections.IComparer, System.Collections.IHashCodeProvider {
+	
+		public Comparer () {} /* workaround 60438 by not having a protected ctor */
+		public abstract int Compare (T x, T y);
+		public abstract bool Equals (T x, T y);
+		public virtual int GetHashCode (T obj)
+		{
+			if (obj == null)
+				throw new ArgumentNullException ();
+			return obj.GetHashCode ();
+		}
+	
+		static DefaultComparer <T> _default;
+		public static Comparer<T> Default
+		{
+			get {
+				throw new NotImplementedException ("Waiting on bug#60437");
+				//if (_default != null)
+				//	return _default;
+				//return _default = new DefaultComparer<T> ();
+			}
+		}
+	
+		int System.Collections.IComparer.Compare (object x, object y)
+		{
+			return this.Compare ((T)x, (T)y);
+		}
+	
+		bool System.Collections.IKeyComparer.Equals (object x, object y)
+		{
+			return this.Equals ((T) x, (T) y);
+		}
+	
+		int System.Collections.IHashCodeProvider.GetHashCode (object obj)
+		{
+			return this.GetHashCode ((T)obj);
+		}
+	
+		class DefaultComparer<T> : Comparer<T> {
+	
+			public override int Compare (T x, T y)
+			{
+				// `null' is less than any other ref type
+				if (x == null)
+					return y == null ? 0 : -1;
+				else if (y == null)
+					return 1;
+	
+				if (x is IComparable<T>)
+					return ((IComparable<T>) x).CompareTo (y);
+				else if (x is IComparable)
+					return ((IComparable) x).CompareTo (y);
+				else
+					throw new ArgumentException ("does not implement right interface");
+			}
+	
+			public override bool Equals (T x, T y)
+			{
+				return System.Object.Equals (x, y);
+			}
+		}
+	}
+
+}
+#endif

mcs/class/corlib/System.Collections/ChangeLog

@@ -1,3 +1,7 @@
+2004-06-18  Ben Maurer <[email protected]>
+
+	* IKeyComparer.cs: v2 class
+
 2004-06-15  Gert Driesen <[email protected]>
 
 	* CaseInsensitiveComparer.cs: added TODO for serialization

mcs/class/corlib/System.Collections/IKeyComparer.cs

@@ -0,0 +1,39 @@
+//
+// System.Collections.IKeyComparer
+//
+// Author:
+//    Ben Maurer <[email protected]>
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+using System;
+
+namespace System.Collections {
+
+	public interface IKeyComparer {
+		bool Equals (object x, object y);
+	}
+
+}
+#endif

mcs/class/corlib/corlib.dll.sources

@@ -1043,4 +1043,6 @@ System/Action.cs
 System/ArraySegment.cs
 System/Comparison.cs
 System/Converter.cs
-System/Predicate.cs
+System/Predicate.cs
+System.Collections.Generic/Comparer.cs
+System.Collections/IKeyComparer.cs