X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem%2FTuples.cs;h=27604d5307ba623babaf0cd419ae2125de7eca7f;hb=17183a6fbf75a5ca960d7541676aea7fd7b09d21;hp=36ccd4190ddfbc3775f8d27243dfd638a061910d;hpb=c879b715a7f3757bbfd44f9de12fcaefe0778b41;p=mono.git

diff --git a/mcs/class/corlib/System/Tuples.cs b/mcs/class/corlib/System/Tuples.cs
index 36ccd4190dd..27604d5307b 100644
--- a/mcs/class/corlib/System/Tuples.cs
+++ b/mcs/class/corlib/System/Tuples.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if MOONLIGHT || NET_4_0 || MOBILE
+#if NET_4_0
 
 using System;
 using System.Collections;
@@ -57,7 +57,7 @@ namespace System
 					ok = false;
 			}
 			if (!ok)
-				throw new ArgumentException ("The last element of an eight element tuple must be a Tuple.");
+				throw new ArgumentException ("rest", "The last element of an eight element tuple must be a Tuple.");
 		}
 	}
 
@@ -87,7 +87,7 @@ namespace System
 			var t = other as Tuple<T1>;
 			if (t == null) {
 				if (other == null) return 1;
-				throw new ArgumentException ();
+				throw new ArgumentException ("other");
 			}
 
 			return comparer.Compare (item1, t.item1);
@@ -153,7 +153,7 @@ namespace System
 			var t = other as Tuple<T1, T2>;
 			if (t == null) {
 				if (other == null) return 1;
-				throw new ArgumentException ();
+				throw new ArgumentException ("other");
 			}
 
 			int res = comparer.Compare (item1, t.item1);
@@ -183,9 +183,10 @@ namespace System
 
 		int IStructuralEquatable.GetHashCode (IEqualityComparer comparer)
 		{
-			int h = comparer.GetHashCode (item1);
-			h = (h << 5) - h + comparer.GetHashCode (item2);
-			return h;
+			int h0;
+			h0 = comparer.GetHashCode (item1);
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item2);
+			return h0;
 		}
 
 		public override string ToString ()
@@ -230,7 +231,7 @@ namespace System
 			var t = other as Tuple<T1, T2, T3>;
 			if (t == null) {
 				if (other == null) return 1;
-				throw new ArgumentException ();
+				throw new ArgumentException ("other");
 			}
 
 			int res = comparer.Compare (item1, t.item1);
@@ -263,10 +264,11 @@ namespace System
 
 		int IStructuralEquatable.GetHashCode (IEqualityComparer comparer)
 		{
-			int h = comparer.GetHashCode (item1);
-			h = (h << 5) - h + comparer.GetHashCode (item2);
-			h = (h << 5) - h + comparer.GetHashCode (item3);
-			return h;
+			int h0;
+			h0 = comparer.GetHashCode (item1);
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item2);
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item3);
+			return h0;
 		}
 
 		public override string ToString ()
@@ -317,7 +319,7 @@ namespace System
 			var t = other as Tuple<T1, T2, T3, T4>;
 			if (t == null) {
 				if (other == null) return 1;
-				throw new ArgumentException ();
+				throw new ArgumentException ("other");
 			}
 
 			int res = comparer.Compare (item1, t.item1);
@@ -353,11 +355,13 @@ namespace System
 
 		int IStructuralEquatable.GetHashCode (IEqualityComparer comparer)
 		{
-			int h = comparer.GetHashCode (item1);
-			h = (h << 5) - h + comparer.GetHashCode (item2);
-			h = (h << 5) - h + comparer.GetHashCode (item3);
-			h = (h << 5) - h + comparer.GetHashCode (item4);
-			return h;
+			int h0, h1;
+			h0 = comparer.GetHashCode (item1);
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item2);
+			h1 = comparer.GetHashCode (item3);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item4);
+			h0 = (h0 << 5) + h0 ^ h1;
+			return h0;
 		}
 
 		public override string ToString ()
