2008-07-04 Marek Safar <marek.safar@gmail.com>
[mono.git] / mcs / mcs / decl.cs
index 5f62cad3388a50f1c37b862be727cf5f0d7ae66d..13ec8e6c86ce9d322b1c28f1ed46e80374e28b52 100644 (file)
@@ -4,21 +4,22 @@
 // Author: Miguel de Icaza (miguel@gnu.org)
 //         Marek Safar (marek.safar@seznam.cz)
 //
-// Licensed under the terms of the GNU GPL
+// Dual licensed under the terms of the MIT X11 or GNU GPL
 //
-// (C) 2001 Ximian, Inc (http://www.ximian.com)
-// (C) 2004 Novell, Inc
+// Copyright 2001 Ximian, Inc (http://www.ximian.com)
+// Copyright 2004-2008 Novell, Inc
 //
 // TODO: Move the method verification stuff from the class.cs and interface.cs here
 //
 
 using System;
+using System.Text;
 using System.Collections;
 using System.Globalization;
 using System.Reflection.Emit;
 using System.Reflection;
 
-#if BOOTSTRAP_WITH_OLDLIB
+#if BOOTSTRAP_WITH_OLDLIB || NET_2_1
 using XmlElement = System.Object;
 #else
 using System.Xml;
@@ -27,25 +28,71 @@ using System.Xml;
 namespace Mono.CSharp {
 
        public class MemberName {
-               public string Name;
+               public readonly string Name;
+               public readonly TypeArguments TypeArguments;
+
                public readonly MemberName Left;
+               public readonly Location Location;
 
                public static readonly MemberName Null = new MemberName ("");
 
-               public MemberName (string name)
+               bool is_double_colon;
+
+               private MemberName (MemberName left, string name, bool is_double_colon,
+                                   Location loc)
                {
                        this.Name = name;
+                       this.Location = loc;
+                       this.is_double_colon = is_double_colon;
+                       this.Left = left;
                }
 
-               public MemberName (MemberName left, string name)
-                       : this (name)
+               private MemberName (MemberName left, string name, bool is_double_colon,
+                                   TypeArguments args, Location loc)
+                       : this (left, name, is_double_colon, loc)
                {
-                       this.Left = left;
+                       if (args != null && args.Count > 0)
+                               this.TypeArguments = args;
                }
 
+               public MemberName (string name)
+                       : this (name, Location.Null)
+               { }
+
+               public MemberName (string name, Location loc)
+                       : this (null, name, false, loc)
+               { }
+
+               public MemberName (string name, TypeArguments args, Location loc)
+                       : this (null, name, false, args, loc)
+               { }
+
+               public MemberName (MemberName left, string name)
+                       : this (left, name, left != null ? left.Location : Location.Null)
+               { }
+
+               public MemberName (MemberName left, string name, Location loc)
+                       : this (left, name, false, loc)
+               { }
+
+               public MemberName (MemberName left, string name, TypeArguments args, Location loc)
+                       : this (left, name, false, args, loc)
+               { }
+
+               public MemberName (string alias, string name, TypeArguments args, Location loc)
+                       : this (new MemberName (alias, loc), name, true, args, loc)
+               { }
+
                public MemberName (MemberName left, MemberName right)
-                       : this (left, right.Name)
+                       : this (left, right, right.Location)
+               { }
+
+               public MemberName (MemberName left, MemberName right, Location loc)
+                       : this (null, right.Name, false, right.TypeArguments, loc)
                {
+                       if (right.is_double_colon)
+                               throw new InternalErrorException ("Cannot append double_colon member name");
+                       this.Left = (right.Left == null) ? left : new MemberName (left, right.Left);
                }
 
                public string GetName ()
@@ -53,66 +100,158 @@ namespace Mono.CSharp {
                        return GetName (false);
                }
 
+               public bool IsGeneric {
+                       get {
+                               if (TypeArguments != null)
+                                       return true;
+                               else if (Left != null)
+                                       return Left.IsGeneric;
+                               else
+                                       return false;
+                       }
+               }
+
                public string GetName (bool is_generic)
                {
                        string name = is_generic ? Basename : Name;
+                       string connect = is_double_colon ? "::" : ".";
                        if (Left != null)
-                               return Left.GetName (is_generic) + "." + name;
+                               return Left.GetName (is_generic) + connect + name;
                        else
                                return name;
                }
 
-               ///
-               /// This returns exclusively the name as seen on the source code
-               /// it is not the fully qualifed type after resolution
-               ///
-               public string GetPartialName ()
-               {
-                       if (Left != null)
-                               return Left.GetPartialName () + "." + Name;
-                       else
-                               return Name;
-               }
-
                public string GetTypeName ()
                {
+                       string connect = is_double_colon ? "::" : ".";
                        if (Left != null)
-                               return Left.GetTypeName () + "." + Name;
+                               return Left.GetTypeName () + connect + MakeName (Name, TypeArguments);
                        else
-                               return Name;
+                               return MakeName (Name, TypeArguments);
                }
 
-               public Expression GetTypeExpression (Location loc)
+               public ATypeNameExpression GetTypeExpression ()
                {
-                       if (Left != null) {
-                               Expression lexpr = Left.GetTypeExpression (loc);
+                       if (Left == null) {
+                               if (TypeArguments != null)
+                                       return new SimpleName (Basename, TypeArguments, Location);
+                               
+                               return new SimpleName (Name, Location);
+                       }
 
-                               return new MemberAccess (lexpr, Name, loc);
-                       } else {
-                               return new SimpleName (Name, loc);
+                       if (is_double_colon) {
+                               if (Left.Left != null)
+                                       throw new InternalErrorException ("The left side of a :: should be an identifier");
+                               return new QualifiedAliasMember (Left.Name, Name, TypeArguments, Location);
                        }
+
+                       Expression lexpr = Left.GetTypeExpression ();
+                       return new MemberAccess (lexpr, Name, TypeArguments, Location);
                }
 
                public MemberName Clone ()
                {
-                       if (Left != null)
-                               return new MemberName (Left.Clone (), Name);
-                       else
-                               return new MemberName (Name);
+                       MemberName left_clone = Left == null ? null : Left.Clone ();
+                       return new MemberName (left_clone, Name, is_double_colon, TypeArguments, Location);
                }
 
                public string Basename {
                        get {
-                               return Name;
+                               if (TypeArguments != null)
+                                       return MakeName (Name, TypeArguments);
+                               else
+                                       return Name;
+                       }
+               }
+
+               public string MethodName {
+                       get {
+                               string connect = is_double_colon ? "::" : ".";
+                               if (Left != null)
+                                       return Left.FullyQualifiedName + connect + Name;
+                               else
+                                       return Name;
                        }
                }
 
-               public override string ToString ()
+               // Please use this only for error reporting.   For normal uses, just use the Equals and GetHashCode methods that make
+               // MemberName a proper hash key, and avoid tons of memory allocations
+               string FullyQualifiedName {
+                       get { return TypeArguments == null ? MethodName : MethodName + "<" + TypeArguments.GetSignatureForError () + ">"; }
+               }
+
+               public string GetSignatureForError ()
                {
-                       if (Left != null)
-                               return Left + "." + Name;
+                       string append = TypeArguments == null ? "" : "<" + TypeArguments.GetSignatureForError () + ">";
+                       if (Left == null)
+                               return Name + append;
+                       string connect = is_double_colon ? "::" : ".";
+                       return Left.GetSignatureForError () + connect + Name + append;
+               }
+
+               public override bool Equals (object other)
+               {
+                       return Equals (other as MemberName);
+               }
+
+               public bool Equals (MemberName other)
+               {
+                       if (this == other)
+                               return true;
+                       if (other == null || Name != other.Name)
+                               return false;
+                       if (is_double_colon != other.is_double_colon)
+                               return false;
+
+                       if ((TypeArguments != null) &&
+                           (other.TypeArguments == null || TypeArguments.Count != other.TypeArguments.Count))
+                               return false;
+
+                       if ((TypeArguments == null) && (other.TypeArguments != null))
+                               return false;
+
+                       if (Left == null)
+                               return other.Left == null;
+
+                       return Left.Equals (other.Left);
+               }
+
+               public override int GetHashCode ()
+               {
+                       int hash = Name.GetHashCode ();
+                       for (MemberName n = Left; n != null; n = n.Left)
+                               hash ^= n.Name.GetHashCode ();
+                       if (is_double_colon)
+                               hash ^= 0xbadc01d;
+
+                       if (TypeArguments != null)
+                               hash ^= TypeArguments.Count << 5;
+
+                       return hash & 0x7FFFFFFF;
+               }
+
+               public int CountTypeArguments {
+                       get {
+                               if (TypeArguments != null)
+                                       return TypeArguments.Count;
+                               else if (Left != null)
+                                       return Left.CountTypeArguments; 
+                               else
+                                       return 0;
+                       }
+               }
+
+               public static string MakeName (string name, TypeArguments args)
+               {
+                       if (args == null)
+                               return name;
                        else
-                               return Name;
+                               return name + "`" + args.Count;
+               }
+
+               public static string MakeName (string name, int count)
+               {
+                       return name + "`" + count;
                }
        }
 
@@ -120,36 +259,54 @@ namespace Mono.CSharp {
        ///   Base representation for members.  This is used to keep track
        ///   of Name, Location and Modifier flags, and handling Attributes.
        /// </summary>
-       public abstract class MemberCore : Attributable {
+       public abstract class MemberCore : Attributable, IResolveContext {
                /// <summary>
                ///   Public name
                /// </summary>
+
+               protected string cached_name;
                public string Name {
                        get {
-                               // !(this is GenericMethod) && !(this is Method)
-                               return MemberName.GetName (false);
+                               if (cached_name == null)
+                                       cached_name = MemberName.GetName (!(this is GenericMethod) && !(this is Method));
+                               return cached_name;
                        }
                }
 
                 // Is not readonly because of IndexerName attribute
-               public MemberName MemberName;
+               private MemberName member_name;
+               public MemberName MemberName {
+                       get { return member_name; }
+               }
 
                /// <summary>
                ///   Modifier flags that the user specified in the source code
                /// </summary>
-               public int ModFlags;
+               private int mod_flags;
+               public int ModFlags {
+                       set {
+                               mod_flags = value;
+                               if ((value & Modifiers.COMPILER_GENERATED) != 0)
+                                       caching_flags = Flags.IsUsed | Flags.IsAssigned;
+                       }
+                       get {
+                               return mod_flags;
+                       }
+               }
 
-               public /*readonly*/ TypeContainer Parent;
+               public /*readonly*/ DeclSpace Parent;
 
                /// <summary>
                ///   Location where this declaration happens
                /// </summary>
-               public readonly Location Location;
+               public Location Location {
+                       get { return member_name.Location; }
+               }
 
                /// <summary>
                ///   XML documentation comment
                /// </summary>
-               public string DocComment;
+               protected string comment;
 
                /// <summary>
                ///   Represents header string for documentation comment 
@@ -169,7 +326,11 @@ namespace Mono.CSharp {
                        ClsCompliantAttributeTrue = 1 << 7,                     // Type has CLSCompliant (true)
                        Excluded_Undetected = 1 << 8,           // Conditional attribute has not been detected yet
                        Excluded = 1 << 9,                                      // Method is conditional
-                       TestMethodDuplication = 1 << 10         // Test for duplication must be performed
+                       MethodOverloadsExist = 1 << 10,         // Test for duplication must be performed
+                       IsUsed = 1 << 11,
+                       IsAssigned = 1 << 12,                           // Field is assigned
+                       HasExplicitLayout       = 1 << 13,
+                       PartialDefinitionExists = 1 << 14       // Set when corresponding partial method definition exists
                }
 
                /// <summary>
@@ -177,47 +338,99 @@ namespace Mono.CSharp {
                /// </summary>
                internal Flags caching_flags;
 
-               public MemberCore (TypeContainer parent, MemberName name, Attributes attrs,
-                                  Location loc)
+               public MemberCore (DeclSpace parent, MemberName name, Attributes attrs)
                        : base (attrs)
                {
-                       Parent = parent;
-                       MemberName = name;
-                       Location = loc;
+                       this.Parent = parent;
+                       member_name = name;
                        caching_flags = Flags.Obsolete_Undetected | Flags.ClsCompliance_Undetected | Flags.HasCompliantAttribute_Undetected | Flags.Excluded_Undetected;
                }
 
-               /// <summary>
-               /// Tests presence of ObsoleteAttribute and report proper error
-               /// </summary>
-               protected void CheckUsageOfObsoleteAttribute (Type type)
+               protected virtual void SetMemberName (MemberName new_name)
+               {
+                       member_name = new_name;
+                       cached_name = null;
+               }
+
+               protected bool CheckAbstractAndExtern (bool has_block)
+               {
+                       if (Parent.PartialContainer.Kind == Kind.Interface)
+                               return true;
+
+                       if (has_block) {
+                               if ((ModFlags & Modifiers.EXTERN) != 0) {
+                                       Report.Error (179, Location, "`{0}' cannot declare a body because it is marked extern",
+                                               GetSignatureForError ());
+                                       return false;
+                               }
+
+                               if ((ModFlags & Modifiers.ABSTRACT) != 0) {
+                                       Report.Error (500, Location, "`{0}' cannot declare a body because it is marked abstract",
+                                               GetSignatureForError ());
+                                       return false;
+                               }
+                       } else {
+                               if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN | Modifiers.PARTIAL)) == 0) {
+                                       if (RootContext.Version >= LanguageVersion.LINQ && this is Property.PropertyMethod &&
+                                               !(this is Indexer.GetIndexerMethod || this is Indexer.SetIndexerMethod)) {
+                                               Report.Error (840, Location, "`{0}' must have a body because it is not marked abstract or extern. The property can be automatically implemented when you define both accessors",
+                                                             GetSignatureForError ());
+                                       } else {
+                                               Report.Error (501, Location, "`{0}' must have a body because it is not marked abstract, extern, or partial",
+                                                             GetSignatureForError ());
+                                       }
+                                       return false;
+                               }
+                       }
+
+                       return true;
+               }
+
+               public void CheckProtectedModifier ()
                {
-                       if (type == null)
+                       if ((ModFlags & Modifiers.PROTECTED) == 0)
                                return;
 
-                       ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (type);
-                       if (obsolete_attr == null)
+                       if (Parent.PartialContainer.Kind == Kind.Struct) {
+                               Report.Error (666, Location, "`{0}': Structs cannot contain protected members",
+                                       GetSignatureForError ());
+                               return;
+                       }
+
+                       if ((Parent.ModFlags & Modifiers.STATIC) != 0) {
+                               Report.Error (1057, Location, "`{0}': Static classes cannot contain protected members",
+                                       GetSignatureForError ());
                                return;
+                       }
 
-                       AttributeTester.Report_ObsoleteMessage (obsolete_attr, type.FullName, Location);
+                       if (((Parent.ModFlags & Modifiers.SEALED) != 0) &&
+                               ((ModFlags & Modifiers.OVERRIDE) == 0) && (Name != "Finalize")) {
+                               Report.Warning (628, 4, Location, "`{0}': new protected member declared in sealed class",
+                                       GetSignatureForError ());
+                               return;
+                       }
                }
 
                public abstract bool Define ();
 
+               public virtual string DocComment {
+                       get {
+                               return comment;
+                       }
+                       set {
+                               comment = value;
+                       }
+               }
+
                // 
                // Returns full member name for error message
                //
                public virtual string GetSignatureForError ()
                {
-                       return Name;
-               }
+                       if (Parent == null || Parent.Parent == null)
+                               return member_name.GetSignatureForError ();
 
-               /// <summary>
-               /// Use this method when MethodBuilder is null
-               /// </summary>
-               public virtual string GetSignatureForError (TypeContainer tc)
-               {
-                       return Name;
+                       return Parent.GetSignatureForError () + "." + member_name.GetSignatureForError ();
                }
 
                /// <summary>
@@ -225,44 +438,25 @@ namespace Mono.CSharp {
                /// </summary>
                public virtual void Emit ()
                {
-                       // Hack with Parent == null is for EnumMember
-                       if (Parent == null || (GetObsoleteAttribute (Parent) == null && Parent.GetObsoleteAttribute (Parent) == null))
-                               VerifyObsoleteAttribute ();
-
                        if (!RootContext.VerifyClsCompliance)
                                return;
 
-                       VerifyClsCompliance (Parent);
+                       VerifyClsCompliance ();
                }
 
-               public bool InUnsafe {
-                       get {
-                               return ((ModFlags & Modifiers.UNSAFE) != 0) || Parent.UnsafeContext;
-                       }
+               public virtual bool IsUsed {
+                       get { return (caching_flags & Flags.IsUsed) != 0; }
                }
 
-               // 
-               // Whehter is it ok to use an unsafe pointer in this type container
-               //
-               public bool UnsafeOK (DeclSpace parent)
+               public void SetMemberIsUsed ()
                {
-                       //
-                       // First check if this MemberCore modifier flags has unsafe set
-                       //
-                       if ((ModFlags & Modifiers.UNSAFE) != 0)
-                               return true;
-
-                       if (parent.UnsafeContext)
-                               return true;
-
-                       Expression.UnsafeError (Location);
-                       return false;
+                       caching_flags |= Flags.IsUsed;
                }
 
                /// <summary>
                /// Returns instance of ObsoleteAttribute for this MemberCore
                /// </summary>
-               public ObsoleteAttribute GetObsoleteAttribute (DeclSpace ds)
+               public virtual ObsoleteAttribute GetObsoleteAttribute ()
                {
                        // ((flags & (Flags.Obsolete_Undetected | Flags.Obsolete)) == 0) is slower, but why ?
                        if ((caching_flags & Flags.Obsolete_Undetected) == 0 && (caching_flags & Flags.Obsolete) == 0) {
@@ -271,15 +465,15 @@ namespace Mono.CSharp {
 
                        caching_flags &= ~Flags.Obsolete_Undetected;
 
-                       if (OptAttributes == null)
+                       if (OptAttributes == null || TypeManager.obsolete_attribute_type == null)
                                return null;
 
                        Attribute obsolete_attr = OptAttributes.Search (
-                               TypeManager.obsolete_attribute_type, ds.EmitContext);
+                               TypeManager.obsolete_attribute_type);
                        if (obsolete_attr == null)
                                return null;
 
-                       ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds.EmitContext);
+                       ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute ();
                        if (obsolete == null)
                                return null;
 
@@ -287,15 +481,184 @@ namespace Mono.CSharp {
                        return obsolete;
                }
 
+               /// <summary>
+               /// Checks for ObsoleteAttribute presence. It's used for testing of all non-types elements
+               /// </summary>
+               public virtual void CheckObsoleteness (Location loc)
+               {
+                       if (Parent != null)
+                               Parent.CheckObsoleteness (loc);
+
+                       ObsoleteAttribute oa = GetObsoleteAttribute ();
+                       if (oa == null) {
+                               return;
+                       }
+
+                       AttributeTester.Report_ObsoleteMessage (oa, GetSignatureForError (), loc);
+               }
+
+               // Access level of a type.
+               const int X = 1;
+               enum AccessLevel
+               { // Each column represents `is this scope larger or equal to Blah scope'
+                       // Public    Assembly   Protected
+                       Protected = (0 << 0) | (0 << 1) | (X << 2),
+                       Public = (X << 0) | (X << 1) | (X << 2),
+                       Private = (0 << 0) | (0 << 1) | (0 << 2),
+                       Internal = (0 << 0) | (X << 1) | (0 << 2),
+                       ProtectedOrInternal = (0 << 0) | (X << 1) | (X << 2),
+               }
+
+               static AccessLevel GetAccessLevelFromModifiers (int flags)
+               {
+                       if ((flags & Modifiers.INTERNAL) != 0) {
+
+                               if ((flags & Modifiers.PROTECTED) != 0)
+                                       return AccessLevel.ProtectedOrInternal;
+                               else
+                                       return AccessLevel.Internal;
+
+                       } else if ((flags & Modifiers.PROTECTED) != 0)
+                               return AccessLevel.Protected;
+                       else if ((flags & Modifiers.PRIVATE) != 0)
+                               return AccessLevel.Private;
+                       else
+                               return AccessLevel.Public;
+               }
+
+               //
+               // Returns the access level for type `t'
+               //
+               static AccessLevel GetAccessLevelFromType (Type t)
+               {
+                       if (t.IsPublic)
+                               return AccessLevel.Public;
+                       if (t.IsNestedPrivate)
+                               return AccessLevel.Private;
+                       if (t.IsNotPublic)
+                               return AccessLevel.Internal;
+
+                       if (t.IsNestedPublic)
+                               return AccessLevel.Public;
+                       if (t.IsNestedAssembly)
+                               return AccessLevel.Internal;
+                       if (t.IsNestedFamily)
+                               return AccessLevel.Protected;
+                       if (t.IsNestedFamORAssem)
+                               return AccessLevel.ProtectedOrInternal;
+                       if (t.IsNestedFamANDAssem)
+                               throw new NotImplementedException ("NestedFamANDAssem not implemented, cant make this kind of type from c# anyways");
+
+                       // nested private is taken care of
+
+                       throw new Exception ("I give up, what are you?");
+               }
+
+               //
+               // Checks whether the type P is as accessible as this member
+               //
+               public bool IsAccessibleAs (Type p)
+               {
+                       //
+                       // if M is private, its accessibility is the same as this declspace.
+                       // we already know that P is accessible to T before this method, so we
+                       // may return true.
+                       //
+                       if ((mod_flags & Modifiers.PRIVATE) != 0)
+                               return true;
+
+                       while (p.IsArray || p.IsPointer || p.IsByRef)
+                               p = TypeManager.GetElementType (p);
+
+#if GMCS_SOURCE
+                       if (p.IsGenericParameter)
+                               return true;
+
+                       if (TypeManager.IsGenericType (p)) {
+                               foreach (Type t in p.GetGenericArguments ()) {
+                                       if (!IsAccessibleAs (t))
+                                               return false;
+                               }
+                       }
+#endif
+
+                       for (Type p_parent = null; p != null; p = p_parent) {
+                               p_parent = p.DeclaringType;
+                               AccessLevel pAccess = GetAccessLevelFromType (p);
+                               if (pAccess == AccessLevel.Public)
+                                       continue;
+
+                               bool same_access_restrictions = false;
+                               for (MemberCore mc = this; !same_access_restrictions && mc != null && mc.Parent != null; mc = mc.Parent) {
+                                       AccessLevel al = GetAccessLevelFromModifiers (mc.ModFlags);
+                                       switch (pAccess) {
+                                               case AccessLevel.Internal:
+                                                       if (al == AccessLevel.Private || al == AccessLevel.Internal)
+                                                               same_access_restrictions = TypeManager.IsThisOrFriendAssembly (p.Assembly);
+
+                                                       break;
+
+                                               case AccessLevel.Protected:
+                                                       if (al == AccessLevel.Protected) {
+                                                               same_access_restrictions = mc.Parent.IsBaseType (p_parent);
+                                                               break;
+                                                       }
+
+                                                       if (al == AccessLevel.Private) {
+                                                               //
+                                                               // When type is private and any of its parents derives from
+                                                               // protected type then the type is accessible
+                                                               //
+                                                               while (mc.Parent != null) {
+                                                                       if (mc.Parent.IsBaseType (p_parent))
+                                                                               same_access_restrictions = true;
+                                                                       mc = mc.Parent; 
+                                                               }
+                                                       }
+
+                                                       break;
+
+                                               case AccessLevel.ProtectedOrInternal:
+                                                       if (al == AccessLevel.Protected)
+                                                               same_access_restrictions = mc.Parent.IsBaseType (p_parent);
+                                                       else if (al == AccessLevel.Internal)
+                                                               same_access_restrictions = TypeManager.IsThisOrFriendAssembly (p.Assembly);
+                                                       else if (al == AccessLevel.ProtectedOrInternal)
+                                                               same_access_restrictions = mc.Parent.IsBaseType (p_parent) &&
+                                                                       TypeManager.IsThisOrFriendAssembly (p.Assembly);
+
+                                                       break;
+
+                                               case AccessLevel.Private:
+                                                       //
+                                                       // Both are private and share same parent
+                                                       //
+                                                       if (al == AccessLevel.Private)
+                                                               same_access_restrictions = TypeManager.IsEqual (mc.Parent.TypeBuilder, p_parent);
+
+                                                       break;
+
+                                               default:
+                                                       throw new InternalErrorException (al.ToString ());
+                                       }
+                               }
+
+                               if (!same_access_restrictions)
+                                       return false;
+                       }
+
+                       return true;
+               }
+
                /// <summary>
                /// Analyze whether CLS-Compliant verification must be execute for this MemberCore.
                /// </summary>
-               public override bool IsClsCompliaceRequired (DeclSpace container)
+               public override bool IsClsComplianceRequired ()
                {
                        if ((caching_flags & Flags.ClsCompliance_Undetected) == 0)
                                return (caching_flags & Flags.ClsCompliant) != 0;
 
-                       if (GetClsCompliantAttributeValue (container) && IsExposedFromAssembly (container)) {
+                       if (GetClsCompliantAttributeValue () && IsExposedFromAssembly ()) {
                                caching_flags &= ~Flags.ClsCompliance_Undetected;
                                caching_flags |= Flags.ClsCompliant;
                                return true;
@@ -308,12 +671,12 @@ namespace Mono.CSharp {
                /// <summary>
                /// Returns true when MemberCore is exposed from assembly.
                /// </summary>
-               public bool IsExposedFromAssembly (DeclSpace ds)
+               public bool IsExposedFromAssembly ()
                {
                        if ((ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
                                return false;
                        
-                       DeclSpace parentContainer = ds;
+                       DeclSpace parentContainer = Parent;
                        while (parentContainer != null && parentContainer.ModFlags != 0) {
                                if ((parentContainer.ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
                                        return false;
@@ -323,19 +686,37 @@ namespace Mono.CSharp {
                }
 
                /// <summary>
-               /// Resolve CLSCompliantAttribute value or gets cached value.
+               /// Goes through class hierarchy and gets value of first found CLSCompliantAttribute.
+               /// If no is attribute exists then assembly CLSCompliantAttribute is returned.
                /// </summary>
-               bool GetClsCompliantAttributeValue (DeclSpace ds)
+               public virtual bool GetClsCompliantAttributeValue ()
                {
-                       if (OptAttributes != null) {
+                       if ((caching_flags & Flags.HasCompliantAttribute_Undetected) == 0)
+                               return (caching_flags & Flags.ClsCompliantAttributeTrue) != 0;
+
+                       caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
+
+                       if (OptAttributes != null && TypeManager.cls_compliant_attribute_type != null) {
                                Attribute cls_attribute = OptAttributes.Search (
-                                       TypeManager.cls_compliant_attribute_type, ds.EmitContext);
+                                       TypeManager.cls_compliant_attribute_type);
                                if (cls_attribute != null) {
                                        caching_flags |= Flags.HasClsCompliantAttribute;
-                                       return cls_attribute.GetClsCompliantAttributeValue (ds.EmitContext);
+                                       bool value = cls_attribute.GetClsCompliantAttributeValue ();
+                                       if (value)
+                                               caching_flags |= Flags.ClsCompliantAttributeTrue;
+                                       return value;
                                }
                        }
-                       return ds.GetClsCompliantAttributeValue ();
+                       
+                       // It's null for TypeParameter
+                       if (Parent == null)
+                               return false;                   
+
+                       if (Parent.GetClsCompliantAttributeValue ()) {
+                               caching_flags |= Flags.ClsCompliantAttributeTrue;
+                               return true;
+                       }
+                       return false;
                }
 
                /// <summary>
@@ -343,14 +724,17 @@ namespace Mono.CSharp {
                /// </summary>
                protected bool HasClsCompliantAttribute {
                        get {
+                               if ((caching_flags & Flags.HasCompliantAttribute_Undetected) != 0)
+                                       GetClsCompliantAttributeValue ();
+                               
                                return (caching_flags & Flags.HasClsCompliantAttribute) != 0;
                        }
                }
 
                /// <summary>
-               /// It helps to handle error 102 & 111 detection
+               /// Returns true when a member supports multiple overloads (methods, indexers, etc)
                /// </summary>
-               public virtual bool MarkForDuplicationCheck ()
+               public virtual bool EnableOverloadChecks (MemberCore overload)
                {
                        return false;
                }
@@ -361,39 +745,44 @@ namespace Mono.CSharp {
                /// CLS-Compliant which means that CLS-Compliant tests are not necessary. A descendants override it
                /// and add their extra verifications.
                /// </summary>
-               protected virtual bool VerifyClsCompliance (DeclSpace ds)
+               protected virtual bool VerifyClsCompliance ()
                {
-                       if (!IsClsCompliaceRequired (ds)) {
-                               if (HasClsCompliantAttribute && RootContext.WarningLevel >= 2) {
-                                       if (!IsExposedFromAssembly (ds))
-                                               Report.Warning (3019, Location, "CLS compliance checking will not be performed on '{0}' because it is private or internal", GetSignatureForError ());
+                       if (!IsClsComplianceRequired ()) {
+                               if (HasClsCompliantAttribute && Report.WarningLevel >= 2) {
+                                       if (!IsExposedFromAssembly ())
+                                               Report.Warning (3019, 2, Location, "CLS compliance checking will not be performed on `{0}' because it is not visible from outside this assembly", GetSignatureForError ());
                                        if (!CodeGen.Assembly.IsClsCompliant)
-                                               Report.Warning (3021, Location, "'{0}' does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute", GetSignatureForError ());
+                                               Report.Warning (3021, 2, Location, "`{0}' does not need a CLSCompliant attribute because the assembly is not marked as CLS-compliant", GetSignatureForError ());
                                }
                                return false;
                        }
 
-                       if (!CodeGen.Assembly.IsClsCompliant) {
-                               if (HasClsCompliantAttribute) {
-                                       Report.Error (3014, Location, "'{0}' cannot be marked as CLS-compliant because the assembly does not have a CLSCompliant attribute", GetSignatureForError ());
+                       if (HasClsCompliantAttribute) {
+                               if (CodeGen.Assembly.ClsCompliantAttribute == null && !CodeGen.Assembly.IsClsCompliant) {
+                                       Report.Error (3014, Location,
+                                               "`{0}' cannot be marked as CLS-compliant because the assembly is not marked as CLS-compliant",
+                                               GetSignatureForError ());
+                                       return false;
+                               }
+
+                               if (!Parent.IsClsComplianceRequired ()) {
+                                       Report.Warning (3018, 1, Location, "`{0}' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `{1}'", 
+                                               GetSignatureForError (), Parent.GetSignatureForError ());
+                                       return false;
                                }
-                               return false;
                        }
 
-                       int index = Name.LastIndexOf ('.');
-                       if (Name [index > 0 ? index + 1 : 0] == '_') {
-                               Report.Error (3008, Location, "Identifier '{0}' is not CLS-compliant", GetSignatureForError () );
+                       if (member_name.Name [0] == '_') {
+                               Report.Error (3008, Location, "Identifier `{0}' is not CLS-compliant", GetSignatureForError () );
                        }
                        return true;
                }
 
-               protected abstract void VerifyObsoleteAttribute ();
-
                //
                // Raised (and passed an XmlElement that contains the comment)
                // when GenerateDocComment is writing documentation expectedly.
                //
-               internal virtual void OnGenerateDocComment (DeclSpace ds, XmlElement intermediateNode)
+               internal virtual void OnGenerateDocComment (XmlElement intermediateNode)
                {
                }
 
@@ -415,8 +804,46 @@ namespace Mono.CSharp {
                //
                internal virtual void GenerateDocComment (DeclSpace ds)
                {
-                       DocUtil.GenerateDocComment (this, ds);
+                       try {
+                               DocUtil.GenerateDocComment (this, ds);
+                       } catch (Exception e) {
+                               throw new InternalErrorException (this, e);
+                       }
+               }
+
+               public override IResolveContext ResolveContext {
+                       get { return this; }
+               }
+
+               #region IResolveContext Members
+
+               public DeclSpace DeclContainer {
+                       get { return Parent; }
                }
+
+               public virtual DeclSpace GenericDeclContainer {
+                       get { return DeclContainer; }
+               }
+
+               public bool IsInObsoleteScope {
+                       get {
+                               if (GetObsoleteAttribute () != null)
+                                       return true;
+
+                               return Parent == null ? false : Parent.IsInObsoleteScope;
+                       }
+               }
+
+               public bool IsInUnsafeScope {
+                       get {
+                               if ((ModFlags & Modifiers.UNSAFE) != 0)
+                                       return true;
+
+                               return Parent == null ? false : Parent.IsInUnsafeScope;
+                       }
+               }
+
+               #endregion
        }
 
        /// <summary>
@@ -427,13 +854,20 @@ namespace Mono.CSharp {
        ///   provides the common foundation for managing those name
        ///   spaces.
        /// </remarks>
-       public abstract class DeclSpace : MemberCore, IAlias {
+       public abstract class DeclSpace : MemberCore {
                /// <summary>
                ///   This points to the actual definition that is being
                ///   created with System.Reflection.Emit
                /// </summary>
                public TypeBuilder TypeBuilder;
 
+               /// <summary>
+               ///   If we are a generic type, this is the type we are
+               ///   currently defining.  We need to lookup members on this
+               ///   instead of the TypeBuilder.
+               /// </summary>
+               public Type CurrentType;
+
                //
                // This is the namespace in which this typecontainer
                // was declared.  We use this to resolve names.
@@ -442,58 +876,86 @@ namespace Mono.CSharp {
 
                private Hashtable Cache = new Hashtable ();
                
-               public string Basename;
+               public readonly string Basename;
                
                protected Hashtable defined_names;
 
-               // The emit context for toplevel objects.
-               protected EmitContext ec;
-               
-               public EmitContext EmitContext {
-                       get { return ec; }
+               public TypeContainer PartialContainer;          
+
+               protected readonly bool is_generic;
+               readonly int count_type_params;
+
+               //
+               // Whether we are Generic
+               //
+               public bool IsGeneric {
+                       get {
+                               if (is_generic)
+                                       return true;
+                               else if (Parent != null)
+                                       return Parent.IsGeneric;
+                               else
+                                       return false;
+                       }
                }
 
                static string[] attribute_targets = new string [] { "type" };
 
-               public DeclSpace (NamespaceEntry ns, TypeContainer parent, MemberName name,
-                                 Attributes attrs, Location l)
-                       : base (parent, name, attrs, l)
+               public DeclSpace (NamespaceEntry ns, DeclSpace parent, MemberName name,
+                                 Attributes attrs)
+                       : base (parent, name, attrs)
                {
                        NamespaceEntry = ns;
-                       Basename = name.Name;
+                       Basename = name.Basename;
                        defined_names = new Hashtable ();
+                       PartialContainer = null;
+                       if (name.TypeArguments != null) {
+                               is_generic = true;
+                               count_type_params = name.TypeArguments.Count;
+                       }
+                       if (parent != null)
+                               count_type_params += parent.count_type_params;
+               }
+
+               public override DeclSpace GenericDeclContainer {
+                       get { return this; }
                }
 
                /// <summary>
                /// Adds the member to defined_names table. It tests for duplications and enclosing name conflicts
                /// </summary>
-               protected bool AddToContainer (MemberCore symbol, string fullname, string basename)
+               protected virtual bool AddToContainer (MemberCore symbol, string name)
                {
-                       if (basename == Basename && !(this is Interface)) {
-                               Report.SymbolRelatedToPreviousError (this);
-                               Report.Error (542,  symbol.Location, "'{0}': member names cannot be the same as their enclosing type", symbol.GetSignatureForError ());
-                               return false;
-                       }
-
-                       MemberCore mc = (MemberCore)defined_names [fullname];
+                       MemberCore mc = (MemberCore) defined_names [name];
 
                        if (mc == null) {
-                               defined_names.Add (fullname, symbol);
+                               defined_names.Add (name, symbol);
                                return true;
                        }
 
-                       if (symbol.MarkForDuplicationCheck () && mc.MarkForDuplicationCheck ())
+                       if (symbol.EnableOverloadChecks (mc))
                                return true;
 
                        Report.SymbolRelatedToPreviousError (mc);
-                       Report.Error (102, symbol.Location, "The type '{0}' already contains a definition for '{1}'", GetSignatureForError (), basename);
-                       return false;
-               }
+                       if ((mc.ModFlags & Modifiers.PARTIAL) != 0 && (symbol is ClassOrStruct || symbol is Interface)) {
+                               Error_MissingPartialModifier (symbol);
+                               return false;
+                       }
 
-               public void RecordDecl ()
-               {
-                       if ((NamespaceEntry != null) && (Parent == RootContext.Tree.Types))
-                               NamespaceEntry.DefineName (MemberName.Basename, this);
+                       if (this is RootTypes) {
+                               Report.Error (101, symbol.Location, 
+                                       "The namespace `{0}' already contains a definition for `{1}'",
+                                       ((DeclSpace)symbol).NamespaceEntry.GetSignatureForError (), symbol.MemberName.Name);
+                       } else if (symbol is TypeParameter) {
+                               Report.Error (692, symbol.Location,
+                                             "Duplicate type parameter `{0}'", name);
+                       } else {
+                               Report.Error (102, symbol.Location,
+                                             "The type `{0}' already contains a definition for `{1}'",
+                                             GetSignatureForError (), symbol.MemberName.Name);
+                       }
+
+                       return false;
                }
 
                /// <summary>
@@ -505,21 +967,9 @@ namespace Mono.CSharp {
                {
                        return (MemberCore)defined_names [name];
                }
-               
-               bool in_transit = false;
-               
-               /// <summary>
-               ///   This function is used to catch recursive definitions
-               ///   in declarations.
-               /// </summary>
-               public bool InTransit {
-                       get {
-                               return in_transit;
-                       }
 
-                       set {
-                               in_transit = value;
-                       }
+               public bool IsStaticClass {
+                       get { return (ModFlags & Modifiers.STATIC) != 0; }
                }
                
                // 
@@ -528,13 +978,7 @@ namespace Mono.CSharp {
                // why there is a non-obvious test down here.
                //
                public bool IsTopLevel {
-                       get {
-                               if (Parent != null){
-                                       if (Parent.Parent == null)
-                                               return true;
-                               }
-                               return false;
-                       }
+                       get { return (Parent != null && Parent.Parent == null); }
                }
 
                public virtual void CloseType ()
@@ -558,68 +1002,74 @@ namespace Mono.CSharp {
                        }
                }
 
+               protected virtual TypeAttributes TypeAttr {
+                       get { return CodeGen.Module.DefaultCharSetType; }
+               }
+
                /// <remarks>
                ///  Should be overriten by the appropriate declaration space
                /// </remarks>
                public abstract TypeBuilder DefineType ();
-               
+
                /// <summary>
                ///   Define all members, but don't apply any attributes or do anything which may
                ///   access not-yet-defined classes.  This method also creates the MemberCache.
                /// </summary>
-               public abstract bool DefineMembers (TypeContainer parent);
-
-               //
-               // Whether this is an `unsafe context'
-               //
-               public bool UnsafeContext {
-                       get {
-                               if ((ModFlags & Modifiers.UNSAFE) != 0)
-                                       return true;
-                               if (Parent != null)
-                                       return Parent.UnsafeContext;
+               public virtual bool DefineMembers ()
+               {
+                       if (((ModFlags & Modifiers.NEW) != 0) && IsTopLevel) {
+                               Report.Error (1530, Location, "Keyword `new' is not allowed on namespace elements");
                                return false;
                        }
+                       return true;
                }
 
-               public static string MakeFQN (string nsn, string name)
+               protected void Error_MissingPartialModifier (MemberCore type)
                {
-                       if (nsn == "")
-                               return name;
-                       return String.Concat (nsn, ".", name);
+                       Report.Error (260, type.Location,
+                               "Missing partial modifier on declaration of type `{0}'. Another partial declaration of this type exists",
+                               type.GetSignatureForError ());
                }
 
-               EmitContext type_resolve_ec;
-
-               // <summary>
-               //    Resolves the expression `e' for a type, and will recursively define
-               //    types.  This should only be used for resolving base types.
-               // </summary>
-               public TypeExpr ResolveBaseTypeExpr (Expression e, bool silent, Location loc)
+               public override void Emit ()
                {
-                       if (type_resolve_ec == null) {
-                               // FIXME: I think this should really be one of:
-                               //
-                               // a. type_resolve_ec = Parent.EmitContext;
-                               // b. type_resolve_ec = new EmitContext (Parent, Parent, loc, null, null, ModFlags, false);
-                               //
-                               // However, if Parent == RootContext.Tree.Types, its NamespaceEntry will be null.
-                               //
-                               type_resolve_ec = new EmitContext (Parent, this, loc, null, null, ModFlags, false);
-                               type_resolve_ec.ResolvingTypeTree = true;
+#if GMCS_SOURCE
+                       if (type_params != null) {
+                               int offset = count_type_params - type_params.Length;
+                               for (int i = offset; i < type_params.Length; i++)
+                                       CurrentTypeParameters [i - offset].Emit ();
                        }
-                       type_resolve_ec.loc = loc;
-                       type_resolve_ec.ContainerType = TypeBuilder;
+#endif
 
-                       return e.ResolveAsTypeTerminal (type_resolve_ec, silent);
+                       base.Emit ();
+               }
+
+               public override string GetSignatureForError ()
+               {       
+                       if (IsGeneric) {
+                               return SimpleName.RemoveGenericArity (Name) + TypeParameter.GetSignatureForError (type_params);
+                       }
+                       // Parent.GetSignatureForError
+                       return Name;
                }
                
                public bool CheckAccessLevel (Type check_type)
                {
-                       if (check_type == TypeBuilder)
+                       TypeBuilder tb;
+                       if (this is GenericMethod)
+                               tb = Parent.TypeBuilder;
+                       else
+                               tb = TypeBuilder;
+
+                       check_type = TypeManager.DropGenericTypeArguments (check_type);
+                       if (check_type == tb)
                                return true;
                        
-                       TypeAttributes check_attr = check_type.Attributes & TypeAttributes.VisibilityMask;
+                       if (TypeBuilder == null)
+                               // FIXME: TypeBuilder will be null when invoked by Class.GetNormalBases().
+                               //        However, this is invoked again later -- so safe to return true.
+                               //        May also be null when resolving top-level attributes.
+                               return true;
 
                        //
                        // Broken Microsoft runtime, return public for arrays, no matter what 
@@ -629,41 +1079,47 @@ namespace Mono.CSharp {
                        if (check_type.IsArray || check_type.IsPointer)
                                return CheckAccessLevel (TypeManager.GetElementType (check_type));
 
-                       if (TypeBuilder == null)
-                               // FIXME: TypeBuilder will be null when invoked by Class.GetNormalBases().
-                               //        However, this is invoked again later -- so safe to return true.
-                               //        May also be null when resolving top-level attributes.
-                               return true;
+                       if (TypeManager.IsGenericParameter(check_type))
+                               return true; // FIXME
+
+                       TypeAttributes check_attr = check_type.Attributes & TypeAttributes.VisibilityMask;
 
                        switch (check_attr){
                        case TypeAttributes.Public:
                                return true;
 
                        case TypeAttributes.NotPublic:
-                               //
-                               // This test should probably use the declaringtype.
-                               //
-                               return check_type.Assembly == TypeBuilder.Assembly;
+
+                               if (TypeBuilder == null)
+                                       // FIXME: TypeBuilder will be null when invoked by Class.GetNormalBases().
+                                       //        However, this is invoked again later -- so safe to return true.
+                                       //        May also be null when resolving top-level attributes.
+                                       return true;
+
+                               return TypeManager.IsThisOrFriendAssembly (check_type.Assembly);
                                
                        case TypeAttributes.NestedPublic:
                                return true;
 
                        case TypeAttributes.NestedPrivate:
-                               return NestedAccessible (check_type);
+                               return NestedAccessible (tb, check_type);
 
                        case TypeAttributes.NestedFamily:
-                               return FamilyAccessible (check_type);
+                               //
+                               // Only accessible to methods in current type or any subtypes
+                               //
+                               return FamilyAccessible (tb, check_type);
 
                        case TypeAttributes.NestedFamANDAssem:
-                               return (check_type.Assembly == TypeBuilder.Assembly) &&
-                                       FamilyAccessible (check_type);
+                               return TypeManager.IsThisOrFriendAssembly (check_type.Assembly) && 
+                                       FamilyAccessible (tb, check_type);
 
                        case TypeAttributes.NestedFamORAssem:
-                               return (check_type.Assembly == TypeBuilder.Assembly) ||
-                                       FamilyAccessible (check_type);
+                               return FamilyAccessible (tb, check_type) ||
+                                       TypeManager.IsThisOrFriendAssembly (check_type.Assembly);
 
                        case TypeAttributes.NestedAssembly:
-                               return check_type.Assembly == TypeBuilder.Assembly;
+                               return TypeManager.IsThisOrFriendAssembly (check_type.Assembly);
                        }
 
                        Console.WriteLine ("HERE: " + check_attr);
@@ -671,412 +1127,120 @@ namespace Mono.CSharp {
 
                }
 
-               protected bool NestedAccessible (Type check_type)
-               {
-                       string check_type_name = check_type.FullName;
-
-                       // At this point, we already know check_type is a nested class.
-                       int cio = check_type_name.LastIndexOf ('+');
-
-                       // Ensure that the string 'container' has a '+' in it to avoid false matches
-                       string container = check_type_name.Substring (0, cio + 1);
-
-                       // Ensure that type_name ends with a '+' so that it can match 'container', if necessary
-                       string type_name = TypeBuilder.FullName + "+";
-
-                       // If the current class is nested inside the container of check_type,
-                       // we can access check_type even if it is private or protected.
-                       return type_name.StartsWith (container);
-               }
-
-               protected bool FamilyAccessible (Type check_type)
+               protected bool NestedAccessible (Type tb, Type check_type)
                {
                        Type declaring = check_type.DeclaringType;
-                       if (TypeBuilder == declaring ||
-                           TypeBuilder.IsSubclassOf (declaring))
-                               return true;
-
-                       return NestedAccessible (check_type);
-               }
-
-               // Access level of a type.
-               const int X = 1;
-               enum AccessLevel { // Each column represents `is this scope larger or equal to Blah scope'
-                                           // Public    Assembly   Protected
-                       Protected           = (0 << 0) | (0 << 1) | (X << 2),
-                       Public              = (X << 0) | (X << 1) | (X << 2),
-                       Private             = (0 << 0) | (0 << 1) | (0 << 2),
-                       Internal            = (0 << 0) | (X << 1) | (0 << 2),
-                       ProtectedOrInternal = (0 << 0) | (X << 1) | (X << 2),
-               }
-               
-               static AccessLevel GetAccessLevelFromModifiers (int flags)
-               {
-                       if ((flags & Modifiers.INTERNAL) != 0) {
-                               
-                               if ((flags & Modifiers.PROTECTED) != 0)
-                                       return AccessLevel.ProtectedOrInternal;
-                               else
-                                       return AccessLevel.Internal;
-                               
-                       } else if ((flags & Modifiers.PROTECTED) != 0)
-                               return AccessLevel.Protected;
-                       
-                       else if ((flags & Modifiers.PRIVATE) != 0)
-                               return AccessLevel.Private;
-                       
-                       else
-                               return AccessLevel.Public;
-               }
-
-               // What is the effective access level of this?
-               // TODO: Cache this?
-               AccessLevel EffectiveAccessLevel {
-                       get {
-                               AccessLevel myAccess = GetAccessLevelFromModifiers (ModFlags);
-                               if (!IsTopLevel && (Parent != null))
-                                       return myAccess & Parent.EffectiveAccessLevel;
-                               else
-                                       return myAccess;
-                       }
+                       return TypeBuilder == declaring ||
+                               TypeManager.IsNestedChildOf (TypeBuilder, declaring);
                }
 
-               // Return the access level for type `t'
-               static AccessLevel TypeEffectiveAccessLevel (Type t)
+               protected bool FamilyAccessible (Type tb, Type check_type)
                {
-                       if (t.IsPublic)
-                               return AccessLevel.Public;              
-                       if (t.IsNestedPrivate)
-                               return AccessLevel.Private;
-                       if (t.IsNotPublic)
-                               return AccessLevel.Internal;
-                       
-                       // By now, it must be nested
-                       AccessLevel parentLevel = TypeEffectiveAccessLevel (t.DeclaringType);
-                       
-                       if (t.IsNestedPublic)
-                               return parentLevel;
-                       if (t.IsNestedAssembly)
-                               return parentLevel & AccessLevel.Internal;
-                       if (t.IsNestedFamily)
-                               return parentLevel & AccessLevel.Protected;
-                       if (t.IsNestedFamORAssem)
-                               return parentLevel & AccessLevel.ProtectedOrInternal;
-                       if (t.IsNestedFamANDAssem)
-                               throw new NotImplementedException ("NestedFamANDAssem not implemented, cant make this kind of type from c# anyways");
-                       
-                       // nested private is taken care of
-                       
-                       throw new Exception ("I give up, what are you?");
-               }
-
-               //
-               // This answers `is the type P, as accessible as a member M which has the
-               // accessability @flags which is declared as a nested member of the type T, this declspace'
-               //
-               public bool AsAccessible (Type p, int flags)
-               {
-                       //
-                       // 1) if M is private, its accessability is the same as this declspace.
-                       // we already know that P is accessible to T before this method, so we
-                       // may return true.
-                       //
-                       
-                       if ((flags & Modifiers.PRIVATE) != 0)
-                               return true;
-                       
-                       while (p.IsArray || p.IsPointer || p.IsByRef)
-                               p = TypeManager.GetElementType (p);
-                       
-                       AccessLevel pAccess = TypeEffectiveAccessLevel (p);
-                       AccessLevel mAccess = this.EffectiveAccessLevel &
-                               GetAccessLevelFromModifiers (flags);
-                       
-                       // for every place from which we can access M, we must
-                       // be able to access P as well. So, we want
-                       // For every bit in M and P, M_i -> P_1 == true
-                       // or, ~ (M -> P) == 0 <-> ~ ( ~M | P) == 0
-                       
-                       return ~ (~ mAccess | pAccess) == 0;
+                       Type declaring = check_type.DeclaringType;
+                       return TypeManager.IsNestedFamilyAccessible (TypeBuilder, declaring);
                }
-               
-               static DoubleHash dh = new DoubleHash (1000);
-
-               Type DefineTypeAndParents (DeclSpace tc)
-               {
-                       DeclSpace container = tc.Parent;
-
-                       if (container.TypeBuilder == null && container.Name != "")
-                               DefineTypeAndParents (container);
 
-                       return tc.DefineType ();
-               }
-               
-               FullNamedExpression LookupInterfaceOrClass (string ns, string name, out bool error)
+               public bool IsBaseType (Type baseType)
                {
-                       DeclSpace parent;
-                       FullNamedExpression result;
-                       Type t;
-                       object r;
-                       
-                       error = false;
-                       int p = name.LastIndexOf ('.');
+                       if (TypeManager.IsInterfaceType (baseType))
+                               throw new NotImplementedException ();
 
-                       if (dh.Lookup (ns, name, out r))
-                               return (FullNamedExpression) r;
-                       else {
-                               //
-                               // If the type is not a nested type, we do not need `LookupType's processing.
-                               // If the @name does not have a `.' in it, this cant be a nested type.
-                               //
-                               if (ns != ""){
-                                       if (Namespace.IsNamespace (ns)) {
-                                               if (p != -1)
-                                                       t = TypeManager.LookupType (ns + "." + name);
-                                               else
-                                                       t = TypeManager.LookupTypeDirect (ns + "." + name);
-                                       } else
-                                               t = null;
-                               } else if (p != -1)
-                                       t = TypeManager.LookupType (name);
-                               else
-                                       t = TypeManager.LookupTypeDirect (name);
-                       }
-                       
-                       if (t != null) {
-                               result = new TypeExpression (t, Location.Null);
-                               dh.Insert (ns, name, result);
-                               return result;
-                       }
-
-                       if (ns != "" && Namespace.IsNamespace (ns)) {
-                               result = Namespace.LookupNamespace (ns, false).Lookup (this, name, Location.Null);
-                               if (result != null) {
-                                       dh.Insert (ns, name, result);
-                                       return result;
-                               }
-                       }
-
-                       if (ns == "" && Namespace.IsNamespace (name)) {
-                               result = Namespace.LookupNamespace (name, false);
-                               dh.Insert (ns, name, result);
-                               return result;
-                       }
-
-                       //
-                       // In case we are fed a composite name, normalize it.
-                       //
-                       
-                       if (p != -1){
-                               ns = MakeFQN (ns, name.Substring (0, p));
-                               name = name.Substring (p+1);
-                       }
-
-                       if (ns.IndexOf ('+') != -1)
-                               ns = ns.Replace ('+', '.');
-
-                       parent = RootContext.Tree.LookupByNamespace (ns, name);
-                       if (parent == null) {
-                               dh.Insert (ns, name, null);
-                               return null;
-                       }
+                       Type type = TypeBuilder;
+                       while (type != null) {
+                               if (TypeManager.IsEqual (type, baseType))
+                                       return true;
 
-                       t = DefineTypeAndParents (parent);
-                       if (t == null){
-                               error = true;
-                               return null;
+                               type = type.BaseType;
                        }
-                       
-                       result = new TypeExpression (t, Location.Null);
-                       dh.Insert (ns, name, result);
-                       return result;
-               }
 
-               public static void Error_AmbiguousTypeReference (Location loc, string name, string t1, string t2)
-               {
-                       Report.Error (104, loc,
-                                     "`{0}' is an ambiguous reference ({1} or {2})",
-                                     name, t1, t2);
+                       return false;
                }
 
-               /// <summary>
-               ///   GetType is used to resolve type names at the DeclSpace level.
-               ///   Use this to lookup class/struct bases, interface bases or 
-               ///   delegate type references
-               /// </summary>
-               ///
-               /// <remarks>
-               ///   Contrast this to LookupType which is used inside method bodies to 
-               ///   lookup types that have already been defined.  GetType is used
-               ///   during the tree resolution process and potentially define
-               ///   recursively the type
-               /// </remarks>
-               public FullNamedExpression FindType (Location loc, string name)
+               private Type LookupNestedTypeInHierarchy (string name)
                {
-                       FullNamedExpression t;
-                       bool error;
-
-                       //
-                       // For the case the type we are looking for is nested within this one
-                       // or is in any base class
-                       //
-
-                       DeclSpace containing_ds = this;
-
-                       while (containing_ds != null){
-                               Type container_type = containing_ds.TypeBuilder;
-                               Type current_type = container_type;
-
-                               while (current_type != null && current_type != TypeManager.object_type) {
-                                       string pre = current_type.FullName;
-
-                                       t = LookupInterfaceOrClass (pre, name, out error);
-                                       if (error)
-                                               return null;
-                               
-                                       if ((t != null) && containing_ds.CheckAccessLevel (t.Type))
-                                               return t;
-
-                                       current_type = current_type.BaseType;
-                               }
-                               containing_ds = containing_ds.Parent;
-                       }
-
-                       //
-                       // Attempt to lookup the class on our namespace and all it's implicit parents
-                       //
-                       for (NamespaceEntry ns = NamespaceEntry; ns != null; ns = ns.ImplicitParent) {
-                               t = LookupInterfaceOrClass (ns.FullName, name, out error);
-                               if (error)
+                       Type t = null;
+                       // if the member cache has been created, lets use it.
+                       // the member cache is MUCH faster.
+                       if (MemberCache != null) {
+                               t = MemberCache.FindNestedType (name);
+                               if (t == null)
                                        return null;
                                
-                               if (t != null) 
-                                       return t;
-                       }
-                       
                        //
-                       // Attempt to do a direct unqualified lookup
+                       // FIXME: This hack is needed because member cache does not work
+                       // with nested base generic types, it does only type name copy and
+                       // not type construction
                        //
-                       t = LookupInterfaceOrClass ("", name, out error);
-                       if (error)
-                               return null;
-                       
-                       if (t != null)
+#if !GMCS_SOURCE
                                return t;
-                       
-                       //
-                       // Attempt to lookup the class on any of the `using'
-                       // namespaces
-                       //
+#endif                         
+                       }
 
-                       for (NamespaceEntry ns = NamespaceEntry; ns != null; ns = ns.Parent){
+                       // no member cache. Do it the hard way -- reflection
+                       for (Type current_type = TypeBuilder;
+                            current_type != null && current_type != TypeManager.object_type;
+                            current_type = current_type.BaseType) {
+
+                               Type ct = TypeManager.DropGenericTypeArguments (current_type);
+                               if (ct is TypeBuilder) {
+                                       TypeContainer tc = ct == TypeBuilder
+                                               ? PartialContainer : TypeManager.LookupTypeContainer (ct);
+                                       if (tc != null)
+                                               t = tc.FindNestedType (name);
+                               } else {
+                                       t = TypeManager.GetNestedType (ct, name);
+                               }
 
-                               t = LookupInterfaceOrClass (ns.FullName, name, out error);
-                               if (error)
-                                       return null;
+                               if ((t == null) || !CheckAccessLevel (t))
+                                       continue;
 
-                               if (t != null)
+#if GMCS_SOURCE
+                               if (!TypeManager.IsGenericType (current_type))
                                        return t;
 
-                               if (name.IndexOf ('.') > 0)
-                                       continue;
+                               Type[] args = TypeManager.GetTypeArguments (current_type);
+                               Type[] targs = TypeManager.GetTypeArguments (t);
+                               for (int i = 0; i < args.Length; i++)
+                                       targs [i] = args [i];
 
-                               t = ns.LookupAlias (name);
-                               if (t != null)
-                                       return t;
+                               t = t.MakeGenericType (targs);
+#endif
 
-                               //
-                               // Now check the using clause list
-                               //
-                               FullNamedExpression match = null;
-                               foreach (Namespace using_ns in ns.GetUsingTable ()) {
-                                       match = LookupInterfaceOrClass (using_ns.Name, name, out error);
-                                       if (error)
-                                               return null;
-
-                                       if ((match != null) && (match is TypeExpr)) {
-                                               Type matched = ((TypeExpr) match).Type;
-                                               if (!CheckAccessLevel (matched))
-                                                       continue;
-                                               if (t != null){
-                                                       Error_AmbiguousTypeReference (loc, name, t.FullName, match.FullName);
-                                                       return null;
-                                               }
-                                               t = match;
-                                       }
-                               }
-                               if (t != null)
-                                       return t;
+                               return t;
                        }
 
-                       //Report.Error (246, Location, "Can not find type `"+name+"'");
+                       return null;
+               }
+
+               public virtual ExtensionMethodGroupExpr LookupExtensionMethod (Type extensionType, string name, Location loc)
+               {
                        return null;
                }
 
                //
-               // Public function used to locate types, this can only
-               // be used after the ResolveTree function has been invoked.
+               // Public function used to locate types.
                //
-               // Returns: Type or null if they type can not be found.
+               // Set 'ignore_cs0104' to true if you want to ignore cs0104 errors.
                //
-               // Come to think of it, this should be a DeclSpace
+               // Returns: Type or null if they type can not be found.
                //
-               public FullNamedExpression LookupType (string name, bool silent, Location loc)
+               public FullNamedExpression LookupNamespaceOrType (string name, Location loc, bool ignore_cs0104)
                {
-                       FullNamedExpression e;
-
-                       if (Cache.Contains (name)) {
-                               e = (FullNamedExpression) Cache [name];
-                       } else {
-                               //
-                               // For the case the type we are looking for is nested within this one
-                               // or is in any base class
-                               //
-                               DeclSpace containing_ds = this;
-                               while (containing_ds != null){
-                                       
-                                       // if the member cache has been created, lets use it.
-                                       // the member cache is MUCH faster.
-                                       if (containing_ds.MemberCache != null) {
-                                               Type t = containing_ds.MemberCache.FindNestedType (name);
-                                               if (t == null) {
-                                                       containing_ds = containing_ds.Parent;
-                                                       continue;
-                                               }
+                       if (Cache.Contains (name))
+                               return (FullNamedExpression) Cache [name];
 
-                                               e = new TypeExpression (t, Location.Null);
-                                               Cache [name] = e;
-                                               return e;
-                                       }
-                                       
-                                       // no member cache. Do it the hard way -- reflection
-                                       Type current_type = containing_ds.TypeBuilder;
-                                       
-                                       while (current_type != null &&
-                                              current_type != TypeManager.object_type) {
-                                               //
-                                               // nested class
-                                               //
-                                               Type t = TypeManager.LookupType (current_type.FullName + "." + name);
-                                               if (t != null){
-                                                       e = new TypeExpression (t, Location.Null);
-                                                       Cache [name] = e;
-                                                       return e;
-                                               }
-                                               
-                                               current_type = current_type.BaseType;
-                                       }
-                                       
-                                       containing_ds = containing_ds.Parent;
-                               }
-                               
-                               e = NamespaceEntry.LookupNamespaceOrType (this, name, loc);
-                               if (!silent || e != null)
-                                       Cache [name] = e;
-                       }
+                       FullNamedExpression e;
+                       int errors = Report.Errors;
+                       Type t = LookupNestedTypeInHierarchy (name);
+                       if (t != null)
+                               e = new TypeExpression (t, Location.Null);
+                       else if (Parent != null)
+                               e = Parent.LookupNamespaceOrType (name, loc, ignore_cs0104);
+                       else
+                               e = NamespaceEntry.LookupNamespaceOrType (this, name, loc, ignore_cs0104);
 
-                       if (e == null && !silent)
-                               Report.Error (246, loc, "Cannot find type `"+name+"'");
+                       if (errors == Report.Errors)
+                               Cache [name] = e;
                        
                        return e;
                }
@@ -1086,8 +1250,13 @@ namespace Mono.CSharp {
                ///   be used while the type is still being created since it doesn't use the cache
                ///   and relies on the filter doing the member name check.
                /// </remarks>
-               public abstract MemberList FindMembers (MemberTypes mt, BindingFlags bf,
-                                                       MemberFilter filter, object criteria);
+               ///
+               // [Obsolete ("Only MemberCache approach should be used")]
+               public virtual MemberList FindMembers (MemberTypes mt, BindingFlags bf,
+                                                       MemberFilter filter, object criteria)
+               {
+                       throw new NotSupportedException ();
+               }
 
                /// <remarks>
                ///   If we have a MemberCache, return it.  This property may return null if the
@@ -1099,77 +1268,229 @@ namespace Mono.CSharp {
 
                public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
                {
-                       try {
-                               TypeBuilder.SetCustomAttribute (cb);
-                       } catch (System.ArgumentException e) {
-                               Report.Warning (-21, a.Location,
-                                               "The CharSet named property on StructLayout\n"+
-                                               "\tdoes not work correctly on Microsoft.NET\n"+
-                                               "\tYou might want to remove the CharSet declaration\n"+
-                                               "\tor compile using the Mono runtime instead of the\n"+
-                                               "\tMicrosoft .NET runtime\n"+
-                                               "\tThe runtime gave the error: " + e);
+                       if (a.Type == TypeManager.required_attr_type) {
+                               Report.Error (1608, a.Location, "The RequiredAttribute attribute is not permitted on C# types");
+                               return;
                        }
+                       TypeBuilder.SetCustomAttribute (cb);
                }
 
-               /// <summary>
-               /// Goes through class hierarchy and get value of first CLSCompliantAttribute that found.
-               /// If no is attribute exists then return assembly CLSCompliantAttribute.
-               /// </summary>
-               public bool GetClsCompliantAttributeValue ()
+               //
+               // Extensions for generics
+               //
+               protected TypeParameter[] type_params;
+               TypeParameter[] type_param_list;
+
+               bool check_type_parameter (ArrayList list, int start, string name)
                {
-                       if ((caching_flags & Flags.HasCompliantAttribute_Undetected) == 0)
-                               return (caching_flags & Flags.ClsCompliantAttributeTrue) != 0;
+                       for (int i = 0; i < start; i++) {
+                               TypeParameter param = (TypeParameter) list [i];
 
-                       caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
+                               if (param.Name != name)
+                                       continue;
 
-                       if (OptAttributes != null) {
-                               Attribute cls_attribute = OptAttributes.Search (TypeManager.cls_compliant_attribute_type, ec);
-                               if (cls_attribute != null) {
-                                       caching_flags |= Flags.HasClsCompliantAttribute;
-                                       if (cls_attribute.GetClsCompliantAttributeValue (ec)) {
-                                               caching_flags |= Flags.ClsCompliantAttributeTrue;
-                                               return true;
+                               Report.SymbolRelatedToPreviousError (Parent);
+                               // TODO: Location is wrong (parent instead of child)
+                               Report.Warning (693, 3, Location,
+                                       "Type parameter `{0}' has the same name as the type parameter from outer type `{1}'",
+                                       name, Parent.GetSignatureForError ());
+
+                               return false;
+                       }
+
+                       return true;
+               }
+
+               TypeParameter[] initialize_type_params ()
+               {
+                       if (type_param_list != null)
+                               return type_param_list;
+
+                       DeclSpace the_parent = Parent;
+                       if (this is GenericMethod)
+                               the_parent = null;
+
+                       int start = 0;
+                       ArrayList list = new ArrayList ();
+                       if (the_parent != null && the_parent.IsGeneric) {
+                               // FIXME: move generics info out of DeclSpace
+                               TypeParameter[] parent_params = the_parent.PartialContainer.TypeParameters;
+                               start = parent_params.Length;
+                               list.AddRange (parent_params);
+                       }
+                       int count = type_params != null ? type_params.Length : 0;
+                       for (int i = 0; i < count; i++) {
+                               TypeParameter param = type_params [i];
+                               check_type_parameter (list, start, param.Name);
+                               list.Add (param);
+                       }
+
+                       type_param_list = new TypeParameter [list.Count];
+                       list.CopyTo (type_param_list, 0);
+                       return type_param_list;
+               }
+
+               public virtual void SetParameterInfo (ArrayList constraints_list)
+               {
+                       if (!is_generic) {
+                               if (constraints_list != null) {
+                                       Report.Error (
+                                               80, Location, "Constraints are not allowed " +
+                                               "on non-generic declarations");
+                               }
+
+                               return;
+                       }
+
+                       TypeParameterName[] names = MemberName.TypeArguments.GetDeclarations ();
+                       type_params = new TypeParameter [names.Length];
+
+                       //
+                       // Register all the names
+                       //
+                       for (int i = 0; i < type_params.Length; i++) {
+                               TypeParameterName name = names [i];
+
+                               Constraints constraints = null;
+                               if (constraints_list != null) {
+                                       int total = constraints_list.Count;
+                                       for (int ii = 0; ii < total; ++ii) {
+                                               Constraints constraints_at = (Constraints)constraints_list[ii];
+                                               // TODO: it is used by iterators only
+                                               if (constraints_at == null) {
+                                                       constraints_list.RemoveAt (ii);
+                                                       --total;
+                                                       continue;
+                                               }
+                                               if (constraints_at.TypeParameter == name.Name) {
+                                                       constraints = constraints_at;
+                                                       constraints_list.RemoveAt(ii);
+                                                       break;
+                                               }
                                        }
-                                       return false;
                                }
+
+                               type_params [i] = new TypeParameter (
+                                       Parent, this, name.Name, constraints, name.OptAttributes,
+                                       Location);
+
+                               AddToContainer (type_params [i], name.Name);
                        }
 
-                       if (Parent == null) {
-                               if (CodeGen.Assembly.IsClsCompliant) {
-                                       caching_flags |= Flags.ClsCompliantAttributeTrue;
-                                       return true;
+                       if (constraints_list != null && constraints_list.Count > 0) {
+                               foreach (Constraints constraint in constraints_list) {
+                                       Report.Error(699, constraint.Location, "`{0}': A constraint references nonexistent type parameter `{1}'", 
+                                               GetSignatureForError (), constraint.TypeParameter);
                                }
-                               return false;
                        }
+               }
 
-                       if (Parent.GetClsCompliantAttributeValue ()) {
-                               caching_flags |= Flags.ClsCompliantAttributeTrue;
-                               return true;
+               public TypeParameter[] TypeParameters {
+                       get {
+                               if (!IsGeneric)
+                                       throw new InvalidOperationException ();
+                               if ((PartialContainer != null) && (PartialContainer != this))
+                                       return PartialContainer.TypeParameters;
+                               if (type_param_list == null)
+                                       initialize_type_params ();
+
+                               return type_param_list;
                        }
-                       return false;
                }
 
-               public override string[] ValidAttributeTargets {
+               public TypeParameter[] CurrentTypeParameters {
                        get {
-                               return attribute_targets;
+                               if (!IsGeneric)
+                                       throw new InvalidOperationException ();
+
+                               // TODO: Something is seriously broken here
+                               if (type_params == null)
+                                       return new TypeParameter [0];
+
+                               return type_params;
                        }
                }
 
-               bool IAlias.IsType {
-                       get { return true; }
+               public int CountTypeParameters {
+                       get {
+                               return count_type_params;
+                       }
                }
 
-               string IAlias.Name {
-                       get { return Name; }
+               public TypeParameterExpr LookupGeneric (string name, Location loc)
+               {
+                       if (!IsGeneric)
+                               return null;
+
+                       TypeParameter [] current_params;
+                       if (this is TypeContainer)
+                               current_params = PartialContainer.CurrentTypeParameters;
+                       else
+                               current_params = CurrentTypeParameters;
+
+                       foreach (TypeParameter type_param in current_params) {
+                               if (type_param.Name == name)
+                                       return new TypeParameterExpr (type_param, loc);
+                       }
+
+                       if (Parent != null)
+                               return Parent.LookupGeneric (name, loc);
+
+                       return null;
                }
 
-               TypeExpr IAlias.ResolveAsType (EmitContext ec)
+               // Used for error reporting only
+               public virtual Type LookupAnyGeneric (string typeName)
                {
-                       if (TypeBuilder == null)
-                               throw new InvalidOperationException ();
+                       return NamespaceEntry.NS.LookForAnyGenericType (typeName);
+               }
+
+               public override string[] ValidAttributeTargets {
+                       get { return attribute_targets; }
+               }
+
+               protected override bool VerifyClsCompliance ()
+               {
+                       if (!base.VerifyClsCompliance ()) {
+                               return false;
+                       }
+
+                       if (type_params != null) {
+                               foreach (TypeParameter tp in type_params) {
+                                       if (tp.Constraints == null)
+                                               continue;
+
+                                       tp.Constraints.VerifyClsCompliance ();
+                               }
+                       }
+
+                       IDictionary cache = TypeManager.AllClsTopLevelTypes;
+                       if (cache == null)
+                               return true;
+
+                       string lcase = Name.ToLower (System.Globalization.CultureInfo.InvariantCulture);
+                       if (!cache.Contains (lcase)) {
+                               cache.Add (lcase, this);
+                               return true;
+                       }
 
-                       return new TypeExpression (TypeBuilder, Location);
+                       object val = cache [lcase];
+                       if (val == null) {
+                               Type t = AttributeTester.GetImportedIgnoreCaseClsType (lcase);
+                               if (t == null)
+                                       return true;
+                               Report.SymbolRelatedToPreviousError (t);
+                       }
+                       else {
+                               Report.SymbolRelatedToPreviousError ((DeclSpace)val);
+                       }
+#if GMCS_SOURCE
+                       Report.Warning (3005, 1, Location, "Identifier `{0}' differing only in case is not CLS-compliant", GetSignatureForError ());
+#else
+                       Report.Error (3005, Location, "Identifier `{0}' differing only in case is not CLS-compliant", GetSignatureForError ());
+#endif
+                       return true;
                }
        }
 
@@ -1204,7 +1525,7 @@ namespace Mono.CSharp {
                        List = list;
                }
 
-               public static readonly MemberList Empty = new MemberList (new ArrayList ());
+               public static readonly MemberList Empty = new MemberList (new ArrayList (0));
 
                /// <summary>
                ///   Cast the MemberList into a MemberInfo[] array.
@@ -1372,13 +1693,6 @@ namespace Mono.CSharp {
                ///   this method is called multiple times with different BindingFlags.
                /// </remarks>
                MemberList GetMembers (MemberTypes mt, BindingFlags bf);
-
-               /// <summary>
-               ///   Return the container's member cache.
-               /// </summary>
-               MemberCache MemberCache {
-                       get;
-               }
        }
 
        /// <summary>
@@ -1413,18 +1727,18 @@ namespace Mono.CSharp {
                        // If we have a base class (we have a base class unless we're
                        // TypeManager.object_type), we deep-copy its MemberCache here.
                        if (Container.BaseCache != null)
-                               member_hash = DeepCopy (Container.BaseCache.member_hash);
+                               member_hash = SetupCache (Container.BaseCache);
                        else
                                member_hash = new Hashtable ();
 
                        // If this is neither a dynamic type nor an interface, create a special
                        // method cache with all declared and inherited methods.
                        Type type = container.Type;
-                       if (!(type is TypeBuilder) && !type.IsInterface) {
-                               if (Container.BaseCache != null)
-                                       method_hash = DeepCopy (Container.BaseCache.method_hash);
-                               else
-                                       method_hash = new Hashtable ();
+                       if (!(type is TypeBuilder) && !type.IsInterface &&
+                           // !(type.IsGenericType && (type.GetGenericTypeDefinition () is TypeBuilder)) &&
+                           !TypeManager.IsGenericType (type) && !TypeManager.IsGenericParameter (type) &&
+                           (Container.BaseCache == null || Container.BaseCache.method_hash != null)) {
+                               method_hash = new Hashtable ();
                                AddMethods (type);
                        }
 
@@ -1434,6 +1748,15 @@ namespace Mono.CSharp {
                        Timer.StopTimer (TimerType.CacheInit);
                }
 
+               public MemberCache (Type baseType, IMemberContainer container)
+               {
+                       this.Container = container;
+                       if (baseType == null)
+                               this.member_hash = new Hashtable ();
+                       else
+                               this.member_hash = SetupCache (TypeManager.LookupMemberCache (baseType));
+               }
+
                public MemberCache (Type[] ifaces)
                {
                        //
@@ -1450,23 +1773,63 @@ namespace Mono.CSharp {
                                AddCacheContents (TypeManager.LookupMemberCache (itype));
                }
 
+               public MemberCache (IMemberContainer container, Type base_class, Type[] ifaces)
+               {
+                       this.Container = container;
+
+                       // If we have a base class (we have a base class unless we're
+                       // TypeManager.object_type), we deep-copy its MemberCache here.
+                       if (Container.BaseCache != null)
+                               member_hash = SetupCache (Container.BaseCache);
+                       else
+                               member_hash = new Hashtable ();
+
+                       if (base_class != null)
+                               AddCacheContents (TypeManager.LookupMemberCache (base_class));
+                       if (ifaces != null) {
+                               foreach (Type itype in ifaces) {
+                                       MemberCache cache = TypeManager.LookupMemberCache (itype);
+                                       if (cache != null)
+                                               AddCacheContents (cache);
+                               }
+                       }
+               }
+
                /// <summary>
-               ///   Return a a deep-copy of the hashtable @other.
+               ///   Bootstrap this member cache by doing a deep-copy of our base.
                /// </summary>
-               Hashtable DeepCopy (Hashtable other)
+               static Hashtable SetupCache (MemberCache base_class)
                {
-                       Hashtable hash = new Hashtable ();
-
-                       if (other == null)
-                               return hash;
+                       if (base_class == null)
+                               return new Hashtable ();
 
-                       IDictionaryEnumerator it = other.GetEnumerator ();
+                       Hashtable hash = new Hashtable (base_class.member_hash.Count);
+                       IDictionaryEnumerator it = base_class.member_hash.GetEnumerator ();
                        while (it.MoveNext ()) {
-                               hash [it.Key] = ((ArrayList) it.Value).Clone ();
+                               hash.Add (it.Key, ((ArrayList) it.Value).Clone ());
                         }
                                 
                        return hash;
                }
+               
+               //
+               // Converts ModFlags to BindingFlags
+               //
+               static BindingFlags GetBindingFlags (int modifiers)
+               {
+                       BindingFlags bf;
+                       if ((modifiers & Modifiers.STATIC) != 0)
+                               bf = BindingFlags.Static;
+                       else
+                               bf = BindingFlags.Instance;
+
+                       if ((modifiers & Modifiers.PRIVATE) != 0)
+                               bf |= BindingFlags.NonPublic;
+                       else
+                               bf |= BindingFlags.Public;
+
+                       return bf;
+               }               
 
                /// <summary>
                ///   Add the contents of `cache' to the member_hash.
@@ -1519,6 +1882,46 @@ namespace Mono.CSharp {
                        AddMembers (mt, BindingFlags.Instance | BindingFlags.NonPublic, container);
                }
 
+               public void AddMember (MemberInfo mi, MemberCore mc)
+               {
+                       AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container, mi.Name, mi);
+               }
+
+               public void AddGenericMember (MemberInfo mi, MemberCore mc)
+               {
+                       AddMember (mi.MemberType, GetBindingFlags (mc.ModFlags), Container, mc.MemberName.Basename, mi);
+               }
+
+               public void AddNestedType (DeclSpace type)
+               {
+                       AddMember (MemberTypes.NestedType, GetBindingFlags (type.ModFlags), (IMemberContainer) type.Parent,
+                               type.TypeBuilder.Name, type.TypeBuilder);
+               }
+
+               public void AddInterface (MemberCache baseCache)
+               {
+                       if (baseCache.member_hash.Count > 0)
+                               AddCacheContents (baseCache);
+               }
+
+               void AddMember (MemberTypes mt, BindingFlags bf, IMemberContainer container,
+                               string name, MemberInfo member)
+               {
+                       // We use a name-based hash table of ArrayList's.
+                       ArrayList list = (ArrayList) member_hash [name];
+                       if (list == null) {
+                               list = new ArrayList (1);
+                               member_hash.Add (name, list);
+                       }
+
+                       // When this method is called for the current class, the list will
+                       // already contain all inherited members from our base classes.
+                       // We cannot add new members in front of the list since this'd be an
+                       // expensive operation, that's why the list is sorted in reverse order
+                       // (ie. members from the current class are coming last).
+                       list.Add (new CacheEntry (container, member, mt, bf));
+               }
+
                /// <summary>
                ///   Add all members from class `container' with the requested MemberTypes and
                ///   BindingFlags to the cache.  This method is called multiple times with different
@@ -1531,19 +1934,13 @@ namespace Mono.CSharp {
                        foreach (MemberInfo member in members) {
                                string name = member.Name;
 
-                               // We use a name-based hash table of ArrayList's.
-                               ArrayList list = (ArrayList) member_hash [name];
-                               if (list == null) {
-                                       list = new ArrayList ();
-                                       member_hash.Add (name, list);
-                               }
+                               AddMember (mt, bf, container, name, member);
 
-                               // When this method is called for the current class, the list will
-                               // already contain all inherited members from our base classes.
-                               // We cannot add new members in front of the list since this'd be an
-                               // expensive operation, that's why the list is sorted in reverse order
-                               // (ie. members from the current class are coming last).
-                               list.Add (new CacheEntry (container, member, mt, bf));
+                               if (member is MethodInfo) {
+                                       string gname = TypeManager.GetMethodName ((MethodInfo) member);
+                                       if (gname != name)
+                                               AddMember (mt, bf, container, gname, member);
+                               }
                        }
                }
 
@@ -1560,17 +1957,10 @@ namespace Mono.CSharp {
                        AddMethods (BindingFlags.Instance | BindingFlags.NonPublic, type);
                }
 
+               static ArrayList overrides = new ArrayList ();
+
                void AddMethods (BindingFlags bf, Type type)
                {
-                       //
-                       // Consider the case:
-                       //
-                       //   class X { public virtual int f() {} }
-                       //   class Y : X {}
-                       // 
-                       // When processing 'Y', the method_cache will already have a copy of 'f', 
-                       // with ReflectedType == X.  However, we want to ensure that its ReflectedType == Y
-                       // 
                        MethodBase [] members = type.GetMethods (bf);
 
                         Array.Reverse (members);
@@ -1581,30 +1971,36 @@ namespace Mono.CSharp {
                                // We use a name-based hash table of ArrayList's.
                                ArrayList list = (ArrayList) method_hash [name];
                                if (list == null) {
-                                       list = new ArrayList ();
+                                       list = new ArrayList (1);
                                        method_hash.Add (name, list);
                                }
 
-                               Type declaring_type = member.DeclaringType;
-                               if (declaring_type == type) {
-                                       list.Add (new CacheEntry (Container, member, MemberTypes.Method, bf | BindingFlags.DeclaredOnly));
-                                       continue;
-                               }
+                               MethodInfo curr = (MethodInfo) member;
+                               while (curr.IsVirtual && (curr.Attributes & MethodAttributes.NewSlot) == 0) {
+                                       MethodInfo base_method = curr.GetBaseDefinition ();
 
-                               int n = list.Count;
-                               while (n-- > 0) {
-                                       CacheEntry entry = (CacheEntry) list [n];
-                                       MethodBase old = entry.Member as MethodBase;
-
-                                       if (member.MethodHandle.Value == old.MethodHandle.Value && 
-                                           declaring_type == old.DeclaringType) {
-                                               list [n] = new CacheEntry (entry, member);
+                                       if (base_method == curr)
+                                               // Not every virtual function needs to have a NewSlot flag.
                                                break;
-                                       }
+
+                                       overrides.Add (curr);
+                                       list.Add (new CacheEntry (null, base_method, MemberTypes.Method, bf));
+                                       curr = base_method;
+                               }
+
+                               if (overrides.Count > 0) {
+                                       for (int i = 0; i < overrides.Count; ++i)
+                                               TypeManager.RegisterOverride ((MethodBase) overrides [i], curr);
+                                       overrides.Clear ();
                                }
 
-                               if (n < 0)
-                                       throw new InternalErrorException ("cannot find inherited member " + member + " in base classes of " + type);
+                               // Unfortunately, the elements returned by Type.GetMethods() aren't
+                               // sorted so we need to do this check for every member.
+                               BindingFlags new_bf = bf;
+                               if (member.DeclaringType == type)
+                                       new_bf |= BindingFlags.DeclaredOnly;
+
+                               list.Add (new CacheEntry (Container, member, MemberTypes.Method, new_bf));
                        }
                }
 
@@ -1690,12 +2086,14 @@ namespace Mono.CSharp {
                        Property        = 0x200,
                        NestedType      = 0x400,
 
+                       NotExtensionMethod      = 0x800,
+
                        MaskType        = Constructor|Event|Field|Method|Property|NestedType
                }
 
                protected class CacheEntry {
                        public readonly IMemberContainer Container;
-                       public readonly EntryType EntryType;
+                       public EntryType EntryType;
                        public readonly MemberInfo Member;
 
                        public CacheEntry (IMemberContainer container, MemberInfo member,
@@ -1706,13 +2104,6 @@ namespace Mono.CSharp {
                                this.EntryType = GetEntryType (mt, bf);
                        }
 
-                       public CacheEntry (CacheEntry other, MemberInfo update)
-                       {
-                               this.Container = other.Container;
-                               this.EntryType = other.EntryType & ~EntryType.Declared;
-                               this.Member = update;
-                       }
-
                        public override string ToString ()
                        {
                                return String.Format ("CacheEntry ({0}:{1}:{2})", Container.Name,
@@ -1772,7 +2163,7 @@ namespace Mono.CSharp {
                {
                        if (using_global)
                                throw new Exception ();
-                       
+
                        bool declared_only = (bf & BindingFlags.DeclaredOnly) != 0;
                        bool method_search = mt == MemberTypes.Method;
                        // If we have a method cache and we aren't already doing a method-only search,
@@ -1809,6 +2200,7 @@ namespace Mono.CSharp {
 
                        IMemberContainer current = Container;
 
+                       bool do_interface_search = current.IsInterface;
 
                        // `applicable' is a list of all members with the given member name `name'
                        // in the current class and all its base classes.  The list is sorted in
@@ -1824,7 +2216,10 @@ namespace Mono.CSharp {
                                // iteration of this loop if there are no members with the name we're
                                // looking for in the current class).
                                if (entry.Container != current) {
-                                       if (declared_only || DoneSearching (global))
+                                       if (declared_only)
+                                               break;
+
+                                       if (!do_interface_search && DoneSearching (global))
                                                break;
 
                                        current = entry.Container;
@@ -1840,8 +2235,28 @@ namespace Mono.CSharp {
 
                                // Apply the filter to it.
                                if (filter (entry.Member, criteria)) {
-                                       if ((entry.EntryType & EntryType.MaskType) != EntryType.Method)
+                                       if ((entry.EntryType & EntryType.MaskType) != EntryType.Method) {
                                                do_method_search = false;
+                                       }
+                                       
+                                       // Because interfaces support multiple inheritance we have to be sure that
+                                       // base member is from same interface, so only top level member will be returned
+                                       if (do_interface_search && global.Count > 0) {
+                                               bool member_already_exists = false;
+
+                                               foreach (MemberInfo mi in global) {
+                                                       if (mi is MethodBase)
+                                                               continue;
+
+                                                       if (IsInterfaceBaseInterface (TypeManager.GetInterfaces (mi.DeclaringType), entry.Member.DeclaringType)) {
+                                                               member_already_exists = true;
+                                                               break;
+                                                       }
+                                               }
+                                               if (member_already_exists)
+                                                       continue;
+                                       }
+
                                        global.Add (entry.Member);
                                }
                        }
@@ -1863,6 +2278,22 @@ namespace Mono.CSharp {
                        global.CopyTo (copy);
                        return copy;
                }
+
+               /// <summary>
+               /// Returns true if iterface exists in any base interfaces (ifaces)
+               /// </summary>
+               static bool IsInterfaceBaseInterface (Type[] ifaces, Type ifaceToFind)
+               {
+                       foreach (Type iface in ifaces) {
+                               if (iface == ifaceToFind)
+                                       return true;
+
+                               Type[] base_ifaces = TypeManager.GetInterfaces (iface);
+                               if (base_ifaces.Length > 0 && IsInterfaceBaseInterface (base_ifaces, ifaceToFind))
+                                       return true;
+                       }
+                       return false;
+               }
                
                // find the nested type @name in @this.
                public Type FindNestedType (string name)
@@ -1879,16 +2310,84 @@ namespace Mono.CSharp {
                        
                        return null;
                }
+
+               public MemberInfo FindBaseEvent (Type invocation_type, string name)
+               {
+                       ArrayList applicable = (ArrayList) member_hash [name];
+                       if (applicable == null)
+                               return null;
+
+                       //
+                       // Walk the chain of events, starting from the top.
+                       //
+                       for (int i = applicable.Count - 1; i >= 0; i--) 
+                       {
+                               CacheEntry entry = (CacheEntry) applicable [i];
+                               if ((entry.EntryType & EntryType.Event) == 0)
+                                       continue;
+                               
+                               EventInfo ei = (EventInfo)entry.Member;
+                               return ei.GetAddMethod (true);
+                       }
+
+                       return null;
+               }
+
+               //
+               // Looks for extension methods with defined name and extension type
+               //
+               public ArrayList FindExtensionMethods (Type extensionType, string name, bool publicOnly)
+               {
+                       ArrayList entries;
+                       if (method_hash != null)
+                               entries = (ArrayList)method_hash [name];
+                       else
+                               entries = (ArrayList)member_hash [name];
+
+                       if (entries == null)
+                               return null;
+
+                       EntryType entry_type = EntryType.Static | EntryType.Method | EntryType.NotExtensionMethod;
+                       if (publicOnly) {
+                               entry_type |= EntryType.Public;
+                       }
+                       EntryType found_entry_type = entry_type & ~EntryType.NotExtensionMethod;
+
+                       ArrayList candidates = null;
+                       foreach (CacheEntry entry in entries) {
+                               if ((entry.EntryType & entry_type) == found_entry_type) {
+                                       MethodBase mb = (MethodBase)entry.Member;
+
+                                       IMethodData md = TypeManager.GetMethod (mb);
+                                       ParameterData pd = md == null ?
+                                               TypeManager.GetParameterData (mb) : md.ParameterInfo;
+
+                                       Type ex_type = pd.ExtensionMethodType;
+                                       if (ex_type == null) {
+                                               entry.EntryType |= EntryType.NotExtensionMethod;
+                                               continue;
+                                       }
+
+                                       //if (implicit conversion between ex_type and extensionType exist) {
+                                               if (candidates == null)
+                                                       candidates = new ArrayList (2);
+                                               candidates.Add (mb);
+                                       //}
+                               }
+                       }
+
+                       return candidates;
+               }
                
                //
-               // This finds the method or property for us to override. invocationType is the type where
+               // This finds the method or property for us to override. invocation_type is the type where
                // the override is going to be declared, name is the name of the method/property, and
-               // paramTypes is the parameters, if any to the method or property
+               // param_types is the parameters, if any to the method or property
                //
                // Because the MemberCache holds members from this class and all the base classes,
                // we can avoid tons of reflection stuff.
                //
-               public MemberInfo FindMemberToOverride (Type invocationType, string name, Type [] paramTypes, bool is_property)
+               public MemberInfo FindMemberToOverride (Type invocation_type, string name, Type [] param_types, GenericMethod generic_method, bool is_property)
                {
                        ArrayList applicable;
                        if (method_hash != null && !is_property)
@@ -1910,7 +2409,7 @@ namespace Mono.CSharp {
                                PropertyInfo pi = null;
                                MethodInfo mi = null;
                                FieldInfo fi = null;
-                               Type [] cmpAttrs = null;
+                               Type [] cmp_attrs = null;
                                
                                if (is_property) {
                                        if ((entry.EntryType & EntryType.Field) != 0) {
@@ -1918,38 +2417,39 @@ namespace Mono.CSharp {
 
                                                // TODO: For this case we ignore member type
                                                //fb = TypeManager.GetField (fi);
-                                               //cmpAttrs = new Type[] { fb.MemberType };
+                                               //cmp_attrs = new Type[] { fb.MemberType };
                                        } else {
                                                pi = (PropertyInfo) entry.Member;
-                                               cmpAttrs = TypeManager.GetArgumentTypes (pi);
+                                               cmp_attrs = TypeManager.GetArgumentTypes (pi);
                                        }
                                } else {
                                        mi = (MethodInfo) entry.Member;
-                                       cmpAttrs = TypeManager.GetArgumentTypes (mi);
+                                       cmp_attrs = TypeManager.GetParameterData (mi).Types;
                                }
 
                                if (fi != null) {
                                        // TODO: Almost duplicate !
                                        // Check visibility
                                        switch (fi.Attributes & FieldAttributes.FieldAccessMask) {
-                                               case FieldAttributes.Private:
-                                                       //
-                                                       // A private method is Ok if we are a nested subtype.
-                                                       // The spec actually is not very clear about this, see bug 52458.
-                                                       //
-                                                       if (invocationType != entry.Container.Type &
-                                                               TypeManager.IsNestedChildOf (invocationType, entry.Container.Type))
-                                                               continue;
-
-                                                       break;
-                                               case FieldAttributes.FamANDAssem:
-                                               case FieldAttributes.Assembly:
-                                                       //
-                                                       // Check for assembly methods
-                                                       //
-                                                       if (mi.DeclaringType.Assembly != CodeGen.Assembly.Builder)
-                                                               continue;
-                                                       break;
+                                       case FieldAttributes.PrivateScope:
+                                               continue;
+                                       case FieldAttributes.Private:
+                                               //
+                                               // A private method is Ok if we are a nested subtype.
+                                               // The spec actually is not very clear about this, see bug 52458.
+                                               //
+                                               if (!invocation_type.Equals (entry.Container.Type) &&
+                                                   !TypeManager.IsNestedChildOf (invocation_type, entry.Container.Type))
+                                                       continue;
+                                               break;
+                                       case FieldAttributes.FamANDAssem:
+                                       case FieldAttributes.Assembly:
+                                               //
+                                               // Check for assembly methods
+                                               //
+                                               if (mi.DeclaringType.Assembly != CodeGen.Assembly.Builder)
+                                                       continue;
+                                               break;
                                        }
                                        return entry.Member;
                                }
@@ -1957,13 +2457,27 @@ namespace Mono.CSharp {
                                //
                                // Check the arguments
                                //
-                               if (cmpAttrs.Length != paramTypes.Length)
+                               if (cmp_attrs.Length != param_types.Length)
                                        continue;
        
-                               for (int j = cmpAttrs.Length - 1; j >= 0; j --)
-                                       if (paramTypes [j] != cmpAttrs [j])
-                                               goto next;
-                               
+                               int j;
+                               for (j = 0; j < cmp_attrs.Length; ++j)
+                                       if (!TypeManager.IsEqual (param_types [j], cmp_attrs [j]))
+                                               break;
+                               if (j < cmp_attrs.Length)
+                                       continue;
+
+                               //
+                               // check generic arguments for methods
+                               //
+                               if (mi != null) {
+                                       Type [] cmpGenArgs = TypeManager.GetGenericArguments (mi);
+                                       if (generic_method == null && cmpGenArgs.Length != 0)
+                                               continue;
+                                       if (generic_method != null && cmpGenArgs.Length != generic_method.TypeParameters.Length)
+                                               continue;
+                               }
+
                                //
                                // get one of the methods because this has the visibility info.
                                //
@@ -1977,34 +2491,27 @@ namespace Mono.CSharp {
                                // Check visibility
                                //
                                switch (mi.Attributes & MethodAttributes.MemberAccessMask) {
+                               case MethodAttributes.PrivateScope:
+                                       continue;
                                case MethodAttributes.Private:
                                        //
                                        // A private method is Ok if we are a nested subtype.
                                        // The spec actually is not very clear about this, see bug 52458.
                                        //
-                                       if (invocationType == entry.Container.Type ||
-                                           TypeManager.IsNestedChildOf (invocationType, entry.Container.Type))
-                                               return entry.Member;
-                                       
+                                       if (!invocation_type.Equals (entry.Container.Type) &&
+                                           !TypeManager.IsNestedChildOf (invocation_type, entry.Container.Type))
+                                               continue;
                                        break;
                                case MethodAttributes.FamANDAssem:
                                case MethodAttributes.Assembly:
                                        //
                                        // Check for assembly methods
                                        //
-                                       if (mi.DeclaringType.Assembly == CodeGen.Assembly.Builder)
-                                               return entry.Member;
-                                       
+                                       if (!TypeManager.IsThisOrFriendAssembly (mi.DeclaringType.Assembly))
+                                               continue;
                                        break;
-                               default:
-                                       //
-                                       // A protected method is ok, because we are overriding.
-                                       // public is always ok.
-                                       //
-                                       return entry.Member;
                                }
-                       next:
-                               ;
+                               return entry.Member;
                        }
                        
                        return null;
@@ -2121,7 +2628,9 @@ namespace Mono.CSharp {
                /// <summary>
                /// Cls compliance check whether methods or constructors parameters differing only in ref or out, or in array rank
                /// </summary>
-               public void VerifyClsParameterConflict (ArrayList al, MethodCore method, MemberInfo this_builder)
+               /// 
+               // TODO: refactor as method is always 'this'
+               public static void VerifyClsParameterConflict (ArrayList al, MethodCore method, MemberInfo this_builder)
                {
                        EntryType tested_type = (method is Constructor ? EntryType.Constructor : EntryType.Method) | EntryType.Public;
  
@@ -2136,19 +2645,190 @@ namespace Mono.CSharp {
                                        continue;
                
                                MethodBase method_to_compare = (MethodBase)entry.Member;
-                               if (AttributeTester.AreOverloadedMethodParamsClsCompliant (method.ParameterTypes, TypeManager.GetArgumentTypes (method_to_compare)))
+                               AttributeTester.Result result = AttributeTester.AreOverloadedMethodParamsClsCompliant (
+                                       method.ParameterTypes, TypeManager.GetParameterData (method_to_compare).Types);
+
+                               if (result == AttributeTester.Result.Ok)
                                        continue;
 
                                IMethodData md = TypeManager.GetMethod (method_to_compare);
 
                                // TODO: now we are ignoring CLSCompliance(false) on method from other assembly which is buggy.
                                // However it is exactly what csc does.
-                               if (md != null && !md.IsClsCompliaceRequired (method.Parent))
+                               if (md != null && !md.IsClsComplianceRequired ())
                                        continue;
                
                                Report.SymbolRelatedToPreviousError (entry.Member);
-                               Report.Error (3006, method.Location, "Overloaded method '{0}' differing only in ref or out, or in array rank, is not CLS-compliant", method.GetSignatureForError ());
+                               switch (result) {
+                                       case AttributeTester.Result.RefOutArrayError:
+                                               Report.Error (3006, method.Location, "Overloaded method `{0}' differing only in ref or out, or in array rank, is not CLS-compliant", method.GetSignatureForError ());
+                                               continue;
+                                       case AttributeTester.Result.ArrayArrayError:
+                                               Report.Error (3007, method.Location, "Overloaded method `{0}' differing only by unnamed array types is not CLS-compliant", method.GetSignatureForError ());
+                                               continue;
+                               }
+
+                               throw new NotImplementedException (result.ToString ());
                        }
                }
+
+               public bool CheckExistingMembersOverloads (MemberCore member, string name, Parameters parameters)
+               {
+                       ArrayList entries = (ArrayList)member_hash [name];
+                       if (entries == null)
+                               return true;
+
+                       int method_param_count = parameters.Count;
+                       for (int i = entries.Count - 1; i >= 0; --i) {
+                               CacheEntry ce = (CacheEntry) entries [i];
+
+                               if (ce.Container != member.Parent.PartialContainer)
+                                       return true;
+
+                               Type [] p_types;
+                               ParameterData pd = null;
+                               if ((ce.EntryType & EntryType.Property) != 0) {
+                                       p_types = TypeManager.GetArgumentTypes ((PropertyInfo) ce.Member);
+                               } else {
+                                       MethodBase mb = (MethodBase) ce.Member;
+#if GMCS_SOURCE                                        
+                                       // TODO: This is more like a hack, because we are adding generic methods
+                                       // twice with and without arity name
+                                       if (mb.IsGenericMethod && !member.MemberName.IsGeneric)
+                                               continue;
+#endif                                 
+                                       pd = TypeManager.GetParameterData (mb);
+                                       p_types = pd.Types;
+                               }
+
+                               if (p_types.Length != method_param_count)
+                                       continue;
+
+                               if (method_param_count > 0) {
+                                       int ii = method_param_count - 1;
+                                       Type type_a, type_b;
+                                       do {
+                                               type_a = parameters.ParameterType (ii);
+                                               type_b = p_types [ii];
+#if GMCS_SOURCE
+                                               if (type_a.IsGenericParameter && type_a.DeclaringMethod != null)
+                                                       type_a = null;
+
+                                               if (type_b.IsGenericParameter && type_b.DeclaringMethod != null)
+                                                       type_b = null;
+#endif
+                                       } while (type_a == type_b && ii-- != 0);
+
+                                       if (ii >= 0)
+                                               continue;
+
+                                       //
+                                       // Operators can differ in return type only
+                                       //
+                                       if (member is Operator) {
+                                               Operator op = TypeManager.GetMethod ((MethodBase) ce.Member) as Operator;
+                                               if (op != null && op.ReturnType != ((Operator) member).ReturnType)
+                                                       continue;
+                                       }
+
+                                       //
+                                       // Report difference in parameter modifiers only
+                                       //
+                                       if (pd != null && !(member is AbstractPropertyEventMethod)) {
+                                               ii = method_param_count;
+                                               while (ii-- != 0 && parameters.ParameterModifier (ii) == pd.ParameterModifier (ii) &&
+                                                       parameters.ExtensionMethodType == pd.ExtensionMethodType);
+
+                                               if (ii >= 0) {
+                                                       MethodCore mc = TypeManager.GetMethod ((MethodBase) ce.Member) as MethodCore;
+                                                       Report.SymbolRelatedToPreviousError (ce.Member);
+                                                       if ((member.ModFlags & Modifiers.PARTIAL) != 0 && (mc.ModFlags & Modifiers.PARTIAL) != 0) {
+                                                               if (parameters.HasParams || pd.HasParams) {
+                                                                       Report.Error (758, member.Location,
+                                                                               "A partial method declaration and partial method implementation cannot differ on use of `params' modifier");
+                                                               } else {
+                                                                       Report.Error (755, member.Location,
+                                                                               "A partial method declaration and partial method implementation must be both an extension method or neither");
+                                                               }
+                                                       } else {
+                                                               Report.Error (663, member.Location,
+                                                                       "An overloaded method `{0}' cannot differ on use of parameter modifiers only",
+                                                                       member.GetSignatureForError ());
+                                                       }
+                                                       return false;
+                                               }
+                                       }
+                               }
+
+                               if ((ce.EntryType & EntryType.Method) != 0) {
+                                       Method method_a = member as Method;
+                                       Method method_b = TypeManager.GetMethod ((MethodBase) ce.Member) as Method;
+                                       if (method_a != null && method_b != null && (method_a.ModFlags & method_b.ModFlags & Modifiers.PARTIAL) != 0) {
+                                               const int partial_modifiers = Modifiers.STATIC | Modifiers.UNSAFE;
+                                               if (method_a.IsPartialDefinition == method_b.IsPartialImplementation) {
+                                                       if ((method_a.ModFlags & partial_modifiers) == (method_b.ModFlags & partial_modifiers) ||
+                                                               method_a.Parent.IsInUnsafeScope && method_b.Parent.IsInUnsafeScope) {
+                                                               if (method_a.IsPartialImplementation) {
+                                                                       method_a.SetPartialDefinition (method_b);
+                                                                       entries.RemoveAt (i);
+                                                               } else {
+                                                                       method_b.SetPartialDefinition (method_a);
+                                                               }
+                                                               continue;
+                                                       }
+
+                                                       if ((method_a.ModFlags & Modifiers.STATIC) != (method_b.ModFlags & Modifiers.STATIC)) {
+                                                               Report.SymbolRelatedToPreviousError (ce.Member);
+                                                               Report.Error (763, member.Location,
+                                                                       "A partial method declaration and partial method implementation must be both `static' or neither");
+                                                       }
+
+                                                       Report.SymbolRelatedToPreviousError (ce.Member);
+                                                       Report.Error (764, member.Location,
+                                                               "A partial method declaration and partial method implementation must be both `unsafe' or neither");
+                                                       return false;
+                                               }
+
+                                               Report.SymbolRelatedToPreviousError (ce.Member);
+                                               if (method_a.IsPartialDefinition) {
+                                                       Report.Error (756, member.Location, "A partial method `{0}' declaration is already defined",
+                                                               member.GetSignatureForError ());
+                                               }
+
+                                               Report.Error (757, member.Location, "A partial method `{0}' implementation is already defined",
+                                                       member.GetSignatureForError ());
+                                               return false;
+                                       }
+
+                                       Report.SymbolRelatedToPreviousError (ce.Member);
+                                       IMethodData duplicate_member = TypeManager.GetMethod ((MethodBase) ce.Member);
+                                       if (member is Operator && duplicate_member is Operator) {
+                                               Report.Error (557, member.Location, "Duplicate user-defined conversion in type `{0}'",
+                                                       member.Parent.GetSignatureForError ());
+                                               return false;
+                                       }
+
+                                       bool is_reserved_a = member is AbstractPropertyEventMethod || member is Operator;
+                                       bool is_reserved_b = duplicate_member is AbstractPropertyEventMethod || duplicate_member is Operator;
+
+                                       if (is_reserved_a || is_reserved_b) {
+                                               Report.Error (82, member.Location, "A member `{0}' is already reserved",
+                                                       is_reserved_a ?
+                                                       TypeManager.GetFullNameSignature (ce.Member) :
+                                                       member.GetSignatureForError ());
+                                               return false;
+                                       }
+                               } else {
+                                       Report.SymbolRelatedToPreviousError (ce.Member);
+                               }
+                               
+                               Report.Error (111, member.Location,
+                                       "A member `{0}' is already defined. Rename this member or use different parameter types",
+                                       member.GetSignatureForError ());
+                               return false;
+                       }
+
+                       return true;
+               }
        }
 }