Tue Nov 14 16:06:37 CET 2006 Paolo Molaro <lupus@ximian.com>
[mono.git] / mcs / mcs / decl.cs
index 060d183a6297e89b5613786593dff0f194363821..77a3929ae89e7de6165dce3b84fc75dc9d34c10c 100644 (file)
@@ -13,6 +13,7 @@
 //
 
 using System;
+using System.Text;
 using System.Collections;
 using System.Globalization;
 using System.Reflection.Emit;
@@ -28,14 +29,17 @@ namespace Mono.CSharp {
 
        public class MemberName {
                public readonly string Name;
+               public readonly TypeArguments TypeArguments;
+
                public readonly MemberName Left;
                public readonly Location Location;
 
-               bool is_double_colon;
-
                public static readonly MemberName Null = new MemberName ("");
 
-               private MemberName (MemberName left, string name, bool is_double_colon, Location loc)
+               bool is_double_colon;
+
+               private MemberName (MemberName left, string name, bool is_double_colon,
+                                   Location loc)
                {
                        this.Name = name;
                        this.Location = loc;
@@ -43,57 +47,53 @@ namespace Mono.CSharp {
                        this.Left = left;
                }
 
-               public MemberName (string name)
-                       : this (null, name, false, Location.Null)
+               private MemberName (MemberName left, string name, bool is_double_colon,
+                                   TypeArguments args, Location loc)
+                       : this (left, name, is_double_colon, loc)
                {
+                       this.TypeArguments = args;
                }
 
-               public MemberName (MemberName left, string name)
-                       : this (left, name, false, left != null ? left.Location : Location.Null)
-               {
-               }
+               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, Location loc)
-                       : this (new MemberName (alias), name, true, loc)
-               {
-               }
+                       : this (new MemberName (alias, loc), name, true, loc)
+               { }
 
                public MemberName (MemberName left, MemberName right)
                        : this (left, right, right.Location)
-               {
-               }
+               { }
 
                public MemberName (MemberName left, MemberName right, Location loc)
-                       : this (null, right.Name, false, 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);
                }
 
-               static readonly char [] dot_array = { '.' };
-
-               public static MemberName FromDotted (string name)
-               {
-                       string [] elements = name.Split (dot_array);
-                       int count = elements.Length;
-                       int i = 0;
-                       MemberName n = new MemberName (elements [i++]);
-                       while (i < count)
-                               n = new MemberName (n, elements [i++]);
-                       return n;
-               }
-
                public string GetName ()
                {
                        return GetName (false);
@@ -101,7 +101,12 @@ namespace Mono.CSharp {
 
                public bool IsGeneric {
                        get {
-                               return false;
+                               if (TypeArguments != null)
+                                       return true;
+                               else if (Left != null)
+                                       return Left.IsGeneric;
+                               else
+                                       return false;
                        }
                }
 
@@ -115,32 +120,33 @@ namespace Mono.CSharp {
                                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 ()
-               {
-                       string connect = is_double_colon ? "::" : ".";
-                       if (Left != null)
-                               return Left.GetPartialName () + connect + Name;
-                       else
-                               return Name;
-               }
-
                public string GetTypeName ()
                {
                        string connect = is_double_colon ? "::" : ".";
                        if (Left != null)
-                               return Left.GetTypeName () + connect + Name;
+                               return Left.GetTypeName () + connect + MakeName (Name, TypeArguments);
                        else
-                               return Name;
+                               return MakeName (Name, TypeArguments);
                }
 
                public Expression GetTypeExpression ()
                {
-                       if (Left == null)
+#if GMCS_SOURCE
+                       if (IsUnbound) {
+                               if (!CheckUnbound (Location))
+                                       return null;
+
+                               return new UnboundTypeExpression (this, Location);
+                       }
+#endif
+
+                       if (Left == null) {
+                               if (TypeArguments != null)
+                                       return new SimpleName (Basename, TypeArguments, Location);
+                               else
                                return new SimpleName (Name, Location);
+                       }
+
                        if (is_double_colon) {
                                if (Left.Left != null)
                                        throw new InternalErrorException ("The left side of a :: should be an identifier");
@@ -148,26 +154,50 @@ namespace Mono.CSharp {
                        }
 
                        Expression lexpr = Left.GetTypeExpression ();
-                       return new MemberAccess (lexpr, Name);
+                       return new MemberAccess (lexpr, Name, TypeArguments, Location);
                }
 
                public MemberName Clone ()
                {
                        MemberName left_clone = Left == null ? null : Left.Clone ();
-                       return new MemberName (left_clone, Name, is_double_colon, Location);
+                       return new MemberName (left_clone, Name, is_double_colon, TypeArguments, Location);
                }
 
                public string Basename {
-                       get { return Name; }
+                       get {
+                               if (TypeArguments != null)
+                                       return MakeName (Name, TypeArguments);
+                               else
+                                       return Name;
+                       }
+               }
+
+               public string FullName {
+                       get {
+                               if (TypeArguments != null)
+                                       return Name + "<" + TypeArguments + ">";
+                               else
+                                       return Name;
+                       }
+               }
+
+               public string MethodName {
+                       get {
+                               string connect = is_double_colon ? "::" : ".";
+                               if (Left != null)
+                                       return Left.FullName + connect + Name;
+                               else
+                                       return Name;
+                       }
                }
 
                public override string ToString ()
                {
                        string connect = is_double_colon ? "::" : ".";
                        if (Left != null)
-                               return Left + connect + Name;
+                               return Left.FullName + connect + FullName;
                        else
-                               return Name;
+                               return FullName;
                }
 
                public override bool Equals (object other)
@@ -183,13 +213,14 @@ namespace Mono.CSharp {
                                return false;
                        if (is_double_colon != other.is_double_colon)
                                return false;
-#if NET_2_0
-                       if (TypeArguments == null)
-                               return other.TypeArguments == null;
 
-                       if (other.TypeArguments == null || TypeArguments.Count != other.TypeArguments.Count)
+                       if ((TypeArguments != null) &&
+                           (other.TypeArguments == null || TypeArguments.Count != other.TypeArguments.Count))
                                return false;
-#endif
+
+                       if ((TypeArguments == null) && (other.TypeArguments != null))
+                               return false;
+
                        if (Left == null)
                                return other.Left == null;
 
@@ -203,13 +234,57 @@ namespace Mono.CSharp {
                                hash ^= n.Name.GetHashCode ();
                        if (is_double_colon)
                                hash ^= 0xbadc01d;
-#if NET_2_0
+
                        if (TypeArguments != null)
                                hash ^= TypeArguments.Count << 5;
-#endif
 
                        return hash & 0x7FFFFFFF;
                }
+
+               public int CountTypeArguments {
+                       get {
+                               if (TypeArguments == null)
+                                       return 0;
+                               else
+                                       return TypeArguments.Count;
+                       }
+               }
+
+               public static string MakeName (string name, TypeArguments args)
+               {
+                       if (args == null)
+                               return name;
+                       else
+                               return name + "`" + args.Count;
+               }
+
+               public static string MakeName (string name, int count)
+               {
+                       return name + "`" + count;
+               }
+
+               protected bool IsUnbound {
+                       get {
+                               if ((Left != null) && Left.IsUnbound)
+                                       return true;
+                               else if (TypeArguments == null)
+                                       return false;
+                               else
+                                       return TypeArguments.IsUnbound;
+                       }
+               }
+
+               protected bool CheckUnbound (Location loc)
+               {
+                       if ((Left != null) && !Left.CheckUnbound (loc))
+                               return false;
+                       if ((TypeArguments != null) && !TypeArguments.IsUnbound) {
+                               Report.Error (1031, loc, "Type expected");
+                               return false;
+                       }
+
+                       return true;
+               }
        }
 
        /// <summary>
@@ -225,7 +300,7 @@ namespace Mono.CSharp {
                public string Name {
                        get {
                                if (cached_name == null)
-                                       cached_name = MemberName.GetName (false);
+                                       cached_name = MemberName.GetName (!(this is GenericMethod) && !(this is Method));
                                return cached_name;
                        }
                }
@@ -435,7 +510,10 @@ namespace Mono.CSharp {
                                        TypeManager.cls_compliant_attribute_type);
                                if (cls_attribute != null) {
                                        caching_flags |= Flags.HasClsCompliantAttribute;
-                                       return cls_attribute.GetClsCompliantAttributeValue ();
+                                       bool value = cls_attribute.GetClsCompliantAttributeValue ();
+                                       if (value)
+                                               caching_flags |= Flags.ClsCompliantAttributeTrue;
+                                       return value;
                                }
                        }
 
@@ -535,6 +613,10 @@ namespace Mono.CSharp {
                        get { return Parent; }
                }
 
+               public virtual DeclSpace GenericDeclContainer {
+                       get { return DeclContainer; }
+               }
+
                public bool IsInObsoleteScope {
                        get {
                                if (GetObsoleteAttribute () != null)
@@ -565,13 +647,19 @@ namespace Mono.CSharp {
        ///   spaces.
        /// </remarks>
        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.
@@ -580,17 +668,28 @@ namespace Mono.CSharp {
 
                private Hashtable Cache = new Hashtable ();
                
-               public string Basename;
+               public readonly string Basename;
                
                protected Hashtable defined_names;
 
                public TypeContainer PartialContainer;          
 
+               readonly bool is_generic;
+               readonly int count_type_params;
+               readonly int count_current_type_params;
+
                //
                // Whether we are Generic
                //
                public bool IsGeneric {
-                       get { return false; }
+                       get {
+                               if (is_generic)
+                                       return true;
+                               else if (Parent != null)
+                                       return Parent.IsGeneric;
+                               else
+                                       return false;
+                       }
                }
 
                static string[] attribute_targets = new string [] { "type" };
@@ -600,9 +699,19 @@ namespace Mono.CSharp {
                        : 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 = count_current_type_params = name.TypeArguments.Count;
+                       }
+                       if (parent != null)
+                               count_type_params += parent.count_type_params;
+               }
+
+               public override DeclSpace GenericDeclContainer {
+                       get { return this; }
                }
 
                /// <summary>
@@ -630,6 +739,9 @@ namespace Mono.CSharp {
                                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}'",
@@ -710,15 +822,34 @@ namespace Mono.CSharp {
 
                public override string GetSignatureForError ()
                {       
+                       if (IsGeneric) {
+                               return SimpleName.RemoveGenericArity (Name) + TypeParameter.GetSignatureForError (CurrentTypeParameters);
+                       }
                        // 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;
                        
+                       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;
 
                        //
@@ -729,41 +860,48 @@ 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;
-
                        switch (check_attr){
                        case TypeAttributes.Public:
                                return true;
 
                        case TypeAttributes.NotPublic:
+
+                               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;
                                //
                                // This test should probably use the declaringtype.
                                //
-                               return check_type.Assembly == TypeBuilder.Assembly;
+                               return check_type.Assembly == TypeBuilder.Assembly ||
+                                       TypeManager.IsFriendAssembly (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 ((check_type.Assembly == tb.Assembly) || 
+                                               TypeManager.IsFriendAssembly (check_type.Assembly)) && 
+                                       FamilyAccessible (tb, check_type);
 
                        case TypeAttributes.NestedFamORAssem:
-                               return (check_type.Assembly == TypeBuilder.Assembly) ||
-                                       FamilyAccessible (check_type);
+                               return (check_type.Assembly == tb.Assembly) ||
+                                       FamilyAccessible (tb, check_type) ||
+                                       TypeManager.IsFriendAssembly (check_type.Assembly);
 
                        case TypeAttributes.NestedAssembly:
-                               return check_type.Assembly == TypeBuilder.Assembly;
+                               return check_type.Assembly == tb.Assembly ||
+                                       TypeManager.IsFriendAssembly (check_type.Assembly);
                        }
 
                        Console.WriteLine ("HERE: " + check_attr);
@@ -771,14 +909,14 @@ namespace Mono.CSharp {
 
                }
 
-               protected bool NestedAccessible (Type check_type)
+               protected bool NestedAccessible (Type tb, Type check_type)
                {
                        Type declaring = check_type.DeclaringType;
                        return TypeBuilder == declaring ||
                                TypeManager.IsNestedChildOf (TypeBuilder, declaring);
                }
 
-               protected bool FamilyAccessible (Type check_type)
+               protected bool FamilyAccessible (Type tb, Type check_type)
                {
                        Type declaring = check_type.DeclaringType;
                        return TypeManager.IsNestedFamilyAccessible (TypeBuilder, declaring);
@@ -806,10 +944,8 @@ namespace Mono.CSharp {
                                
                        } else if ((flags & Modifiers.PROTECTED) != 0)
                                return AccessLevel.Protected;
-                       
                        else if ((flags & Modifiers.PRIVATE) != 0)
                                return AccessLevel.Private;
-                       
                        else
                                return AccessLevel.Public;
                }
@@ -860,6 +996,9 @@ namespace Mono.CSharp {
                //
                public bool AsAccessible (Type p, int flags)
                {
+                       if (TypeManager.IsGenericParameter (p))
+                               return true; // FIXME
+
                        //
                        // 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
@@ -896,6 +1035,7 @@ namespace Mono.CSharp {
                        for (Type current_type = TypeBuilder;
                             current_type != null && current_type != TypeManager.object_type;
                             current_type = current_type.BaseType) {
+                               current_type = TypeManager.DropGenericTypeArguments (current_type);
                                if (current_type is TypeBuilder) {
                                        TypeContainer tc = current_type == TypeBuilder
                                                ? PartialContainer
@@ -963,6 +1103,188 @@ namespace Mono.CSharp {
                        TypeBuilder.SetCustomAttribute (cb);
                }
 
+               //
+               // Extensions for generics
+               //
+               TypeParameter[] type_params;
+               TypeParameter[] type_param_list;
+
+               protected string GetInstantiationName ()
+               {
+                       StringBuilder sb = new StringBuilder (Name);
+                       sb.Append ("<");
+                       for (int i = 0; i < type_param_list.Length; i++) {
+                               if (i > 0)
+                                       sb.Append (",");
+                               sb.Append (type_param_list [i].Name);
+                       }
+                       sb.Append (">");
+                       return sb.ToString ();
+               }
+
+               bool check_type_parameter (ArrayList list, int start, string name)
+               {
+                       for (int i = 0; i < start; i++) {
+                               TypeParameter param = (TypeParameter) list [i];
+
+                               if (param.Name != name)
+                                       continue;
+
+                               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;
+                       TypeParameter[] parent_params = null;
+                       if ((the_parent != null) && the_parent.IsGeneric) {
+                               parent_params = the_parent.initialize_type_params ();
+                               start = parent_params != null ? parent_params.Length : 0;
+                       }
+
+                       ArrayList list = new ArrayList ();
+                       if (parent_params != null)
+                               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;
+                                               }
+                                       }
+                               }
+
+                               type_params [i] = new TypeParameter (
+                                       Parent, this, name.Name, constraints, name.OptAttributes,
+                                       Location);
+
+                               AddToContainer (type_params [i], name.Name);
+                       }
+
+                       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);
+                               }
+                       }
+               }
+
+               public TypeParameter[] TypeParameters {
+                       get {
+                               if (!IsGeneric)
+                                       throw new InvalidOperationException ();
+                               if (type_param_list == null)
+                                       initialize_type_params ();
+
+                               return type_param_list;
+                       }
+               }
+
+               public TypeParameter[] CurrentTypeParameters {
+                       get {
+                               if (!IsGeneric)
+                                       throw new InvalidOperationException ();
+                               if (type_params != null)
+                                       return type_params;
+                               else
+                                       return new TypeParameter [0];
+                       }
+               }
+
+               public int CountTypeParameters {
+                       get {
+                               return count_type_params;
+                       }
+               }
+
+               public int CountCurrentTypeParameters {
+                       get {
+                               return count_current_type_params;
+                       }
+               }
+
+               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;
+               }
+
                public override string[] ValidAttributeTargets {
                        get { return attribute_targets; }
                }
@@ -973,6 +1295,15 @@ namespace Mono.CSharp {
                                return false;
                        }
 
+                       if (type_params != null) {
+                               foreach (TypeParameter tp in type_params) {
+                                       if (tp.Constraints == null)
+                                               continue;
+
+                                       tp.Constraints.VerifyClsCompliance ();
+                               }
+                       }
+
                        IDictionary cache = TypeManager.AllClsTopLevelTypes;
                        string lcase = Name.ToLower (System.Globalization.CultureInfo.InvariantCulture);
                        if (!cache.Contains (lcase)) {
@@ -990,7 +1321,11 @@ namespace Mono.CSharp {
                        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;
                }
        }
@@ -1243,6 +1578,8 @@ namespace Mono.CSharp {
                        // method cache with all declared and inherited methods.
                        Type type = container.Type;
                        if (!(type is TypeBuilder) && !type.IsInterface &&
+                           // !(type.IsGenericType && (type.GetGenericTypeDefinition () is TypeBuilder)) &&
+                           !TypeManager.IsGenericType (type) &&
                            (Container.BaseCache == null || Container.BaseCache.method_hash != null)) {
                                method_hash = new Hashtable ();
                                AddMethods (type);
@@ -1351,6 +1688,10 @@ namespace Mono.CSharp {
                        foreach (MemberInfo member in members) {
                                string name = member.Name;
 
+                               int pos = name.IndexOf ('<');
+                               if (pos > 0)
+                                       name = name.Substring (0, pos);
+
                                // We use a name-based hash table of ArrayList's.
                                ArrayList list = (ArrayList) member_hash [name];
                                if (list == null) {
@@ -1740,7 +2081,7 @@ namespace Mono.CSharp {
                // 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 invocationType, string name, Type [] paramTypes, GenericMethod genericMethod, bool is_property)
                {
                        ArrayList applicable;
                        if (method_hash != null && !is_property)
@@ -1784,24 +2125,25 @@ namespace Mono.CSharp {
                                        // 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 (!invocationType.Equals (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;
                                        }
                                        return entry.Member;
                                }
@@ -1812,10 +2154,24 @@ namespace Mono.CSharp {
                                if (cmpAttrs.Length != paramTypes.Length)
                                        continue;
        
-                               for (int j = cmpAttrs.Length - 1; j >= 0; j --)
-                                       if (paramTypes [j] != cmpAttrs [j])
-                                               goto next;
-                               
+                               int j;
+                               for (j = 0; j < cmpAttrs.Length; ++j)
+                                       if (!TypeManager.IsEqual (paramTypes [j], cmpAttrs [j]))
+                                               break;
+                               if (j < cmpAttrs.Length)
+                                       continue;
+
+                               //
+                               // check generic arguments for methods
+                               //
+                               if (mi != null) {
+                                       Type [] cmpGenArgs = TypeManager.GetGenericArguments (mi);
+                                       if (genericMethod == null && cmpGenArgs.Length != 0)
+                                               continue;
+                                       if (genericMethod != null && cmpGenArgs.Length != genericMethod.TypeParameters.Length)
+                                               continue;
+                               }
+
                                //
                                // get one of the methods because this has the visibility info.
                                //
@@ -1829,34 +2185,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 (!invocationType.Equals (entry.Container.Type) &&
+                                           !TypeManager.IsNestedChildOf (invocationType, 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 (mi.DeclaringType.Assembly != CodeGen.Assembly.Builder)
+                                               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;