@@ -414,7 +418,7 @@ namespace System
 			var t = other as Tuple<T1, T2, T3, T4, T5>;
 			if (t == null) {
 				if (other == null) return 1;
-				throw new ArgumentException ();
+				throw new ArgumentException ("other");
 			}
 
 			int res = comparer.Compare (item1, t.item1);
@@ -453,12 +457,14 @@ namespace System
 
 		int IStructuralEquatable.GetHashCode (IEqualityComparer comparer)
 		{
-			int h = comparer.GetHashCode (item1);
-			h = (h << 5) - h + comparer.GetHashCode (item2);
-			h = (h << 5) - h + comparer.GetHashCode (item3);
-			h = (h << 5) - h + comparer.GetHashCode (item4);
-			h = (h << 5) - h + comparer.GetHashCode (item5);
-			return h;
+			int h0, h1;
+			h0 = comparer.GetHashCode (item1);
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item2);
+			h1 = comparer.GetHashCode (item3);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item4);
+			h0 = (h0 << 5) + h0 ^ h1;
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item5);
+			return h0;
 		}
 
 		public override string ToString ()
@@ -521,7 +527,7 @@ namespace System
 			var t = other as Tuple<T1, T2, T3, T4, T5, T6>;
 			if (t == null) {
 				if (other == null) return 1;
-				throw new ArgumentException ();
+				throw new ArgumentException ("other");
 			}
 
 			int res = comparer.Compare (item1, t.item1);
@@ -563,13 +569,16 @@ namespace System
 
 		int IStructuralEquatable.GetHashCode (IEqualityComparer comparer)
 		{
-			int h = comparer.GetHashCode (item1);
-			h = (h << 5) - h + comparer.GetHashCode (item2);
-			h = (h << 5) - h + comparer.GetHashCode (item3);
-			h = (h << 5) - h + comparer.GetHashCode (item4);
-			h = (h << 5) - h + comparer.GetHashCode (item5);
-			h = (h << 5) - h + comparer.GetHashCode (item6);
-			return h;
+			int h0, h1;
+			h0 = comparer.GetHashCode (item1);
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item2);
+			h1 = comparer.GetHashCode (item3);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item4);
+			h0 = (h0 << 5) + h0 ^ h1;
+			h1 = comparer.GetHashCode (item5);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item6);
+			h0 = (h0 << 5) + h0 ^ h1;
+			return h0;
 		}
 
 		public override string ToString ()
@@ -638,7 +647,7 @@ namespace System
 			var t = other as Tuple<T1, T2, T3, T4, T5, T6, T7>;
 			if (t == null) {
 				if (other == null) return 1;
-				throw new ArgumentException ();
+				throw new ArgumentException ("other");
 			}
 
 			int res = comparer.Compare (item1, t.item1);
@@ -683,14 +692,17 @@ namespace System
 
 		int IStructuralEquatable.GetHashCode (IEqualityComparer comparer)
 		{
-			int h = comparer.GetHashCode (item1);
-			h = (h << 5) - h + comparer.GetHashCode (item2);
-			h = (h << 5) - h + comparer.GetHashCode (item3);
-			h = (h << 5) - h + comparer.GetHashCode (item4);
-			h = (h << 5) - h + comparer.GetHashCode (item5);
-			h = (h << 5) - h + comparer.GetHashCode (item6);
-			h = (h << 5) - h + comparer.GetHashCode (item7);
-			return h;
+			int h0, h1;
+			h0 = comparer.GetHashCode (item1);
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item2);
+			h1 = comparer.GetHashCode (item3);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item4);
+			h0 = (h0 << 5) + h0 ^ h1;
+			h1 = comparer.GetHashCode (item5);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item6);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item7);
+			h0 = (h0 << 5) + h0 ^ h1;
+			return h0;
 		}
 
 		public override string ToString ()
@@ -753,7 +765,7 @@ namespace System
 			var t = other as Tuple<T1, T2, T3, T4, T5, T6, T7, TRest>;
 			if (t == null) {
 				if (other == null) return 1;
-				throw new ArgumentException ();
+				throw new ArgumentException ("other");
 			}
 
 			int res = comparer.Compare (item1, t.item1);
