A type parameter can never be optional.
[mono.git] / mcs / gmcs / decl.cs
index aac6b74abc2c53a0adbc7e82c154196f953f57ad..800a622ad3e08bd69ffd748644d2270ce278f077 100755 (executable)
@@ -2,6 +2,7 @@
 // decl.cs: Declaration base class for structs, classes, enums and interfaces.
 //
 // Author: Miguel de Icaza (miguel@gnu.org)
+//         Marek Safar (marek.safar@seznam.cz)
 //
 // Licensed under the terms of the GNU GPL
 //
 //
 
 using System;
+using System.Text;
 using System.Collections;
+using System.Globalization;
 using System.Reflection.Emit;
 using System.Reflection;
 
 namespace Mono.CSharp {
 
+       public class TypeName {
+               public readonly string Name;
+               public readonly TypeArguments TypeArguments;
+
+               public readonly TypeName Left;
+
+               public static readonly TypeName Null = new TypeName ("");
+
+               public TypeName (string name)
+               {
+                       this.Name = name;
+               }
+
+               public TypeName (string name, TypeArguments args)
+                       : this (name)
+               {
+                       this.TypeArguments = args;
+               }
+
+               public TypeName (TypeName left, string name, TypeArguments args)
+                       : this (name, args)
+               {
+                       this.Left = left;
+               }
+
+               public string GetName ()
+               {
+                       if (Left != null)
+                               return Left.GetName () + "." + Name;
+                       else
+                               return Name;
+               }
+
+               public int CountTypeArguments {
+                       get {
+                               if (TypeArguments == null)
+                                       return 0;
+                               else
+                                       return TypeArguments.Count;
+                       }
+               }
+
+               public string GetFullName ()
+               {
+                       string full_name;
+                       if (TypeArguments != null)
+                               full_name = Name + "<" + TypeArguments + ">";
+                       else
+                               full_name = Name;
+                       if (Left != null)
+                               return Left.GetFullName () + "." + full_name;
+                       else
+                               return full_name;
+               }
+
+               public string GetTypeName (bool full)
+               {
+                       string suffix = "";
+                       if (full && (TypeArguments != null))
+                               suffix = "!" + TypeArguments.Count;
+                       if (Left != null)
+                               return Left.GetTypeName (full) + "." + Name + suffix;
+                       else
+                               return Name + suffix;
+               }
+
+               public Expression GetTypeExpression (Location loc)
+               {
+                       if (Left != null) {
+                               Expression lexpr = Left.GetTypeExpression (loc);
+
+                               return new MemberAccess (lexpr, Name, TypeArguments, loc);
+                       } else {
+                               if (TypeArguments != null)
+                                       return new ConstructedType (Name, TypeArguments, loc);
+                               else
+                                       return new SimpleName (Name, loc);
+                       }
+               }
+
+               public MemberName GetMemberName ()
+               {
+                       if (TypeArguments != null) {
+                               string[] type_params = TypeArguments.GetDeclarations ();
+                               return new MemberName (Left, Name, type_params);
+                       } else
+                               return new MemberName (Left, Name);
+               }
+
+               public override string ToString ()
+               {
+                       string full_name;
+                       if (TypeArguments != null)
+                               full_name = Name + "<" + TypeArguments + ">";
+                       else
+                               full_name = Name;
+
+                       if (Left != null)
+                               return Left + "." + full_name;
+                       else
+                               return full_name;
+               }
+       }
+
+       public class MemberName {
+               public readonly TypeName TypeName;
+               public readonly string Name;
+               public readonly string[] TypeParameters;
+
+               public MemberName (string name)
+               {
+                       this.Name = name;
+               }
+
+               public MemberName (TypeName type, string name)
+               {
+                       this.TypeName = type;
+                       this.Name = name;
+               }
+
+               public MemberName (TypeName type, MemberName name)
+               {
+                       this.TypeName = type;
+                       this.Name = name.Name;
+                       this.TypeParameters = name.TypeParameters;
+               }
+
+               public MemberName (TypeName type, string name, ArrayList type_params)
+                       : this (type, name)
+               {
+                       if (type_params != null) {
+                               TypeParameters = new string [type_params.Count];
+                               type_params.CopyTo (TypeParameters, 0);
+                       }
+               }
+
+               public MemberName (TypeName type, string name, string[] type_params)
+                       : this (type, name)
+               {
+                       this.TypeParameters = type_params;
+               }
+
+               public TypeName MakeTypeName (Location loc)
+               {
+                       if (TypeParameters != null) {
+                               TypeArguments args = new TypeArguments (loc);
+                               foreach (string param in TypeParameters)
+                                       args.Add (new SimpleName (param, loc));
+                               return new TypeName (TypeName, Name, args);
+                       }
+
+                       return new TypeName (TypeName, Name, null);
+               }
+
+               public static readonly MemberName Null = new MemberName ("");
+
+               public string Basename {
+                       get {
+                               if (TypeParameters != null)
+                                       return Name + "!" + TypeParameters.Length;
+                               else
+                                       return Name;
+                       }
+               }
+
+               public string GetName (bool is_generic)
+               {
+                       string name = is_generic ? Basename : Name;
+                       if (TypeName != null)
+                               return TypeName.GetTypeName (is_generic) + "." + name;
+                       else
+                               return name;
+               }
+
+               public int CountTypeParameters {
+                       get {
+                               if (TypeParameters != null)
+                                       return 0;
+                               else
+                                       return TypeParameters.Length;
+                       }
+               }
+
+               protected string PrintTypeParams ()
+               {
+                       if (TypeParameters != null) {
+                               StringBuilder sb = new StringBuilder ();
+                               sb.Append ("<");
+                               for (int i = 0; i < TypeParameters.Length; i++) {
+                                       if (i > 0)
+                                               sb.Append (",");
+                                       sb.Append (TypeParameters [i]);
+                               }
+                               sb.Append (">");
+                               return sb.ToString ();
+                       }
+
+                       return "";
+               }
+
+               public string FullName {
+                       get {
+                               string full_name = Name + PrintTypeParams ();
+
+                               if (TypeName != null)
+                                       return TypeName + "." + full_name;
+                               else
+                                       return full_name;
+                       }
+               }
+
+               public override string ToString ()
+               {
+                       return String.Format ("MemberName [{0}:{1}:{2}]",
+                                             TypeName, Name, PrintTypeParams ());
+               }
+       }
+
        /// <summary>
-       ///   Base representation for members.  This is only used to keep track
-       ///   of Name, Location and Modifier flags.
+       ///   Base representation for members.  This is used to keep track
+       ///   of Name, Location and Modifier flags, and handling Attributes.
        /// </summary>
-       public abstract class MemberCore {
+       public abstract class MemberCore : Attributable {
                /// <summary>
                ///   Public name
                /// </summary>
                public string Name;
 
+               public readonly MemberName MemberName;
+
                /// <summary>
                ///   Modifier flags that the user specified in the source code
                /// </summary>
@@ -37,14 +260,73 @@ namespace Mono.CSharp {
                /// </summary>
                public readonly Location Location;
 
-               public MemberCore (string name, Location loc)
+               [Flags]
+               public enum Flags {
+                       Obsolete_Undetected = 1,                // Obsolete attribute has not been detected yet
+                       Obsolete = 1 << 1,                      // Type has obsolete attribute
+                       ClsCompliance_Undetected = 1 << 2,      // CLS Compliance has not been detected yet
+                       ClsCompliant = 1 << 3,                  // Type is CLS Compliant
+                       CloseTypeCreated = 1 << 4,              // Tracks whether we have Closed the type
+                       HasCompliantAttribute_Undetected = 1 << 5,      // Presence of CLSCompliantAttribute has not been detected
+                       HasClsCompliantAttribute = 1 << 6,                      // Type has CLSCompliantAttribute
+                       ClsCompliantAttributeTrue = 1 << 7,                     // Type has CLSCompliant (true)
+                       Excluded_Undetected = 1 << 8,           // Conditional attribute has not been detected yet
+                       Excluded = 1 << 9                                       // Method is conditional
+
+               }
+  
+               /// <summary>
+               ///   MemberCore flags at first detected then cached
+               /// </summary>
+               protected Flags caching_flags;
+
+               public MemberCore (MemberName name, Attributes attrs, Location loc)
+                       : base (attrs)
                {
-                       Name = name;
+                       Name = name.GetName (!(this is GenericMethod) && !(this is Method));
+                       MemberName = name;
                        Location = loc;
+                       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)
+               {
+                       if (type == null)
+                               return;
+
+                       ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (type);
+                       if (obsolete_attr == null)
+                               return;
+
+                       AttributeTester.Report_ObsoleteMessage (obsolete_attr, type.FullName, Location);
                }
 
                public abstract bool Define (TypeContainer parent);
 
+               // 
+               // Returns full member name for error message
+               //
+               public virtual string GetSignatureForError ()
+               {
+                       return Name;
+               }
+
+               /// <summary>
+               /// Base Emit method. This is also entry point for CLS-Compliant verification.
+               /// </summary>
+               public virtual void Emit (TypeContainer container)
+               {
+                       VerifyObsoleteAttribute ();
+
+                       if (!RootContext.VerifyClsCompliance)
+                               return;
+
+                       VerifyClsCompliance (container);
+               }
+
                // 
                // Whehter is it ok to use an unsafe pointer in this type container
                //
@@ -62,6 +344,201 @@ namespace Mono.CSharp {
                        Expression.UnsafeError (Location);
                        return false;
                }
+
+               /// <summary>
+               /// Returns instance of ObsoleteAttribute for this MemberCore
+               /// </summary>
+               public ObsoleteAttribute GetObsoleteAttribute (DeclSpace ds)
+               {
+                       // ((flags & (Flags.Obsolete_Undetected | Flags.Obsolete)) == 0) is slower, but why ?
+                       if ((caching_flags & Flags.Obsolete_Undetected) == 0 && (caching_flags & Flags.Obsolete) == 0) {
+                               return null;
+                       }
+
+                       caching_flags &= ~Flags.Obsolete_Undetected;
+
+                       if (OptAttributes == null)
+                               return null;
+
+                       // TODO: remove this allocation
+                       EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
+                               null, null, ds.ModFlags, false);
+
+                       Attribute obsolete_attr = OptAttributes.Search (TypeManager.obsolete_attribute_type, ec);
+                       if (obsolete_attr == null)
+                               return null;
+
+                       ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds);
+                       if (obsolete == null)
+                               return null;
+
+                       caching_flags |= Flags.Obsolete;
+                       return obsolete;
+               }
+
+               /// <summary>
+               /// Analyze whether CLS-Compliant verification must be execute for this MemberCore.
+               /// </summary>
+               public override bool IsClsCompliaceRequired (DeclSpace container)
+               {
+                       if ((caching_flags & Flags.ClsCompliance_Undetected) == 0)
+                               return (caching_flags & Flags.ClsCompliant) != 0;
+
+                       if (GetClsCompliantAttributeValue (container) && IsExposedFromAssembly (container)) {
+                               caching_flags &= ~Flags.ClsCompliance_Undetected;
+                               caching_flags |= Flags.ClsCompliant;
+                               return true;
+                       }
+
+                       caching_flags &= ~Flags.ClsCompliance_Undetected;
+                       return false;
+               }
+
+               /// <summary>
+               /// Returns true when MemberCore is exposed from assembly.
+               /// </summary>
+               protected bool IsExposedFromAssembly (DeclSpace ds)
+               {
+                       if ((ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
+                               return false;
+                       
+                       DeclSpace parentContainer = ds;
+                       while (parentContainer != null && parentContainer.ModFlags != 0) {
+                               if ((parentContainer.ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
+                                       return false;
+                               parentContainer = parentContainer.Parent;
+                       }
+                       return true;
+               }
+
+               /// <summary>
+               /// Resolve CLSCompliantAttribute value or gets cached value.
+               /// </summary>
+               bool GetClsCompliantAttributeValue (DeclSpace ds)
+               {
+                       if (OptAttributes != null) {
+                               EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
+                                                                 null, null, ds.ModFlags, false);
+                               Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
+                               if (cls_attribute != null) {
+                                       caching_flags |= Flags.HasClsCompliantAttribute;
+                                       return cls_attribute.GetClsCompliantAttributeValue (ds);
+                               }
+                       }
+                       return ds.GetClsCompliantAttributeValue ();
+               }
+
+               /// <summary>
+               /// Returns true if MemberCore is explicitly marked with CLSCompliantAttribute
+               /// </summary>
+               protected bool HasClsCompliantAttribute {
+                       get {
+                               return (caching_flags & Flags.HasClsCompliantAttribute) != 0;
+                       }
+               }
+
+               /// <summary>
+               /// This method is used to testing error 3005 (Method or parameter name collision).
+               /// </summary>
+               protected abstract bool IsIdentifierClsCompliant (DeclSpace ds);
+
+               /// <summary>
+               /// Common helper method for identifier and parameters CLS-Compliant testing.
+               /// When return false error 3005 is reported. True means no violation.
+               /// And error 3006 tests are peformed here because of speed.
+               /// </summary>
+               protected bool IsIdentifierAndParamClsCompliant (DeclSpace ds, string name, MemberInfo methodBuilder, Type[] paramTypes)
+               {
+                       MemberList ml = ds.FindMembers (MemberTypes.Event | MemberTypes.Field | MemberTypes.Method | MemberTypes.Property, 
+                               BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, System.Type.FilterNameIgnoreCase, name);
+               
+                       if (ml.Count < 2)
+                               return true;
+
+                       bool error3006 = false;
+                       for (int i = 0; i < ml.Count; ++i) {
+                               MemberInfo mi = ml [i];
+                               if (name == mi.Name) {
+                                       MethodBase method = mi as MethodBase;
+                                       if (method == null || method == methodBuilder || paramTypes == null || paramTypes.Length == 0)
+                                               continue;
+
+                                       if (AttributeTester.AreOverloadedMethodParamsClsCompliant (paramTypes, TypeManager.GetArgumentTypes (method))) {
+                                               error3006 = false;
+                                               continue;
+                                       }
+
+                                       error3006 = true;
+                               }
+
+                               // We need to test if member is not marked as CLSCompliant (false) and if type is not only internal
+                               // because BindingFlags.Public returns internal types too
+                               DeclSpace temp_ds = TypeManager.LookupDeclSpace (mi.DeclaringType);
+
+                               // Type is external, we can get attribute directly
+                               if (temp_ds == null) {
+                                       object[] cls_attribute = mi.GetCustomAttributes (TypeManager.cls_compliant_attribute_type, false);
+                                       if (cls_attribute.Length == 1 && (!((CLSCompliantAttribute)cls_attribute[0]).IsCompliant))
+                                               continue;
+                               } else {
+                                       string tmp_name = String.Concat (temp_ds.Name, '.', mi.Name);
+
+                                       MemberCore mc = temp_ds.GetDefinition (tmp_name) as MemberCore;
+                                       if (!mc.IsClsCompliaceRequired (ds))
+                                               continue;
+                               }
+
+                               for (int ii = 0; ii < ml.Count; ++ii) {
+                                       mi = ml [ii];
+                                       if (name == mi.Name)
+                                               continue;
+                                       Report.SymbolRelatedToPreviousError (mi);
+                               }
+
+                               if (error3006)
+                                       Report.Error_T (3006, Location, GetSignatureForError ());
+
+                               return error3006;
+
+                       }
+                       return true;
+               }
+
+               /// <summary>
+               /// The main virtual method for CLS-Compliant verifications.
+               /// The method returns true if member is CLS-Compliant and false if member is not
+               /// 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)
+               {
+                       if (!IsClsCompliaceRequired (ds)) {
+                               if (HasClsCompliantAttribute && !IsExposedFromAssembly (ds)) {
+                                       Report.Warning_T (3019, Location, GetSignatureForError ());
+                               }
+                               return false;
+                       }
+
+                       if (!CodeGen.Assembly.IsClsCompliant) {
+                               if (HasClsCompliantAttribute) {
+                                       Report.Error_T (3014, Location, GetSignatureForError ());
+                               }
+                       }
+
+                       int index = Name.LastIndexOf ('.');
+                       if (Name [index > 0 ? index + 1 : 0] == '_') {
+                               Report.Error_T (3008, Location, GetSignatureForError () );
+                       }
+
+                       if (!IsIdentifierClsCompliant (ds)) {
+                               Report.Error_T (3005, Location, GetSignatureForError ());
+                       }
+
+                       return true;
+               }
+
+               protected abstract void VerifyObsoleteAttribute ();
+
        }
 
        /// <summary>
@@ -72,18 +549,20 @@ namespace Mono.CSharp {
        ///   provides the common foundation for managing those name
        ///   spaces.
        /// </remarks>
-       public abstract class DeclSpace : MemberCore {
+       public abstract class DeclSpace : MemberCore, IAlias {
                /// <summary>
-               ///   this points to the actual definition that is being
+               ///   This points to the actual definition that is being
                ///   created with System.Reflection.Emit
                /// </summary>
                public TypeBuilder TypeBuilder;
 
                /// <summary>
-               ///   This variable tracks whether we have Closed the type
+               ///   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 bool Created = false;
-               
+               public TypeExpr CurrentType;
+
                //
                // This is the namespace in which this typecontainer
                // was declared.  We use this to resolve names.
@@ -99,26 +578,47 @@ namespace Mono.CSharp {
                /// </summary>
                protected Hashtable defined_names;
 
+               readonly bool is_generic;
+               readonly int count_type_params;
+
                //
                // Whether we are Generic
                //
-               public bool IsGeneric;
+               public bool IsGeneric {
+                       get {
+                               if (is_generic)
+                                       return true;
+                               else if (parent != null)
+                                       return parent.IsGeneric;
+                               else
+                                       return false;
+                       }
+               }
 
                TypeContainer parent;
 
-               public DeclSpace (NamespaceEntry ns, TypeContainer parent, string name, Location l)
-                       : base (name, l)
+               static string[] attribute_targets = new string [] { "type" };
+
+               public DeclSpace (NamespaceEntry ns, TypeContainer parent, MemberName name,
+                                 Attributes attrs, Location l)
+                       : base (name, attrs, l)
                {
                        NamespaceEntry = ns;
-                       Basename = name.Substring (1 + name.LastIndexOf ('.'));
+                       Basename = name.Name;
                        defined_names = new Hashtable ();
+                       if (name.TypeParameters != null) {
+                               is_generic = true;
+                               count_type_params = name.TypeParameters.Length;
+                       }
+                       if (parent != null)
+                               count_type_params += parent.count_type_params;
                        this.parent = parent;
                }
 
                public void RecordDecl ()
                {
                        if ((NamespaceEntry != null) && (parent == RootContext.Tree.Types))
-                               NamespaceEntry.DefineName (Basename, this);
+                               NamespaceEntry.DefineName (MemberName.Basename, this);
                }
 
                /// <summary>
@@ -189,12 +689,12 @@ namespace Mono.CSharp {
                ///   associates it with the object @o.  Note that for
                ///   methods this will just point to the first method. o
                /// </summary>
-               protected void DefineName (string name, object o)
+               public void DefineName (string name, object o)
                {
                        defined_names.Add (name, o);
 
 #if DEBUGME
-                       int p = name.LastIndexOf (".");
+                       int p = name.LastIndexOf ('.');
                        int l = name.Length;
                        length += l;
                        small += l -p;
@@ -235,7 +735,7 @@ namespace Mono.CSharp {
                /// <summary>
                ///   Looks up the alias for the name
                /// </summary>
-               public string LookupAlias (string name)
+               public IAlias LookupAlias (string name)
                {
                        if (NamespaceEntry != null)
                                return NamespaceEntry.LookupAlias (name);
@@ -260,7 +760,7 @@ namespace Mono.CSharp {
 
                public virtual void CloseType ()
                {
-                       if (!Created){
+                       if ((caching_flags & Flags.CloseTypeCreated) == 0){
                                try {
                                        TypeBuilder.CreateType ();
                                } catch {
@@ -275,7 +775,7 @@ namespace Mono.CSharp {
                                        // Note that this still creates the type and
                                        // it is possible to save it
                                }
-                               Created = true;
+                               caching_flags |= Flags.CloseTypeCreated;
                        }
                }
 
@@ -324,60 +824,113 @@ namespace Mono.CSharp {
                // </summary>
                public Type ResolveType (Expression e, bool silent, Location loc)
                {
-                       if (type_resolve_ec == null)
-                               type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
-                       type_resolve_ec.loc = loc;
-                       type_resolve_ec.ContainerType = TypeBuilder;
+                       TypeExpr d = ResolveTypeExpr (e, silent, loc);
+                       if (d == null)
+                               return null;
 
-                       int errors = Report.Errors;
-                       Expression d = e.ResolveAsTypeTerminal (type_resolve_ec);
+                       return ResolveType (d, loc);
+               }
 
-                       if (d == null || d.eclass != ExprClass.Type){
-                               if (!silent && errors == Report.Errors){
-                                       Console.WriteLine ("Type is: " + e.GetType().ToString ());
-                                       Report.Error (246, loc, "Cannot find type `"+ e.ToString () +"'");
-                               }
+               public Type ResolveType (TypeExpr d, Location loc)
+               {
+                       if (!d.CheckAccessLevel (this)) {
+                               Report.Error_T (122, loc, d.Name);
                                return null;
                        }
 
-                       if (!CheckAccessLevel (d.Type)) {
-                               Report. Error (122, loc,  "`" + d.Type + "' " +
-                                      "is inaccessible because of its protection level");
+                       Type t = d.ResolveType (type_resolve_ec);
+                       if (t == null)
                                return null;
+
+                       TypeContainer tc = TypeManager.LookupTypeContainer (t);
+                       if ((tc != null) && tc.IsGeneric) {
+                               if (!IsGeneric) {
+                                       int tnum = TypeManager.GetNumberOfTypeArguments (t);
+                                       Report.Error (305, loc,
+                                                     "Using the generic type `{0}' " +
+                                                     "requires {1} type arguments",
+                                                     TypeManager.GetFullName (t), tnum);
+                                       return null;
+                               }
+
+                               ConstructedType ctype = new ConstructedType (
+                                       t, TypeParameters, loc);
+
+                               t = ctype.ResolveType (type_resolve_ec);
                        }
 
-                       return d.Type;
+                       return t;
                }
 
                // <summary>
                //    Resolves the expression `e' for a type, and will recursively define
                //    types. 
                // </summary>
-               public Expression ResolveTypeExpr (Expression e, bool silent, Location loc)
+               public TypeExpr ResolveTypeExpr (Expression e, bool silent, Location loc)
                {
                        if (type_resolve_ec == null)
                                type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
                        type_resolve_ec.loc = loc;
-                       type_resolve_ec.ContainerType = TypeBuilder;
+                       if (this is GenericMethod)
+                               type_resolve_ec.ContainerType = Parent.TypeBuilder;
+                       else
+                               type_resolve_ec.ContainerType = TypeBuilder;
+
+                       int errors = Report.Errors;
+
+                       TypeExpr d = e.ResolveAsTypeTerminal (type_resolve_ec);
+
+                       if ((d != null) && (d.eclass == ExprClass.Type))
+                               return d;
+
+                       if (silent || (Report.Errors != errors))
+                               return null;
+
+                       if (e is SimpleName){
+                               SimpleName s = new SimpleName (((SimpleName) e).Name, loc);
+                               d = s.ResolveAsTypeTerminal (type_resolve_ec);
+
+                               if ((d == null) || (d.Type == null)) {
+                                       Report.Error (246, loc, "Cannot find type `{0}'", e);
+                                       return null;
+                               }
+
+                               int num_args = TypeManager.GetNumberOfTypeArguments (d.Type);
 
-                       Expression d = e.ResolveAsTypeTerminal (type_resolve_ec);
-                        
-                       if (d == null || d.eclass != ExprClass.Type){
-                               if (!silent){
-                                       Report.Error (246, loc, "Cannot find type `"+ e +"'");
+                               if (num_args == 0) {
+                                       Report.Error (308, loc,
+                                                     "The non-generic type `{0}' cannot " +
+                                                     "be used with type arguments.",
+                                                     TypeManager.CSharpName (d.Type));
+                                       return null;
                                }
+
+                               Report.Error (305, loc,
+                                             "Using the generic type `{0}' " +
+                                             "requires {1} type arguments",
+                                             TypeManager.GetFullName (d.Type), num_args);
                                return null;
                        }
 
-                       return d;
+                       Report.Error (246, loc, "Cannot find type `{0}'", e);
+                       return null;
                }
                
                public bool CheckAccessLevel (Type check_type) 
                {
-                       if (check_type == TypeBuilder)
+                       TypeBuilder tb;
+                       if (this is GenericMethod)
+                               tb = Parent.TypeBuilder;
+                       else
+                               tb = TypeBuilder;
+
+                       if (check_type.IsGenericInstance)
+                               check_type = check_type.GetGenericTypeDefinition ();
+
+                       if (check_type == tb)
                                return true;
 
-                       if (check_type.IsUnboundGenericParameter)
+                       if (check_type.IsGenericParameter)
                                return true; // FIXME
                        
                        TypeAttributes check_attr = check_type.Attributes & TypeAttributes.VisibilityMask;
@@ -395,22 +948,25 @@ namespace Mono.CSharp {
                                return true;
 
                        case TypeAttributes.NotPublic:
-                               //
-                               // This test should probably use the declaringtype.
-                               //
-                               if (check_type.Assembly == TypeBuilder.Assembly){
-                                       return true;
-                               }
-                               return false;
-                               
+
+                               // In same cases is null.
+                               if (TypeBuilder == null)
+                                       return true;
+
+                               //
+                               // This test should probably use the declaringtype.
+                               //
+                               return check_type.Assembly == TypeBuilder.Assembly;
+
                        case TypeAttributes.NestedPublic:
                                return true;
 
                        case TypeAttributes.NestedPrivate:
                                string check_type_name = check_type.FullName;
-                               string type_name = TypeBuilder.FullName;
-                               
-                               int cio = check_type_name.LastIndexOf ("+");
+                               string type_name = CurrentType != null ?
+                                       CurrentType.Name : tb.FullName;
+
+                               int cio = check_type_name.LastIndexOf ('+');
                                string container = check_type_name.Substring (0, cio);
 
                                //
@@ -430,18 +986,18 @@ namespace Mono.CSharp {
                                //
                                // Only accessible to methods in current type or any subtypes
                                //
-                               return FamilyAccessible (check_type);
+                               return FamilyAccessible (tb, check_type);
 
                        case TypeAttributes.NestedFamANDAssem:
-                               return (check_type.Assembly == TypeBuilder.Assembly) &&
-                                       FamilyAccessible (check_type);
+                               return (check_type.Assembly == tb.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);
 
                        case TypeAttributes.NestedAssembly:
-                               return check_type.Assembly == TypeBuilder.Assembly;
+                               return check_type.Assembly == tb.Assembly;
                        }
 
                        Console.WriteLine ("HERE: " + check_attr);
@@ -449,16 +1005,15 @@ namespace Mono.CSharp {
 
                }
 
-               protected bool FamilyAccessible (Type check_type)
+               protected bool FamilyAccessible (TypeBuilder tb, Type check_type)
                {
                        Type declaring = check_type.DeclaringType;
-                       if (TypeBuilder.IsSubclassOf (declaring))
+                       if (tb.IsSubclassOf (declaring))
                                return true;
 
                        string check_type_name = check_type.FullName;
-                       string type_name = TypeBuilder.FullName;
                        
-                       int cio = check_type_name.LastIndexOf ("+");
+                       int cio = check_type_name.LastIndexOf ('+');
                        string container = check_type_name.Substring (0, cio);
                        
                        //
@@ -471,109 +1026,118 @@ namespace Mono.CSharp {
                }
 
                // Access level of a type.
-               enum AccessLevel {
-                       Public                  = 0,
-                       ProtectedInternal       = 1,
-                       Internal                = 2,
-                       Protected               = 3,
-                       Private                 = 4
+               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),
                }
 
-               // Check whether `flags' denotes a more restricted access than `level'
-               // and return the new level.
-               static AccessLevel CheckAccessLevel (AccessLevel level, int flags)
+               static AccessLevel GetAccessLevelFromModifiers (int flags)
                {
-                       AccessLevel old_level = level;
-
                        if ((flags & Modifiers.INTERNAL) != 0) {
-                               if ((flags & Modifiers.PROTECTED) != 0) {
-                                       if ((int) level < (int) AccessLevel.ProtectedInternal)
-                                               level = AccessLevel.ProtectedInternal;
-                               } else {
-                                       if ((int) level < (int) AccessLevel.Internal)
-                                               level = AccessLevel.Internal;
-                               }
-                       } else if ((flags & Modifiers.PROTECTED) != 0) {
-                               if ((int) level < (int) AccessLevel.Protected)
-                                       level = AccessLevel.Protected;
-                       } else if ((flags & Modifiers.PRIVATE) != 0)
-                               level = AccessLevel.Private;
 
-                       return level;
-               }
+                               if ((flags & Modifiers.PROTECTED) != 0)
+                                       return AccessLevel.ProtectedOrInternal;
+                               else
+                                       return AccessLevel.Internal;
 
-               // Return the access level for a new member which is defined in the current
-               // TypeContainer with access modifiers `flags'.
-               AccessLevel GetAccessLevel (int flags)
-               {
-                       if ((flags & Modifiers.PRIVATE) != 0)
+                       } else if ((flags & Modifiers.PROTECTED) != 0)
+                               return AccessLevel.Protected;
+                       else if ((flags & Modifiers.PRIVATE) != 0)
                                return AccessLevel.Private;
-
-                       AccessLevel level;
-                       if (!IsTopLevel && (Parent != null))
-                               level = Parent.GetAccessLevel (flags);
                        else
-                               level = AccessLevel.Public;
+                               return AccessLevel.Public;
+               }
 
-                       return CheckAccessLevel (CheckAccessLevel (level, flags), ModFlags);
+               // 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;
+                               return myAccess;
+                       }
                }
 
-               // Return the access level for type `t', but don't give more access than `flags'.
-               static AccessLevel GetAccessLevel (Type t, int flags)
+               // Return the access level for type `t'
+               static AccessLevel TypeEffectiveAccessLevel (Type t)
                {
-                       if (((flags & Modifiers.PRIVATE) != 0) || t.IsNestedPrivate)
-                               return AccessLevel.Private;
-
-                       AccessLevel level;
-                       if (TypeManager.IsBuiltinType (t))
+                       if (t.IsPublic)
                                return AccessLevel.Public;
-                       else if ((t.DeclaringType != null) && (t != t.DeclaringType))
-                               level = GetAccessLevel (t.DeclaringType, flags);
-                       else {
-                               level = CheckAccessLevel (AccessLevel.Public, flags);
-                       }
-
-                       if (t.IsNestedPublic)
-                               return level;
+                       if (t.IsNestedPrivate)
+                               return AccessLevel.Private;
+                       if (t.IsNotPublic)
+                               return AccessLevel.Internal;
 
-                       if (t.IsNestedAssembly || t.IsNotPublic) {
-                               if ((int) level < (int) AccessLevel.Internal)
-                                       level = AccessLevel.Internal;
-                       }
+                       // By now, it must be nested
+                       AccessLevel parentLevel = TypeEffectiveAccessLevel (t.DeclaringType);
 
-                       if (t.IsNestedFamily) {
-                               if ((int) level < (int) AccessLevel.Protected)
-                                       level = AccessLevel.Protected;
-                       }
+                       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");
 
-                       if (t.IsNestedFamORAssem) {
-                               if ((int) level < (int) AccessLevel.ProtectedInternal)
-                                       level = AccessLevel.ProtectedInternal;
-                       }
+                       // nested private is taken care of
 
-                       return level;
+                       throw new Exception ("I give up, what are you?");
                }
 
                //
-               // Returns true if `parent' is as accessible as the flags `flags'
-               // given for this member.
+               // 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 parent, int flags)
+               public bool AsAccessible (Type p, int flags)
                {
-                       if (parent.IsUnboundGenericParameter)
+                       if (p.IsGenericParameter)
                                return true; // FIXME
 
-                       while (parent.IsArray || parent.IsPointer || parent.IsByRef)
-                               parent = TypeManager.GetElementType (parent);
+                       //
+                       // 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 level = GetAccessLevel (flags);
-                       AccessLevel level2 = GetAccessLevel (parent, flags);
+                       AccessLevel pAccess = TypeEffectiveAccessLevel (p);
+                       AccessLevel mAccess = this.EffectiveAccessLevel &
+                               GetAccessLevelFromModifiers (flags);
 
-                       return (int) level >= (int) level2;
+                       // 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;
                }
                
-               static DoubleHash dh = new DoubleHash ();
+               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 ();
+               }
+               
                Type LookupInterfaceOrClass (string ns, string name, out bool error)
                {
                        DeclSpace parent;
@@ -583,7 +1147,7 @@ namespace Mono.CSharp {
                        error = false;
 
                        if (dh.Lookup (ns, name, out r))
-                               t = (Type) r;
+                               return (Type) r;
                        else {
                                if (ns != ""){
                                        if (Namespace.IsNamespace (ns)){
@@ -595,8 +1159,10 @@ namespace Mono.CSharp {
                                        t = TypeManager.LookupType (name);
                        }
                        
-                       if (t != null)
+                       if (t != null) {
+                               dh.Insert (ns, name, t);
                                return t;
+                       }
 
                        //
                        // In case we are fed a composite name, normalize it.
@@ -608,23 +1174,55 @@ namespace Mono.CSharp {
                        }
                        
                        parent = RootContext.Tree.LookupByNamespace (ns, name);
-                       if (parent == null)
+                       if (parent == null) {
+                               dh.Insert (ns, name, null);
                                return null;
+                       }
 
-                       t = parent.DefineType ();
-                       dh.Insert (ns, name, t);
+                       t = DefineTypeAndParents (parent);
                        if (t == null){
                                error = true;
                                return null;
                        }
+                       
+                       dh.Insert (ns, name, t);
                        return t;
                }
 
-               public static void Error_AmbiguousTypeReference (Location loc, string name, Type t1, Type t2)
+               public static void Error_AmbiguousTypeReference (Location loc, string name, string t1, string t2)
                {
                        Report.Error (104, loc,
-                                     String.Format ("`{0}' is an ambiguous reference ({1} or {2}) ", name,
-                                                    t1.FullName, t2.FullName));
+                                     "`{0}' is an ambiguous reference ({1} or {2})",
+                                     name, t1, t2);
+               }
+
+               public Type FindNestedType (Location loc, string name,
+                                           out DeclSpace containing_ds)
+               {
+                       Type t;
+                       bool error;
+
+                       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))
+                                               return t;
+
+                                       current_type = current_type.BaseType;
+                               }
+                               containing_ds = containing_ds.Parent;
+                       }
+
+                       return null;
                }
 
                /// <summary>
@@ -654,13 +1252,13 @@ namespace Mono.CSharp {
                                Type container_type = containing_ds.TypeBuilder;
                                Type current_type = container_type;
 
-                               while (current_type != null) {
+                               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))
                                                return t;
 
@@ -676,8 +1274,8 @@ namespace Mono.CSharp {
                                t = LookupInterfaceOrClass (ns.FullName, name, out error);
                                if (error)
                                        return null;
-                               
-                               if (t != null) 
+
+                               if (t != null)
                                        return t;
                        }
                        
@@ -705,6 +1303,19 @@ namespace Mono.CSharp {
                                if (t != null)
                                        return t;
 
+                               if (name.IndexOf ('.') > 0)
+                                       continue;
+
+                               IAlias alias_value = ns.LookupAlias (name);
+                               if (alias_value != null) {
+                                       t = LookupInterfaceOrClass ("", alias_value.Name, out error);
+                                       if (error)
+                                               return null;
+
+                                       if (t != null)
+                                               return t;
+                               }
+
                                //
                                // Now check the using clause list
                                //
@@ -714,10 +1325,10 @@ namespace Mono.CSharp {
                                        if (error)
                                                return null;
 
-                                       if (match != null){
+                                       if (match != null) {
                                                if (t != null){
                                                        if (CheckAccessLevel (match)) {
-                                                               Error_AmbiguousTypeReference (loc, name, t, match);
+                                                               Error_AmbiguousTypeReference (loc, name, t.FullName, match.FullName);
                                                                return null;
                                                        }
                                                        continue;
@@ -750,29 +1361,196 @@ namespace Mono.CSharp {
                        get;
                }
 
+               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);
+                       }
+               }
+
+               /// <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 ()
+               {
+                       if ((caching_flags & Flags.HasCompliantAttribute_Undetected) == 0)
+                               return (caching_flags & Flags.ClsCompliantAttributeTrue) != 0;
+
+                       caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
+
+                       if (OptAttributes != null) {
+                               EmitContext ec = new EmitContext (parent, this, Location,
+                                                                 null, null, ModFlags, false);
+                               Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
+                               if (cls_attribute != null) {
+                                       caching_flags |= Flags.HasClsCompliantAttribute;
+                                       if (cls_attribute.GetClsCompliantAttributeValue (this)) {
+                                               caching_flags |= Flags.ClsCompliantAttributeTrue;
+                                               return true;
+                                       }
+                                       return false;
+                               }
+                       }
+
+                       if (parent == null) {
+                               if (CodeGen.Assembly.IsClsCompliant) {
+                                       caching_flags |= Flags.ClsCompliantAttributeTrue;
+                                       return true;
+                               }
+                               return false;
+                       }
+
+                       if (parent.GetClsCompliantAttributeValue ()) {
+                               caching_flags |= Flags.ClsCompliantAttributeTrue;
+                               return true;
+                       }
+                       return false;
+               }
+
+
+               // Tests container name for CLS-Compliant name (differing only in case)
+               // Possible optimalization: search in same namespace only
+               protected override bool IsIdentifierClsCompliant (DeclSpace ds)
+               {
+                       int l = Name.Length;
+
+                       if (Namespace.LookupNamespace (NamespaceEntry.FullName, false) != null) {
+                               // Seek through all imported types
+                               foreach (string type_name in TypeManager.all_imported_types.Keys) 
+                               {
+                                       if (l != type_name.Length)
+                                               continue;
+
+                                       if (String.Compare (Name, type_name, true, CultureInfo.InvariantCulture) == 0 && 
+                                               AttributeTester.IsClsCompliant (TypeManager.all_imported_types [type_name] as Type)) {
+                                               Report.SymbolRelatedToPreviousError ((Type)TypeManager.all_imported_types [type_name]);
+                                               return false;
+                               }
+                       }
+                       }
+
+                       // Seek through generated types
+                       foreach (string name in RootContext.Tree.Decls.Keys) {
+                               if (l != name.Length)
+                                       continue;
+
+                               if (String.Compare (Name, name, true, CultureInfo.InvariantCulture) == 0) { 
+
+                                       if (Name == name)
+                                               continue;
+                                       
+                                       DeclSpace found_ds = RootContext.Tree.Decls[name] as DeclSpace;
+                                       if (found_ds.IsClsCompliaceRequired (found_ds.Parent)) {
+                                               Report.SymbolRelatedToPreviousError (found_ds.Location, found_ds.GetSignatureForError ());
+                                               return false;
+                               }
+                       }
+                       }
+
+                       return true;
+               }
+
                //
                // Extensions for generics
                //
                TypeParameter[] type_params;
+               TypeParameter[] type_param_list;
 
-               ///
-               /// Called by the parser to configure the type_parameter_list for this
-               /// declaration space
-               ///
-               public AdditionResult SetParameterInfo (ArrayList type_parameter_list, ArrayList constraints_list)
+               protected string GetInstantiationName ()
                {
-                       type_params = new TypeParameter [type_parameter_list.Count];
+                       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;
+
+                               if (RootContext.WarningLevel >= 3)
+                                       Report.Warning (
+                                               693, Location,
+                                               "Type parameter `{0}' has same name " +
+                                               "as type parameter from outer type `{1}'",
+                                               name, parent.GetInstantiationName ());
+
+                               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 AdditionResult SetParameterInfo (ArrayList constraints_list)
+               {
+                       if (!is_generic) {
+                               if (constraints_list != null) {
+                                       Report.Error (
+                                               80, Location, "Contraints are not allowed " +
+                                               "on non-generic declarations");
+                                       return AdditionResult.Error;
+                               }
+
+                               return AdditionResult.Success;
+                       }
+
+                       type_params = new TypeParameter [MemberName.TypeParameters.Length];
 
-                       //
-                       // Mark this type as Generic
-                       //
-                       IsGeneric = true;
-                       
                        //
                        // Register all the names
                        //
-                       for (int i = 0; i < type_parameter_list.Count; i++) {
-                               string name = (string) type_parameter_list [i];
+                       for (int i = 0; i < MemberName.TypeParameters.Length; i++) {
+                               string name = MemberName.TypeParameters [i];
 
                                AdditionResult res = IsValid (name, name);
 
@@ -799,19 +1577,42 @@ namespace Mono.CSharp {
 
                public TypeParameter[] TypeParameters {
                        get {
-                               return type_params;
+                               if (!IsGeneric)
+                                       throw new InvalidOperationException ();
+                               if (type_param_list == null)
+                                       initialize_type_params ();
+
+                               return type_param_list;
+                       }
+               }
+
+               protected 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 TypeParameterExpr LookupGeneric (string name, Location loc)
                {
-                       if (TypeParameters != null) {
-                               foreach (TypeParameter type_param in TypeParameters) {
-                                       if (type_param.Name != name)
-                                               continue;
+                       if (!IsGeneric)
+                               return null;
 
-                                       return new TypeParameterExpr (type_param, loc);
-                               }
+                       foreach (TypeParameter type_param in CurrentTypeParameters) {
+                               if (type_param.Name != name)
+                                       continue;
+
+                               return new TypeParameterExpr (type_param, loc);
                        }
 
                        if (parent != null)
@@ -819,6 +1620,33 @@ namespace Mono.CSharp {
 
                        return null;
                }
+
+               bool IAlias.IsType {
+                       get { return true; }
+               }
+
+               string IAlias.Name {
+                       get { return Name; }
+               }
+
+               TypeExpr IAlias.Type
+               {
+                       get {
+                               if (TypeBuilder == null)
+                                       throw new InvalidOperationException ();
+
+                               if (CurrentType != null)
+                                       return CurrentType;
+
+                               return new TypeExpression (TypeBuilder, Location);
+                       }
+               }
+
+               protected override string[] ValidAttributeTargets {
+                       get {
+                               return attribute_targets;
+                       }
+               }
        }
 
        /// <summary>
@@ -1047,8 +1875,7 @@ namespace Mono.CSharp {
                public readonly IMemberContainer Container;
                protected Hashtable member_hash;
                protected Hashtable method_hash;
-               protected Hashtable interface_hash;
-
+               
                /// <summary>
                ///   Create a new MemberCache for the given IMemberContainer `container'.
                /// </summary>
@@ -1059,12 +1886,13 @@ namespace Mono.CSharp {
                        Timer.IncrementCounter (CounterType.MemberCache);
                        Timer.StartTimer (TimerType.CacheInit);
 
-                       interface_hash = new Hashtable ();
+                       
 
                        // If we have a parent class (we have a parent class unless we're
                        // TypeManager.object_type), we deep-copy its MemberCache here.
                        if (Container.IsInterface) {
                                MemberCache parent;
+                               
                                if (Container.Parent != null)
                                        parent = Container.Parent.MemberCache;
                                else
@@ -1078,7 +1906,7 @@ namespace Mono.CSharp {
                        // 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 (!(type is TypeBuilder) && !type.IsInterface && !type.IsGenericParameter) {
                                method_hash = new Hashtable ();
                                AddMethods (type);
                        }
@@ -1104,26 +1932,24 @@ namespace Mono.CSharp {
                        return hash;
                }
 
-               void AddInterfaces (MemberCache parent)
-               {
-                       foreach (Type iface in parent.interface_hash.Keys) {
-                               if (!interface_hash.Contains (iface))
-                                       interface_hash.Add (iface, true);
-                       }
-               }
 
                /// <summary>
                ///   Add the contents of `new_hash' to `hash'.
                /// </summary>
-               void AddHashtable (Hashtable hash, Hashtable new_hash)
+               void AddHashtable (Hashtable hash, MemberCache cache)
                {
+                       Hashtable new_hash = cache.member_hash;
                        IDictionaryEnumerator it = new_hash.GetEnumerator ();
                        while (it.MoveNext ()) {
                                ArrayList list = (ArrayList) hash [it.Key];
-                               if (list != null)
-                                       list.AddRange ((ArrayList) it.Value);
-                               else
-                                       hash [it.Key] = ((ArrayList) it.Value).Clone ();
+                               if (list == null)
+                                       hash [it.Key] = list = new ArrayList ();
+
+                               foreach (CacheEntry entry in (ArrayList) it.Value) {
+                                       if (entry.Container != cache.Container)
+                                               break;
+                                       list.Add (entry);
+                               }
                        }
                }
 
@@ -1135,20 +1961,17 @@ namespace Mono.CSharp {
                Hashtable SetupCacheForInterface (MemberCache parent)
                {
                        Hashtable hash = SetupCache (parent);
-                       Type [] ifaces = TypeManager.GetInterfaces (Container.Type);
+                       TypeExpr [] ifaces = TypeManager.GetInterfaces (Container.Type);
 
-                       foreach (Type iface in ifaces) {
-                               if (interface_hash.Contains (iface))
-                                       continue;
-                               interface_hash.Add (iface, true);
+                       foreach (TypeExpr iface in ifaces) {
+                               Type itype = iface.Type;
 
                                IMemberContainer iface_container =
-                                       TypeManager.LookupMemberContainer (iface);
+                                       TypeManager.LookupMemberContainer (itype);
 
                                MemberCache iface_cache = iface_container.MemberCache;
 
-                               AddHashtable (hash, iface_cache.member_hash);
-                               AddInterfaces (iface_cache);
+                               AddHashtable (hash, iface_cache);
                        }
 
                        return hash;
@@ -1189,12 +2012,14 @@ namespace Mono.CSharp {
                void AddMembers (MemberTypes mt, BindingFlags bf, IMemberContainer container)
                {
                        MemberList members = container.GetMembers (mt, bf);
-                       BindingFlags new_bf = (container == Container) ?
-                               bf | BindingFlags.DeclaredOnly : bf;
 
                        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) {
@@ -1228,6 +2053,8 @@ namespace Mono.CSharp {
                {
                        MemberInfo [] members = type.GetMethods (bf);
 
+                       Array.Reverse (members);
+
                        foreach (MethodBase member in members) {
                                string name = member.Name;
 
@@ -1396,7 +2223,9 @@ namespace Mono.CSharp {
                ArrayList global = new ArrayList ();
                bool using_global = false;
                
-               public MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
+               static MemberInfo [] emptyMemberInfo = new MemberInfo [0];
+               
+               public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf, string name,
                                               MemberFilter filter, object criteria)
                {
                        if (using_global)
@@ -1418,9 +2247,9 @@ namespace Mono.CSharp {
                                applicable = (ArrayList) method_hash [name];
                        else
                                applicable = (ArrayList) member_hash [name];
-                       
+
                        if (applicable == null)
-                               return MemberList.Empty;
+                               return emptyMemberInfo;
 
                        //
                        // 32  slots gives 53 rss/54 size
@@ -1438,6 +2267,7 @@ namespace Mono.CSharp {
 
                        IMemberContainer current = Container;
 
+
                        // `applicable' is a list of all members with the given member name `name'
                        // in the current class and all its parent classes.  The list is sorted in
                        // reverse order due to the way how the cache is initialy created (to speed
@@ -1489,7 +2319,138 @@ namespace Mono.CSharp {
                        using_global = false;
                        MemberInfo [] copy = new MemberInfo [global.Count];
                        global.CopyTo (copy);
-                       return new MemberList (copy);
+                       return copy;
+               }
+               
+               //
+               // This finds the method or property for us to override. invocationType 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
+               //
+               // 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)
+               {
+                       ArrayList applicable;
+                       if (method_hash != null && !is_property)
+                               applicable = (ArrayList) method_hash [name];
+                       else
+                               applicable = (ArrayList) member_hash [name];
+                       
+                       if (applicable == null)
+                               return null;
+                       //
+                       // Walk the chain of methods, starting from the top.
+                       //
+                       for (int i = applicable.Count - 1; i >= 0; i--) {
+                               CacheEntry entry = (CacheEntry) applicable [i];
+                               
+                               if ((entry.EntryType & (is_property ? (EntryType.Property | EntryType.Field) : EntryType.Method)) == 0)
+                                       continue;
+
+                               PropertyInfo pi = null;
+                               MethodInfo mi = null;
+                               FieldInfo fi = null;
+                               Type [] cmpAttrs = null;
+                               
+                               if (is_property) {
+                                       if ((entry.EntryType & EntryType.Field) != 0) {
+                                               fi = (FieldInfo)entry.Member;
+
+                                               // TODO: For this case we ignore member type
+                                               //fb = TypeManager.GetField (fi);
+                                               //cmpAttrs = new Type[] { fb.MemberType };
+                                       } else {
+                                               pi = (PropertyInfo) entry.Member;
+                                               cmpAttrs = TypeManager.GetArgumentTypes (pi);
+                                       }
+                               } else {
+                                       mi = (MethodInfo) entry.Member;
+                                       cmpAttrs = TypeManager.GetArgumentTypes (mi);
+                               }
+
+                               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;
+                                       }
+                                       return entry.Member;
+                               }
+
+                               //
+                               // Check the arguments
+                               //
+                               if (cmpAttrs.Length != paramTypes.Length)
+                                       continue;
+
+                               for (int j = cmpAttrs.Length - 1; j >= 0; j --) {
+                                       if (!paramTypes [j].Equals (cmpAttrs [j]))
+                                               goto next;
+                               }
+                               
+                               //
+                               // get one of the methods because this has the visibility info.
+                               //
+                               if (is_property) {
+                                       mi = pi.GetGetMethod (true);
+                                       if (mi == null)
+                                               mi = pi.GetSetMethod (true);
+                               }
+                               
+                               //
+                               // Check visibility
+                               //
+                               switch (mi.Attributes & MethodAttributes.MemberAccessMask) {
+                               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;
+                                       
+                                       break;
+                               case MethodAttributes.FamANDAssem:
+                               case MethodAttributes.Assembly:
+                                       //
+                                       // Check for assembly methods
+                                       //
+                                       if (mi.DeclaringType.Assembly == CodeGen.Assembly.Builder)
+                                               return entry.Member;
+                                       
+                                       break;
+                               default:
+                                       //
+                                       // A protected method is ok, because we are overriding.
+                                       // public is always ok.
+                                       //
+                                       return entry.Member;
+                               }
+                       next:
+                               ;
+                       }
+                       
+                       return null;
                }
        }
 }