2010-02-14 Miguel de Icaza <miguel@novell.com>

[mono.git] / mcs / mcs / support.cs

diff --git a/mcs/mcs/support.cs b/mcs/mcs/support.cs
index c9e1a359f65adc3135be47f5e04c909e7c27b047..bde81d0f9dc44bc48404553faff5e7fb3d1a44a8 100644 (file)
--- a/mcs/mcs/support.cs
+++ b/mcs/mcs/support.cs
@@ -4,73 +4,51 @@
 //
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
+//   Marek Safar (marek.safar@gmail.com)
 //
 // Copyright 2001 Ximian, Inc (http://www.ximian.com)
-// Copyright 2003-2008 Novell, Inc
+// Copyright 2003-2009 Novell, Inc
 //
 
 using System;
 using System.IO;
 using System.Text;
 using System.Reflection;
-using System.Collections;
 using System.Reflection.Emit;
 using System.Globalization;
+using System.Collections.Generic;
 
 namespace Mono.CSharp {
 
-       class PtrHashtable : Hashtable {
-               sealed class PtrComparer : IComparer, IEqualityComparer
-               {
-                       private PtrComparer () {}
-
-                       public static PtrComparer Instance = new PtrComparer ();
-
-                       public int Compare (object x, object y)
-                       {
-                               if (x == y)
-                                       return 0;
-                               else
-                                       return 1;
-                       }
+       class ReferenceEquality<T> : IEqualityComparer<T> where T : class
+       {
+               public static readonly IEqualityComparer<T> Default = new ReferenceEquality<T> ();
 
-                       bool IEqualityComparer.Equals (object x, object y)
-                       {
-                               return x == y;
-                       }
-                       
-                       int IEqualityComparer.GetHashCode (object obj)
-                       {
-                               return obj.GetHashCode ();
-                       }
+               private ReferenceEquality ()
+               {
                }
 
-               public PtrHashtable () : base (PtrComparer.Instance) {}
-
-#if MS_COMPATIBLE
-               //
-               // Workaround System.InvalidOperationException for enums
-               //
-               protected override int GetHash (object key)
+               public bool Equals (T x, T y)
                {
-                       TypeBuilder tb = key as TypeBuilder;
-                       if (tb != null && tb.BaseType == TypeManager.enum_type && tb.BaseType != null)
-                               key = tb.BaseType;
+                       return object.ReferenceEquals (x, y);
+               }
 
-                       return base.GetHash (key);
+               public int GetHashCode (T obj)
+               {
+                       return obj == null ? 0 : obj.GetHashCode ();
                }
-#endif
        }
 
-       struct Pair {
-               public object First;
-               public object Second;
-
-               public Pair (object f, object s)
+       class Tuple<T1, T2>
+       {
+               public Tuple (T1 item1, T2 item2)
                {
-                       First = f;
-                       Second = s;
+                       Item1 = item1;
+                       Item2 = item2;
                }
+
+               public T1 Item1 { get; private set; }
+               public T2 Item2 { get; private set; }
        }
 
        public class Accessors {
@@ -366,7 +344,7 @@ namespace Mono.CSharp {
        class DynamicType : Type
        {
                public override Assembly Assembly {
-                       get { return UnderlyingSystemType.Assembly; }
+                       get { return CodeGen.Assembly.Builder; }
                }
 
                public override string AssemblyQualifiedName {