@@ -801,15 +813,19 @@ namespace System
 
 		int IStructuralEquatable.GetHashCode (IEqualityComparer comparer)
 		{
-			int h = comparer.GetHashCode (item1);
-			h = (h << 5) - h + comparer.GetHashCode (item2);
-			h = (h << 5) - h + comparer.GetHashCode (item3);
-			h = (h << 5) - h + comparer.GetHashCode (item4);
-			h = (h << 5) - h + comparer.GetHashCode (item5);
-			h = (h << 5) - h + comparer.GetHashCode (item6);
-			h = (h << 5) - h + comparer.GetHashCode (item7);
-			h = (h << 5) - h + comparer.GetHashCode (rest);
-			return h;
+			int h0, h1, h2;
+			h0 = comparer.GetHashCode (item1);
+			h0 = (h0 << 5) + h0 ^ comparer.GetHashCode (item2);
+			h1 = comparer.GetHashCode (item3);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item4);
+			h0 = (h0 << 5) + h0 ^ h1;
+			h1 = comparer.GetHashCode (item5);
+			h1 = (h1 << 5) + h1 ^ comparer.GetHashCode (item6);
+			h2 = comparer.GetHashCode (item7);
+			h2 = (h2 << 5) + h2 ^ comparer.GetHashCode (rest);
+			h1 = (h1 << 5) + h1 ^ h2;
+			h0 = (h0 << 5) + h0 ^ h1;
+			return h0;
 		}
 
 		public override string ToString ()
@@ -881,7 +897,7 @@ public class TupleGen
 			Console.WriteLine ("\t\t\tvar t = other as {0};", type_name);
 			Console.WriteLine ("\t\t\tif (t == null) {");
 			Console.WriteLine ("\t\t\t\tif (other == null) return 1;");
-			Console.WriteLine ("\t\t\t\tthrow new ArgumentException ();");
+			Console.WriteLine ("\t\t\t\tthrow new ArgumentException (\"other\");");
 			Console.WriteLine ("\t\t\t}");
 			Console.WriteLine ();
 			
@@ -937,10 +953,15 @@ public class TupleGen
 			if (arity == 1) {
 				Console.WriteLine ("\t\t\treturn comparer.GetHashCode ({0});", GetItemName (arity));
 			} else {
-				Console.WriteLine ("\t\t\tint h = comparer.GetHashCode ({0});", GetItemName (1));
-				for (int i = 2; i <= arity; ++i)
-					Console.WriteLine ("\t\t\th = (h << 5) - h + comparer.GetHashCode ({0});", GetItemName (i));
-				Console.WriteLine ("\t\t\treturn h;");
+				int varnum = IntLog2(arity);
+				Console.Write ("\t\t\tint h0");
+				for (int i = 1; i < varnum; ++i)
+					Console.Write (", h{0}", i);
+				Console.WriteLine (";");
+
+				WriteHash(0, 1, arity);
+
+				Console.WriteLine ("\t\t\treturn h0;");
 			}
 
 			Console.WriteLine ("\t\t}");
@@ -967,6 +988,36 @@ public class TupleGen
 		}
 	}
 
+	static int IntLog2 (int n)
+	{
+		int r = -1;
+
+		while (n != 0) {
+			n >>= 1;
+			r++;
+		}
+
+		return r;
+	}
+
+	static void WriteHash (int destVar, int start, int count)
+	{
+		if (count == 1) {
+			Console.WriteLine ("\t\t\th{0} = comparer.GetHashCode ({1});", destVar, GetItemName (start));
+		} else {
+			int subCount = 1 << IntLog2(count-1);
+			computeHash(destVar, start, subCount);
+			start += subCount;
+			count -= subCount;
+			if (count == 1) {
+				Console.WriteLine ("\t\t\th{0} = (h{0} << 5) + h{0} ^ comparer.GetHashCode ({1});", destVar, GetItemName (start));
+			} else {
+				WriteHash(destVar+1, start, count);
+				Console.WriteLine ("\t\t\th{0} = (h{0} << 5) + h{0} ^ h{1};", destVar, destVar+1);
+			}
+		}
+	}
+
 	static string GetTypeName (int arity)
 	{
 		StringBuilder sb = new StringBuilder ();