2005-01-31 Zoltan Varga <vargaz@freemail.hu>
[mono.git] / mcs / gmcs / decl.cs
old mode 100755 (executable)
new mode 100644 (file)
index 9505b1f..fccf04b
@@ -2,10 +2,12 @@
 // 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
 //
 // (C) 2001 Ximian, Inc (http://www.ximian.com)
+// (C) 2004 Novell, Inc
 //
 // TODO: Move the method verification stuff from the class.cs and interface.cs here
 //
 using System;
 using System.Text;
 using System.Collections;
+using System.Globalization;
 using System.Reflection.Emit;
 using System.Reflection;
+using System.Xml;
 
 namespace Mono.CSharp {
 
        public class MemberName {
-               public readonly string Name;
+               public string Name;
                public readonly TypeArguments TypeArguments;
 
                public readonly MemberName Left;
@@ -43,6 +47,11 @@ namespace Mono.CSharp {
                        this.Left = left;
                }
 
+               public MemberName (MemberName left, MemberName right)
+                       : this (left, right.Name, right.TypeArguments)
+               {
+               }
+
                public string GetName ()
                {
                        if (Left != null)
@@ -51,37 +60,101 @@ namespace Mono.CSharp {
                                return Name;
                }
 
-               public string GetFullName ()
+               public bool IsGeneric {
+                       get {
+                               if (TypeArguments != null)
+                                       return true;
+                               else if (Left != null)
+                                       return Left.IsGeneric;
+                               else
+                                       return false;
+                       }
+               }
+
+               public string GetName (bool is_generic)
                {
-                       string full_name;
-                       if (TypeArguments != null)
-                               full_name = Name + "<" + TypeArguments + ">";
-                       else
-                               full_name = Name;
+                       string name = is_generic ? Basename : Name;
                        if (Left != null)
-                               return Left.GetFullName () + "." + full_name;
+                               return Left.GetName (is_generic) + "." + name;
                        else
-                               return full_name;
+                               return name;
                }
 
-               public string GetMemberName ()
+               public int CountTypeArguments {
+                       get {
+                               if (TypeArguments == null)
+                                       return 0;
+                               else
+                                       return TypeArguments.Count;
+                       }
+               }
+
+               public string GetMethodName ()
                {
-                       string full_name;
                        if (Left != null)
-                               return Left.GetFullName () + "." + Name;
+                               return Left.GetTypeName () + "." + Name;
                        else
                                return Name;
                }
 
+               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;
+               }
+
+               public string GetTypeName ()
+               {
+                       if (Left != null)
+                               return Left.GetTypeName () + "." +
+                                       MakeName (Name, TypeArguments);
+                       else
+                               return MakeName (Name, TypeArguments);
+               }
+
+               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;
+               }
+
                public Expression GetTypeExpression (Location loc)
                {
+                       if (IsUnbound) {
+                               if (!CheckUnbound (loc))
+                                       return null;
+
+                               return new UnboundTypeExpression (GetTypeName ());
+                       }
+
                        if (Left != null) {
                                Expression lexpr = Left.GetTypeExpression (loc);
 
-                               if (TypeArguments != null)
-                                       return new GenericMemberAccess (lexpr, Name, TypeArguments, loc);
-                               else
-                                       return new MemberAccess (lexpr, Name, loc);
+                               return new MemberAccess (lexpr, Name, TypeArguments, loc);
                        } else {
                                if (TypeArguments != null)
                                        return new ConstructedType (Name, TypeArguments, loc);
@@ -90,6 +163,23 @@ namespace Mono.CSharp {
                        }
                }
 
+               public MemberName Clone ()
+               {
+                       if (Left != null)
+                               return new MemberName (Left.Clone (), Name, TypeArguments);
+                       else
+                               return new MemberName (Name, TypeArguments);
+               }
+
+               public string Basename {
+                       get {
+                               if (TypeArguments != null)
+                                       return MakeName (Name, TypeArguments);
+                               else
+                                       return Name;
+                       }
+               }
+
                public override string ToString ()
                {
                        string full_name;
@@ -106,53 +196,126 @@ namespace Mono.CSharp {
        }
 
        /// <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 string Name {
+                       get {
+                               return MemberName.GetName (!(this is GenericMethod) && !(this is Method));
+                       }
+               }
+
+                // Is not readonly because of IndexerName attribute
+               public MemberName MemberName;
 
                /// <summary>
                ///   Modifier flags that the user specified in the source code
                /// </summary>
                public int ModFlags;
 
+               public /*readonly*/ TypeContainer Parent;
+
                /// <summary>
                ///   Location where this declaration happens
                /// </summary>
                public readonly Location Location;
 
                /// <summary>
-               ///   Attributes for this type
+               ///   XML documentation comment
+               /// </summary>
+               public string DocComment;
+
+               /// <summary>
+               ///   Represents header string for documentation comment 
+               ///   for each member types.
                /// </summary>
-               Attributes attributes;
+               public abstract string DocCommentHeader { get; }
+
+               [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
+                       TestMethodDuplication = 1 << 10         // Test for duplication must be performed
+               }
+  
+               /// <summary>
+               ///   MemberCore flags at first detected then cached
+               /// </summary>
+               internal Flags caching_flags;
 
-               public MemberCore (string name, Attributes attrs, Location loc)
+               public MemberCore (TypeContainer parent, MemberName name, Attributes attrs,
+                                  Location loc)
+                       : base (attrs)
                {
-                       Name = name;
+                       Parent = parent;
+                       MemberName = name;
                        Location = loc;
-                       attributes = attrs;
+                       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);
+               public abstract bool Define ();
 
                // 
                // Returns full member name for error message
                //
-               public virtual string GetSignatureForError () {
+               public virtual string GetSignatureForError ()
+               {
                        return Name;
                }
 
-               public Attributes OptAttributes 
+               /// <summary>
+               /// Use this method when MethodBuilder is null
+               /// </summary>
+               public virtual string GetSignatureForError (TypeContainer tc)
                {
+                       return Name;
+               }
+
+               /// <summary>
+               /// Base Emit method. This is also entry point for CLS-Compliant verification.
+               /// </summary>
+               public virtual void Emit ()
+               {
+                       // Hack with Parent == null is for EnumMember
+                       if (Parent == null || (GetObsoleteAttribute (Parent) == null && Parent.GetObsoleteAttribute (Parent) == null))
+                               VerifyObsoleteAttribute ();
+
+                       if (!RootContext.VerifyClsCompliance)
+                               return;
+
+                       VerifyClsCompliance (Parent);
+               }
+
+               public bool InUnsafe {
                        get {
-                               return attributes;
-                       }
-                       set {
-                               attributes = value;
+                               return ((ModFlags & Modifiers.UNSAFE) != 0) || Parent.UnsafeContext;
                        }
                }
 
@@ -173,6 +336,165 @@ 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;
+
+                       Attribute obsolete_attr = OptAttributes.Search (
+                               TypeManager.obsolete_attribute_type, ds.EmitContext);
+                       if (obsolete_attr == null)
+                               return null;
+
+                       ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds.EmitContext);
+                       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>
+               public 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) {
+                               Attribute cls_attribute = OptAttributes.Search (
+                                       TypeManager.cls_compliant_attribute_type, ds.EmitContext);
+                               if (cls_attribute != null) {
+                                       caching_flags |= Flags.HasClsCompliantAttribute;
+                                       return cls_attribute.GetClsCompliantAttributeValue (ds.EmitContext);
+                               }
+                       }
+                       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>
+               /// It helps to handle error 102 & 111 detection
+               /// </summary>
+               public virtual bool MarkForDuplicationCheck ()
+               {
+                       return false;
+               }
+
+               /// <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 && RootContext.WarningLevel >= 2) {
+                                       if (!IsExposedFromAssembly (ds))
+                                               Report.Warning (3019, Location, "CLS compliance checking will not be performed on '{0}' because it is private or internal", GetSignatureForError ());
+                                       if (!CodeGen.Assembly.IsClsCompliant)
+                                               Report.Warning (3021, Location, "'{0}' does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute", GetSignatureForError ());
+                               }
+                               return false;
+                       }
+
+                       if (!CodeGen.Assembly.IsClsCompliant) {
+                               if (HasClsCompliantAttribute) {
+                                       Report.Error (3014, Location, "'{0}' cannot be marked as CLS-compliant because the assembly does not have a CLSCompliant attribute", GetSignatureForError ());
+                               }
+                               return false;
+                       }
+
+                       int index = Name.LastIndexOf ('.');
+                       if (Name [index > 0 ? index + 1 : 0] == '_') {
+                               Report.Error (3008, Location, "Identifier '{0}' is not CLS-compliant", GetSignatureForError () );
+                       }
+                       return true;
+               }
+
+               protected abstract void VerifyObsoleteAttribute ();
+
+               //
+               // Raised (and passed an XmlElement that contains the comment)
+               // when GenerateDocComment is writing documentation expectedly.
+               //
+               internal virtual void OnGenerateDocComment (DeclSpace ds, XmlElement intermediateNode)
+               {
+               }
+
+               //
+               // Returns a string that represents the signature for this 
+               // member which should be used in XML documentation.
+               //
+               public virtual string GetDocCommentName (DeclSpace ds)
+               {
+                       if (ds == null || this is DeclSpace)
+                               return DocCommentHeader + Name;
+                       else
+                               return String.Concat (DocCommentHeader, ds.Name, ".", Name);
+               }
+
+               //
+               // Generates xml doc comments (if any), and if required,
+               // handle warning report.
+               //
+               internal virtual void GenerateDocComment (DeclSpace ds)
+               {
+                       DocUtil.GenerateDocComment (this, ds);
+               }
        }
 
        /// <summary>
@@ -183,7 +505,7 @@ 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
                ///   created with System.Reflection.Emit
@@ -195,29 +517,29 @@ namespace Mono.CSharp {
                ///   currently defining.  We need to lookup members on this
                ///   instead of the TypeBuilder.
                /// </summary>
-               public TypeExpr CurrentType;
+               public Type CurrentType;
 
-               /// <summary>
-               ///   This variable tracks whether we have Closed the type
-               /// </summary>
-               public bool Created = false;
-               
                //
                // This is the namespace in which this typecontainer
                // was declared.  We use this to resolve names.
                //
                public NamespaceEntry NamespaceEntry;
 
-               public Hashtable Cache = new Hashtable ();
+               private Hashtable Cache = new Hashtable ();
                
                public string Basename;
                
-               /// <summary>
-               ///   defined_names is used for toplevel objects
-               /// </summary>
                protected Hashtable defined_names;
 
-               bool is_generic;
+               readonly bool is_generic;
+               readonly int count_type_params;
+
+               // The emit context for toplevel objects.
+               protected EmitContext ec;
+               
+               public EmitContext EmitContext {
+                       get { return ec; }
+               }
 
                //
                // Whether we are Generic
@@ -226,119 +548,84 @@ namespace Mono.CSharp {
                        get {
                                if (is_generic)
                                        return true;
-                               else if (parent != null)
-                                       return parent.IsGeneric;
+                               else if (Parent != null)
+                                       return Parent.IsGeneric;
                                else
                                        return false;
                        }
                }
 
-               TypeContainer parent;
+               static string[] attribute_targets = new string [] { "type" };
 
-               public DeclSpace (NamespaceEntry ns, TypeContainer parent, string name, Attributes attrs, Location l)
-                       : base (name, attrs, l)
+               public DeclSpace (NamespaceEntry ns, TypeContainer parent, MemberName name,
+                                 Attributes attrs, Location l)
+                       : base (parent, name, attrs, l)
                {
                        NamespaceEntry = ns;
-                       Basename = name.Substring (1 + name.LastIndexOf ('.'));
+                       Basename = name.Name;
                        defined_names = new Hashtable ();
-                       this.parent = parent;
-               }
-
-               public void RecordDecl ()
-               {
-                       if ((NamespaceEntry != null) && (parent == RootContext.Tree.Types))
-                               NamespaceEntry.DefineName (Basename, this);
+                       if (name.TypeArguments != null) {
+                               is_generic = true;
+                               count_type_params = name.TypeArguments.Count;
+                       }
+                       if (parent != null)
+                               count_type_params += parent.count_type_params;
                }
 
                /// <summary>
-               ///   The result value from adding an declaration into
-               ///   a struct or a class
+               /// Adds the member to defined_names table. It tests for duplications and enclosing name conflicts
                /// </summary>
-               public enum AdditionResult {
-                       /// <summary>
-                       /// The declaration has been successfully
-                       /// added to the declation space.
-                       /// </summary>
-                       Success,
-
-                       /// <summary>
-                       ///   The symbol has already been defined.
-                       /// </summary>
-                       NameExists,
-
-                       /// <summary>
-                       ///   Returned if the declation being added to the
-                       ///   name space clashes with its container name.
-                       ///
-                       ///   The only exceptions for this are constructors
-                       ///   and static constructors
-                       /// </summary>
-                       EnclosingClash,
-
-                       /// <summary>
-                       ///   Returned if a constructor was created (because syntactically
-                       ///   it looked like a constructor) but was not (because the name
-                       ///   of the method is not the same as the container class
-                       /// </summary>
-                       NotAConstructor,
-
-                       /// <summary>
-                       ///   This is only used by static constructors to emit the
-                       ///   error 111, but this error for other things really
-                       ///   happens at another level for other functions.
-                       /// </summary>
-                       MethodExists,
-
-                       /// <summary>
-                       ///   Some other error.
-                       /// </summary>
-                       Error
-               }
+               protected bool AddToContainer (MemberCore symbol, string fullname, string basename)
+               {
+                       if (basename == Basename && !(this is Interface)) {
+                               if (symbol is TypeParameter)
+                                       Report.Error (694, "Type parameter `{0}' has same name as " +
+                                                     "containing type or method", basename);
+                               else {
+                                       Report.SymbolRelatedToPreviousError (this);
+                                       Report.Error (542, "'{0}': member names cannot be the same as their " +
+                                                     "enclosing type", symbol.Location, symbol.GetSignatureForError ());
+                               }
+                               return false;
+                       }
 
-               /// <summary>
-               ///   Returns a status code based purely on the name
-               ///   of the member being added
-               /// </summary>
-               protected AdditionResult IsValid (string basename, string name)
-               {
-                       if (basename == Basename)
-                               return AdditionResult.EnclosingClash;
+                       MemberCore mc = (MemberCore)defined_names [fullname];
+
+                       if (mc == null) {
+                               defined_names.Add (fullname, symbol);
+                               return true;
+                       }
 
-                       if (defined_names.Contains (name))
-                               return AdditionResult.NameExists;
+                       if (symbol.MarkForDuplicationCheck () && mc.MarkForDuplicationCheck ())
+                               return true;
 
-                       return AdditionResult.Success;
+                       if (symbol is TypeParameter)
+                               Report.Error (692, symbol.Location, "Duplicate type parameter `{0}'", basename);
+                       else {
+                               Report.SymbolRelatedToPreviousError (mc);
+                               Report.Error (102, symbol.Location,
+                                             "The type '{0}' already contains a definition for '{1}'",
+                                             GetSignatureForError (), basename);
+                       }
+                       return false;
                }
 
-               public static int length;
-               public static int small;
-               
-               /// <summary>
-               ///   Introduce @name into this declaration space and
-               ///   associates it with the object @o.  Note that for
-               ///   methods this will just point to the first method. o
-               /// </summary>
-               public void DefineName (string name, object o)
+               public void RecordDecl ()
                {
-                       defined_names.Add (name, o);
-
-#if DEBUGME
-                       int p = name.LastIndexOf ('.');
-                       int l = name.Length;
-                       length += l;
-                       small += l -p;
-#endif
+                       if ((NamespaceEntry != null) && (Parent == RootContext.Tree.Types))
+                               NamespaceEntry.DefineName (MemberName.Basename, this);
                }
 
                /// <summary>
-               ///   Returns the object associated with a given name in the declaration
-               ///   space.  This is the inverse operation of `DefineName'
+               ///   Returns the MemberCore associated with a given name in the declaration
+               ///   space. It doesn't return method based symbols !!
                /// </summary>
-               public object GetDefinition (string name)
+               /// 
+               public MemberCore GetDefinition (string name)
                {
-                       return defined_names [name];
+                       return (MemberCore)defined_names [name];
                }
-               
+
                bool in_transit = false;
                
                /// <summary>
@@ -354,23 +641,6 @@ namespace Mono.CSharp {
                                in_transit = value;
                        }
                }
-
-               public TypeContainer Parent {
-                       get {
-                               return parent;
-                       }
-               }
-
-               /// <summary>
-               ///   Looks up the alias for the name
-               /// </summary>
-               public string LookupAlias (string name)
-               {
-                       if (NamespaceEntry != null)
-                               return NamespaceEntry.LookupAlias (name);
-                       else
-                               return null;
-               }
                
                // 
                // root_types contains all the types.  All TopLevel types
@@ -379,8 +649,8 @@ namespace Mono.CSharp {
                //
                public bool IsTopLevel {
                        get {
-                               if (parent != null){
-                                       if (parent.parent == null)
+                               if (Parent != null){
+                                       if (Parent.Parent == null)
                                                return true;
                                }
                                return false;
@@ -389,7 +659,7 @@ namespace Mono.CSharp {
 
                public virtual void CloseType ()
                {
-                       if (!Created){
+                       if ((caching_flags & Flags.CloseTypeCreated) == 0){
                                try {
                                        TypeBuilder.CreateType ();
                                } catch {
@@ -404,7 +674,7 @@ namespace Mono.CSharp {
                                        // Note that this still creates the type and
                                        // it is possible to save it
                                }
-                               Created = true;
+                               caching_flags |= Flags.CloseTypeCreated;
                        }
                }
 
@@ -426,8 +696,8 @@ namespace Mono.CSharp {
                        get {
                                if ((ModFlags & Modifiers.UNSAFE) != 0)
                                        return true;
-                               if (parent != null)
-                                       return parent.UnsafeContext;
+                               if (Parent != null)
+                                       return Parent.UnsafeContext;
                                return false;
                        }
                }
@@ -440,44 +710,28 @@ namespace Mono.CSharp {
                }
 
                EmitContext type_resolve_ec;
-               EmitContext GetTypeResolveEmitContext (TypeContainer parent, Location loc)
-               {
-                       type_resolve_ec = new EmitContext (parent, this, loc, null, null, ModFlags, false);
-                       type_resolve_ec.ResolvingTypeTree = true;
 
-                       return type_resolve_ec;
-               }
-
-               // <summary>
-               //    Looks up the type, as parsed into the expression `e' 
-               // </summary>
-               public Type ResolveType (Expression e, bool silent, Location loc)
+               public FullNamedExpression ResolveNestedType (FullNamedExpression t, Location loc)
                {
-                       TypeExpr d = ResolveTypeExpr (e, silent, loc);
-                       if (d == null)
-                               return null;
-
-                       return ResolveType (d, loc);
-               }
-
-               public Type ResolveType (TypeExpr d, Location loc)
-               {
-                       if (!d.CheckAccessLevel (this)) {
-                               Report. Error (122, loc,  "`" + d.Name + "' " +
-                                      "is inaccessible because of its protection level");
-                               return null;
-                       }
-
-                       Type t = d.ResolveType (type_resolve_ec);
-                       if (t == null)
-                               return null;
-
-                       TypeContainer tc = TypeManager.LookupTypeContainer (t);
+                       TypeContainer tc = TypeManager.LookupTypeContainer (t.Type);
                        if ((tc != null) && tc.IsGeneric) {
-                               ConstructedType ctype = new ConstructedType (
-                                       t, TypeParameters, loc);
+                               if (!IsGeneric) {
+                                       int tnum = TypeManager.GetNumberOfTypeArguments (t.Type);
+                                       Report.Error (305, loc,
+                                                     "Using the generic type `{0}' " +
+                                                     "requires {1} type arguments",
+                                                     TypeManager.GetFullName (t.Type), tnum);
+                                       return null;
+                               }
 
-                               t = ctype.ResolveType (type_resolve_ec);
+                               TypeParameter[] args;
+                               if (this is GenericMethod)
+                                       args = Parent.TypeParameters;
+                               else
+                                       args = TypeParameters;
+
+                               TypeExpr ctype = new ConstructedType (t.Type, args, loc);
+                               return ctype.ResolveAsTypeTerminal (ec);
                        }
 
                        return t;
@@ -485,62 +739,34 @@ namespace Mono.CSharp {
 
                // <summary>
                //    Resolves the expression `e' for a type, and will recursively define
-               //    types. 
+               //    types.  This should only be used for resolving base types.
                // </summary>
-               public TypeExpr ResolveTypeExpr (Expression e, bool silent, Location loc)
+               public TypeExpr ResolveBaseTypeExpr (Expression e, bool silent, Location loc)
                {
-                       if (type_resolve_ec == null)
-                               type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
+                       if (type_resolve_ec == null) {
+                               // FIXME: I think this should really be one of:
+                               //
+                               // a. type_resolve_ec = Parent.EmitContext;
+                               // b. type_resolve_ec = new EmitContext (Parent, Parent, loc, null, null, ModFlags, false);
+                               //
+                               // However, if Parent == RootContext.Tree.Types, its NamespaceEntry will be null.
+                               //
+                               type_resolve_ec = new EmitContext (Parent, this, loc, null, null, ModFlags, false);
+                               type_resolve_ec.ResolvingTypeTree = true;
+                       }
                        type_resolve_ec.loc = loc;
                        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, -1, 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);
-
-                               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;
-                       }
-
-                       Report.Error (246, loc, "Cannot find type `{0}'", e);
-                       return null;
+                       return e.ResolveAsTypeTerminal (type_resolve_ec);
                }
                
                public bool CheckAccessLevel (Type check_type) 
                {
                        TypeBuilder tb;
-                       if (this is GenericMethod)
+                       if ((this is GenericMethod) || (this is Iterator))
                                tb = Parent.TypeBuilder;
                        else
                                tb = TypeBuilder;
@@ -551,6 +777,12 @@ namespace Mono.CSharp {
                        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 (check_type.IsGenericParameter)
                                return true; // FIXME
                        
@@ -569,37 +801,22 @@ namespace Mono.CSharp {
                                return true;
 
                        case TypeAttributes.NotPublic:
-                               //
-                               // This test should probably use the declaringtype.
-                               //
-                               if (check_type.Assembly == tb.Assembly){
-                                       return true;
-                               }
-                               return false;
-                               
+
+                               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;
+
                        case TypeAttributes.NestedPublic:
                                return true;
 
                        case TypeAttributes.NestedPrivate:
-                               string check_type_name = check_type.FullName;
-                               string type_name = CurrentType != null ?
-                                       CurrentType.Name : tb.FullName;
-
-                               int cio = check_type_name.LastIndexOf ('+');
-                               string container = check_type_name.Substring (0, cio);
-
-                               //
-                               // Check if the check_type is a nested class of the current type
-                               //
-                               if (check_type_name.StartsWith (type_name + "+")){
-                                       return true;
-                               }
-                               
-                               if (type_name.StartsWith (container)){
-                                       return true;
-                               }
-
-                               return false;
+                               return NestedAccessible (tb, check_type);
 
                        case TypeAttributes.NestedFamily:
                                //
@@ -624,24 +841,31 @@ namespace Mono.CSharp {
 
                }
 
-               protected bool FamilyAccessible (TypeBuilder tb, Type check_type)
+               protected bool NestedAccessible (Type tb, Type check_type)
                {
-                       Type declaring = check_type.DeclaringType;
-                       if (tb.IsSubclassOf (declaring))
-                               return true;
-
                        string check_type_name = check_type.FullName;
                        
+                       // At this point, we already know check_type is a nested class.
                        int cio = check_type_name.LastIndexOf ('+');
-                       string container = check_type_name.Substring (0, cio);
                        
-                       //
-                       // Check if the check_type is a nested class of the current type
-                       //
-                       if (check_type_name.StartsWith (container + "+"))
+                       // Ensure that the string 'container' has a '+' in it to avoid false matches
+                       string container = check_type_name.Substring (0, cio + 1);
+
+                       // Ensure that type_name ends with a '+' so that it can match 'container', if necessary
+                       string type_name = tb.FullName + "+";
+
+                       // If the current class is nested inside the container of check_type,
+                       // we can access check_type even if it is private or protected.
+                       return type_name.StartsWith (container);
+               }
+
+               protected bool FamilyAccessible (Type tb, Type check_type)
+               {
+                       Type declaring = check_type.DeclaringType;
+                       if (tb == declaring || TypeManager.IsFamilyAccessible (tb, declaring))
                                return true;
 
-                       return false;
+                       return NestedAccessible (tb, check_type);
                }
 
                // Access level of a type.
@@ -757,16 +981,17 @@ namespace Mono.CSharp {
                        return tc.DefineType ();
                }
                
-               Type LookupInterfaceOrClass (string ns, string name, out bool error)
+               FullNamedExpression LookupInterfaceOrClass (string ns, string name, out bool error)
                {
                        DeclSpace parent;
+                       FullNamedExpression result;
                        Type t;
                        object r;
                        
                        error = false;
 
                        if (dh.Lookup (ns, name, out r))
-                               return (Type) r;
+                               return (FullNamedExpression) r;
                        else {
                                if (ns != ""){
                                        if (Namespace.IsNamespace (ns)){
@@ -779,8 +1004,23 @@ namespace Mono.CSharp {
                        }
                        
                        if (t != null) {
-                               dh.Insert (ns, name, t);
-                               return t;
+                               result = new TypeExpression (t, Location.Null);
+                               dh.Insert (ns, name, result);
+                               return result;
+                       }
+
+                       if (ns != "" && Namespace.IsNamespace (ns)) {
+                               result = Namespace.LookupNamespace (ns, false).Lookup (this, name, Location.Null);
+                               if (result != null) {
+                                       dh.Insert (ns, name, result);
+                                       return result;
+                               }
+                       }
+
+                       if (ns == "" && Namespace.IsNamespace (name)) {
+                               result = Namespace.LookupNamespace (name, false);
+                               dh.Insert (ns, name, result);
+                               return result;
                        }
 
                        //
@@ -791,7 +1031,10 @@ namespace Mono.CSharp {
                                ns = MakeFQN (ns, name.Substring (0, p));
                                name = name.Substring (p+1);
                        }
-                       
+
+                       if (ns.IndexOf ('+') != -1)
+                               ns = ns.Replace ('+', '.');
+
                        parent = RootContext.Tree.LookupByNamespace (ns, name);
                        if (parent == null) {
                                dh.Insert (ns, name, null);
@@ -804,21 +1047,22 @@ namespace Mono.CSharp {
                                return null;
                        }
                        
-                       dh.Insert (ns, name, t);
-                       return t;
+                       result = new TypeExpression (t, Location.Null);
+                       dh.Insert (ns, name, result);
+                       return result;
                }
 
-               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;
+                       FullNamedExpression t;
                        bool error;
 
                        containing_ds = this;
@@ -833,8 +1077,8 @@ namespace Mono.CSharp {
                                        if (error)
                                                return null;
 
-                                       if ((t != null) && containing_ds.CheckAccessLevel (t))
-                                               return t;
+                                       if ((t != null) && containing_ds.CheckAccessLevel (t.Type))
+                                               return t.Type;
 
                                        current_type = current_type.BaseType;
                                }
@@ -856,15 +1100,16 @@ namespace Mono.CSharp {
                ///   during the tree resolution process and potentially define
                ///   recursively the type
                /// </remarks>
-               public Type FindType (Location loc, string name, int num_type_args)
+               public FullNamedExpression FindType (Location loc, string name)
                {
-                       Type t;
+                       FullNamedExpression t;
                        bool error;
 
                        //
                        // For the case the type we are looking for is nested within this one
                        // or is in any base class
                        //
+
                        DeclSpace containing_ds = this;
 
                        while (containing_ds != null){
@@ -878,10 +1123,8 @@ namespace Mono.CSharp {
                                        if (error)
                                                return null;
 
-                                       if ((t != null) &&
-                                           containing_ds.CheckAccessLevel (t) &&
-                                           TypeManager.CheckGeneric (t, num_type_args))
-                                               return t;
+                                       if ((t != null) && containing_ds.CheckAccessLevel (t.Type))
+                                               return ResolveNestedType (t, loc);
 
                                        current_type = current_type.BaseType;
                                }
@@ -896,7 +1139,7 @@ namespace Mono.CSharp {
                                if (error)
                                        return null;
 
-                               if ((t != null) && TypeManager.CheckGeneric (t, num_type_args))
+                               if (t != null)
                                        return t;
                        }
                        
@@ -907,7 +1150,7 @@ namespace Mono.CSharp {
                        if (error)
                                return null;
                        
-                       if ((t != null) && TypeManager.CheckGeneric (t, num_type_args))
+                       if (t != null)
                                return t;
                        
                        //
@@ -921,32 +1164,37 @@ namespace Mono.CSharp {
                                if (error)
                                        return null;
 
-                               if ((t != null) && TypeManager.CheckGeneric (t, num_type_args))
+                               if (t != null)
+                                       return t;
+
+                               if (name.IndexOf ('.') > 0)
+                                       continue;
+
+                               t = ns.LookupAlias (name);
+                               if (t != null)
                                        return t;
 
                                //
                                // Now check the using clause list
                                //
-                               Type match = null;
+                               FullNamedExpression match = null;
                                foreach (Namespace using_ns in ns.GetUsingTable ()) {
                                        match = LookupInterfaceOrClass (using_ns.Name, name, out error);
                                        if (error)
                                                return null;
 
-                                       if ((match != null) &&
-                                           TypeManager.CheckGeneric (match, num_type_args)) {
-                                               if (t != null){
-                                                       if (CheckAccessLevel (match)) {
-                                                               Error_AmbiguousTypeReference (loc, name, t, match);
-                                                               return null;
-                                                       }
+                                       if ((match != null) && (match is TypeExpr)) {
+                                               Type matched = ((TypeExpr) match).Type;
+                                               if (!CheckAccessLevel (matched))
                                                        continue;
+                                               if (t != null){
+                                                       Error_AmbiguousTypeReference (loc, name, t.FullName, match.FullName);
+                                                       return null;
                                                }
-                                               
                                                t = match;
                                        }
                                }
-                               if ((t != null) && TypeManager.CheckGeneric (t, num_type_args))
+                               if (t != null)
                                        return t;
                        }
 
@@ -954,6 +1202,76 @@ namespace Mono.CSharp {
                        return null;
                }
 
+               //
+               // Public function used to locate types, this can only
+               // be used after the ResolveTree function has been invoked.
+               //
+               // Returns: Type or null if they type can not be found.
+               //
+               // Come to think of it, this should be a DeclSpace
+               //
+               public FullNamedExpression LookupType (string name, bool silent, Location loc)
+               {
+                       FullNamedExpression e;
+
+                       if (Cache.Contains (name)) {
+                               e = (FullNamedExpression) Cache [name];
+                       } else {
+                               //
+                               // For the case the type we are looking for is nested within this one
+                               // or is in any base class
+                               //
+                               DeclSpace containing_ds = this;
+                               while (containing_ds != null){
+                                       
+                                       // if the member cache has been created, lets use it.
+                                       // the member cache is MUCH faster.
+                                       if (containing_ds.MemberCache != null) {
+                                               Type t = containing_ds.MemberCache.FindNestedType (name);
+                                               if (t == null) {
+                                                       containing_ds = containing_ds.Parent;
+                                                       continue;
+                                               }
+
+                                               e = new TypeExpression (t, Location.Null);
+                                               e = ResolveNestedType (e, Location.Null);
+                                               Cache [name] = e;
+                                               return e;
+                                       }
+                                       
+                                       // no member cache. Do it the hard way -- reflection
+                                       Type current_type = containing_ds.TypeBuilder;
+                                       
+                                       while (current_type != null &&
+                                              current_type != TypeManager.object_type) {
+                                               //
+                                               // nested class
+                                               //
+                                               Type t = TypeManager.LookupType (current_type.FullName + "." + name);
+                                               if (t != null){
+                                                       e = new TypeExpression (t, Location.Null);
+                                                       e = ResolveNestedType (e, Location.Null);
+                                                       Cache [name] = e;
+                                                       return e;
+                                               }
+                                               
+                                               current_type = current_type.BaseType;
+                                       }
+                                       
+                                       containing_ds = containing_ds.Parent;
+                               }
+                               
+                               e = NamespaceEntry.LookupNamespaceOrType (this, name, loc);
+                               if (!silent || e != null)
+                                       Cache [name] = e;
+                       }
+
+                       if (e == null && !silent)
+                               Report.Error (246, loc, "Cannot find type `"+name+"'");
+                       
+                       return e;
+               }
+
                /// <remarks>
                ///   This function is broken and not what you're looking for.  It should only
                ///   be used while the type is still being created since it doesn't use the cache
@@ -970,6 +1288,59 @@ 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) {
+                               Attribute cls_attribute = OptAttributes.Search (TypeManager.cls_compliant_attribute_type, ec);
+                               if (cls_attribute != null) {
+                                       caching_flags |= Flags.HasClsCompliantAttribute;
+                                       if (cls_attribute.GetClsCompliantAttributeValue (ec)) {
+                                               caching_flags |= Flags.ClsCompliantAttributeTrue;
+                                               return true;
+                                       }
+                                       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;
+               }
+
                //
                // Extensions for generics
                //
@@ -1002,7 +1373,7 @@ namespace Mono.CSharp {
                                                693, Location,
                                                "Type parameter `{0}' has same name " +
                                                "as type parameter from outer type `{1}'",
-                                               name, parent.GetInstantiationName ());
+                                               name, Parent.GetInstantiationName ());
 
                                return false;
                        }
@@ -1015,9 +1386,9 @@ namespace Mono.CSharp {
                        if (type_param_list != null)
                                return type_param_list;
 
-                       DeclSpace the_parent = parent;
+                       DeclSpace the_parent = Parent;
                        if (this is GenericMethod)
-                               the_parent = the_parent.Parent;
+                               the_parent = null;
 
                        int start = 0;
                        TypeParameter[] parent_params = null;
@@ -1042,40 +1413,26 @@ namespace Mono.CSharp {
                        return type_param_list;
                }
 
-               ///
-               /// Called by the parser to configure the type_parameter_list for this
-               /// declaration space
-               ///
-               public AdditionResult SetParameterInfo (TypeArguments args,
-                                                       ArrayList constraints_list)
+               public void SetParameterInfo (ArrayList constraints_list)
                {
-                       string[] type_parameter_list = args.GetDeclarations ();
-                       if (type_parameter_list == null)
-                               return AdditionResult.Error;
-
-                       return SetParameterInfo (type_parameter_list, constraints_list);
-               }
+                       if (!is_generic) {
+                               if (constraints_list != null) {
+                                       Report.Error (
+                                               80, Location, "Contraints are not allowed " +
+                                               "on non-generic declarations");
+                               }
 
-               public AdditionResult SetParameterInfo (IList type_parameter_list,
-                                                       ArrayList constraints_list)
-               {
-                       type_params = new TypeParameter [type_parameter_list.Count];
+                               return;
+                       }
 
-                       //
-                       // Mark this type as Generic
-                       //
-                       is_generic = true;
+                       string[] names = MemberName.TypeArguments.GetDeclarations ();
+                       type_params = new TypeParameter [names.Length];
 
                        //
                        // Register all the names
                        //
-                       for (int i = 0; i < type_parameter_list.Count; i++) {
-                               string name = (string) type_parameter_list [i];
-
-                               AdditionResult res = IsValid (name, name);
-
-                               if (res != AdditionResult.Success)
-                                       return res;
+                       for (int i = 0; i < type_params.Length; i++) {
+                               string name = names [i];
 
                                Constraints constraints = null;
                                if (constraints_list != null) {
@@ -1087,12 +1444,11 @@ namespace Mono.CSharp {
                                        }
                                }
 
-                               type_params [i] = new TypeParameter (name, constraints, Location);
+                               type_params [i] = new TypeParameter (Parent, name, constraints, Location);
 
-                               DefineName (name, type_params [i]);
+                               string full_name = Name + "." + name;
+                               AddToContainer (type_params [i], full_name, name);
                        }
-
-                       return AdditionResult.Success;
                }
 
                public TypeParameter[] TypeParameters {
@@ -1119,12 +1475,7 @@ namespace Mono.CSharp {
 
                public int CountTypeParameters {
                        get {
-                               if (!IsGeneric)
-                                       return 0;
-                               if (type_param_list == null)
-                                       initialize_type_params ();
-
-                               return type_param_list.Length;
+                               return count_type_params;
                        }
                }
 
@@ -1140,11 +1491,36 @@ namespace Mono.CSharp {
                                return new TypeParameterExpr (type_param, loc);
                        }
 
-                       if (parent != null)
-                               return parent.LookupGeneric (name, loc);
+                       if (Parent != null)
+                               return Parent.LookupGeneric (name, loc);
 
                        return null;
                }
+
+               bool IAlias.IsType {
+                       get { return true; }
+               }
+
+               string IAlias.Name {
+                       get { return Name; }
+               }
+
+               TypeExpr IAlias.ResolveAsType (EmitContext ec)
+               {
+                       if (TypeBuilder == null)
+                               throw new InvalidOperationException ();
+
+                       if (CurrentType != null)
+                               return new TypeExpression (CurrentType, Location);
+                       else
+                               return new TypeExpression (TypeBuilder, Location);
+               }
+
+               public override string[] ValidAttributeTargets {
+                       get {
+                               return attribute_targets;
+                       }
+               }
        }
 
        /// <summary>
@@ -1317,12 +1693,12 @@ namespace Mono.CSharp {
                }
 
                /// <summary>
-               ///   Returns the IMemberContainer of the parent class or null if this
+               ///   Returns the IMemberContainer of the base class or null if this
                ///   is an interface or TypeManger.object_type.
                ///   This is used when creating the member cache for a class to get all
-               ///   members from the parent class.
+               ///   members from the base class.
                /// </summary>
-               IMemberContainer Parent {
+               MemberCache BaseCache {
                        get;
                }
 
@@ -1373,8 +1749,6 @@ namespace Mono.CSharp {
                public readonly IMemberContainer Container;
                protected Hashtable member_hash;
                protected Hashtable method_hash;
-               
-               Hashtable interface_hash;
 
                /// <summary>
                ///   Create a new MemberCache for the given IMemberContainer `container'.
@@ -1386,21 +1760,10 @@ namespace Mono.CSharp {
                        Timer.IncrementCounter (CounterType.MemberCache);
                        Timer.StartTimer (TimerType.CacheInit);
 
-                       
-
-                       // If we have a parent class (we have a parent class unless we're
+                       // If we have a base class (we have a base class unless we're
                        // TypeManager.object_type), we deep-copy its MemberCache here.
-                       if (Container.IsInterface) {
-                               MemberCache parent;
-                               interface_hash = new Hashtable ();
-                               
-                               if (Container.Parent != null)
-                                       parent = Container.Parent.MemberCache;
-                               else
-                                       parent = TypeHandle.ObjectType.MemberCache;
-                               member_hash = SetupCacheForInterface (parent);
-                       } else if (Container.Parent != null)
-                               member_hash = SetupCache (Container.Parent.MemberCache);
+                       if (Container.BaseCache != null)
+                               member_hash = SetupCache (Container.BaseCache);
                        else
                                member_hash = new Hashtable ();
 
@@ -1418,70 +1781,60 @@ namespace Mono.CSharp {
                        Timer.StopTimer (TimerType.CacheInit);
                }
 
+               public MemberCache (Type[] ifaces)
+               {
+                       //
+                       // The members of this cache all belong to other caches.  
+                       // So, 'Container' will not be used.
+                       //
+                       this.Container = null;
+
+                       member_hash = new Hashtable ();
+                       if (ifaces == null)
+                               return;
+
+                       foreach (Type itype in ifaces)
+                               AddCacheContents (TypeManager.LookupMemberCache (itype));
+               }
+
                /// <summary>
-               ///   Bootstrap this member cache by doing a deep-copy of our parent.
+               ///   Bootstrap this member cache by doing a deep-copy of our base.
                /// </summary>
-               Hashtable SetupCache (MemberCache parent)
+               Hashtable SetupCache (MemberCache base_class)
                {
                        Hashtable hash = new Hashtable ();
 
-                       IDictionaryEnumerator it = parent.member_hash.GetEnumerator ();
+                       if (base_class == null)
+                               return hash;
+
+                       IDictionaryEnumerator it = base_class.member_hash.GetEnumerator ();
                        while (it.MoveNext ()) {
                                hash [it.Key] = ((ArrayList) it.Value).Clone ();
-                        }
+                        }
                                 
                        return hash;
                }
 
-
                /// <summary>
-               ///   Add the contents of `new_hash' to `hash'.
+               ///   Add the contents of `cache' to the member_hash.
                /// </summary>
-               void AddHashtable (Hashtable hash, Hashtable new_hash)
+               void AddCacheContents (MemberCache cache)
                {
-                       IDictionaryEnumerator it = new_hash.GetEnumerator ();
+                       IDictionaryEnumerator it = cache.member_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 ();
-                       }
-               }
-
-               /// <summary>
-               ///   Bootstrap the member cache for an interface type.
-               ///   Type.GetMembers() won't return any inherited members for interface types,
-               ///   so we need to do this manually.  Interfaces also inherit from System.Object.
-               /// </summary>
-               Hashtable SetupCacheForInterface (MemberCache parent)
-               {
-                       Hashtable hash = SetupCache (parent);
-                       TypeExpr [] ifaces = TypeManager.GetInterfaces (Container.Type);
+                               ArrayList list = (ArrayList) member_hash [it.Key];
+                               if (list == null)
+                                       member_hash [it.Key] = list = new ArrayList ();
 
-                       foreach (TypeExpr iface in ifaces) {
-                               Type itype = iface.Type;
+                               ArrayList entries = (ArrayList) it.Value;
+                               for (int i = entries.Count-1; i >= 0; i--) {
+                                       CacheEntry entry = (CacheEntry) entries [i];
 
-                               if (interface_hash.Contains (itype))
-                                       continue;
-                               
-                               interface_hash [itype] = null;
-
-                               IMemberContainer iface_container =
-                                       TypeManager.LookupMemberContainer (itype);
-
-                               MemberCache iface_cache = iface_container.MemberCache;
-
-                               AddHashtable (hash, iface_cache.member_hash);
-                               
-                               if (iface_cache.interface_hash == null)
-                                       continue;
-                               
-                               foreach (Type parent_contains in iface_cache.interface_hash.Keys)
-                                       interface_hash [parent_contains] = null;
+                                       if (entry.Container != cache.Container)
+                                               break;
+                                       list.Add (entry);
+                               }
                        }
-
-                       return hash;
                }
 
                /// <summary>
@@ -1491,8 +1844,10 @@ namespace Mono.CSharp {
                {
                        // We need to call AddMembers() with a single member type at a time
                        // to get the member type part of CacheEntry.EntryType right.
+                       if (!container.IsInterface) {
                        AddMembers (MemberTypes.Constructor, container);
                        AddMembers (MemberTypes.Field, container);
+                       }
                        AddMembers (MemberTypes.Method, container);
                        AddMembers (MemberTypes.Property, container);
                        AddMembers (MemberTypes.Event, container);
@@ -1535,7 +1890,7 @@ namespace Mono.CSharp {
                                }
 
                                // When this method is called for the current class, the list will
-                               // already contain all inherited members from our parent classes.
+                               // already contain all inherited members from our base classes.
                                // We cannot add new members in front of the list since this'd be an
                                // expensive operation, that's why the list is sorted in reverse order
                                // (ie. members from the current class are coming last).
@@ -1565,10 +1920,6 @@ namespace Mono.CSharp {
                        foreach (MethodBase member in members) {
                                string name = member.Name;
 
-                               // Varargs methods aren't allowed in C# code.
-                               if ((member.CallingConvention & CallingConventions.VarArgs) != 0)
-                                       continue;
-
                                // We use a name-based hash table of ArrayList's.
                                ArrayList list = (ArrayList) method_hash [name];
                                if (list == null) {
@@ -1683,6 +2034,12 @@ namespace Mono.CSharp {
                                this.Member = member;
                                this.EntryType = GetEntryType (mt, bf);
                        }
+
+                       public override string ToString ()
+                       {
+                               return String.Format ("CacheEntry ({0}:{1}:{2})", Container.Name,
+                                                     EntryType, Member);
+                       }
                }
 
                /// <summary>
@@ -1730,7 +2087,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)
@@ -1752,9 +2111,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
@@ -1772,10 +2131,11 @@ 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
+                       // in the current class and all its base classes.  The list is sorted in
                        // reverse order due to the way how the cache is initialy created (to speed
-                       // things up, we're doing a deep-copy of our parent).
+                       // things up, we're doing a deep-copy of our base).
 
                        for (int i = applicable.Count-1; i >= 0; i--) {
                                CacheEntry entry = (CacheEntry) applicable [i];
@@ -1823,7 +2183,23 @@ namespace Mono.CSharp {
                        using_global = false;
                        MemberInfo [] copy = new MemberInfo [global.Count];
                        global.CopyTo (copy);
-                       return new MemberList (copy);
+                       return copy;
+               }
+               
+               // find the nested type @name in @this.
+               public Type FindNestedType (string name)
+               {
+                       ArrayList applicable = (ArrayList) member_hash [name];
+                       if (applicable == null)
+                               return null;
+                       
+                       for (int i = applicable.Count-1; i >= 0; i--) {
+                               CacheEntry entry = (CacheEntry) applicable [i];
+                               if ((entry.EntryType & EntryType.NestedType & EntryType.MaskType) != 0)
+                                       return (Type) entry.Member;
+                       }
+                       
+                       return null;
                }
                
                //
@@ -1850,21 +2226,56 @@ namespace Mono.CSharp {
                        for (int i = applicable.Count - 1; i >= 0; i--) {
                                CacheEntry entry = (CacheEntry) applicable [i];
                                
-                               if ((entry.EntryType & (is_property ? EntryType.Property : EntryType.Method)) == 0)
+                               if ((entry.EntryType & (is_property ? (EntryType.Property | EntryType.Field) : EntryType.Method)) == 0)
                                        continue;
 
                                PropertyInfo pi = null;
                                MethodInfo mi = null;
-                               Type [] cmpAttrs;
+                               FieldInfo fi = null;
+                               Type [] cmpAttrs = null;
                                
                                if (is_property) {
-                                       pi = (PropertyInfo) entry.Member;
-                                       cmpAttrs = TypeManager.GetArgumentTypes (pi);
+                                       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
                                //
@@ -1872,7 +2283,7 @@ namespace Mono.CSharp {
                                        continue;
 
                                for (int j = cmpAttrs.Length - 1; j >= 0; j --) {
-                                       if (!paramTypes [j].Equals (cmpAttrs [j]))
+                                       if (!TypeManager.IsEqual (paramTypes [j], cmpAttrs [j]))
                                                goto next;
                                }
                                
@@ -1894,7 +2305,7 @@ namespace Mono.CSharp {
                                        // 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 ||
+                                       if (invocationType.Equals (entry.Container.Type) ||
                                            TypeManager.IsNestedChildOf (invocationType, entry.Container.Type))
                                                return entry.Member;
                                        
@@ -1921,5 +2332,146 @@ namespace Mono.CSharp {
                        
                        return null;
                }
+
+               /// <summary>
+               /// The method is looking for conflict with inherited symbols (errors CS0108, CS0109).
+               /// We handle two cases. The first is for types without parameters (events, field, properties).
+               /// The second are methods, indexers and this is why ignore_complex_types is here.
+               /// The latest param is temporary hack. See DoDefineMembers method for more info.
+               /// </summary>
+               public MemberInfo FindMemberWithSameName (string name, bool ignore_complex_types, MemberInfo ignore_member)
+               {
+                       ArrayList applicable = null;
+                       if (method_hash != null)
+                               applicable = (ArrayList) method_hash [name];
+                       if (applicable != null) {
+                               for (int i = applicable.Count - 1; i >= 0; i--) {
+                                       CacheEntry entry = (CacheEntry) applicable [i];
+                                       if ((entry.EntryType & EntryType.Public) != 0)
+                                               return entry.Member;
+                               }
+                       }
+                       if (member_hash == null)
+                               return null;
+                       applicable = (ArrayList) member_hash [name];
+                       
+                       if (applicable != null) {
+                               for (int i = applicable.Count - 1; i >= 0; i--) {
+                                       CacheEntry entry = (CacheEntry) applicable [i];
+                                       if ((entry.EntryType & EntryType.Public) != 0 & entry.Member != ignore_member) {
+                                               if (ignore_complex_types) {
+                                                       if ((entry.EntryType & EntryType.Method) != 0)
+                                                               continue;
+                                                       // Does exist easier way how to detect indexer ?
+                                                       if ((entry.EntryType & EntryType.Property) != 0) {
+                                                               Type[] arg_types = TypeManager.GetArgumentTypes ((PropertyInfo)entry.Member);
+                                                               if (arg_types.Length > 0)
+                                                                       continue;
+                                                       }
+                                               }
+                                               return entry.Member;
+                                       }
+                               }
+                       }
+                       return null;
+               }
+
+               Hashtable locase_table;
+               /// <summary>
+               /// Builds low-case table for CLS Compliance test
+               /// </summary>
+               public Hashtable GetPublicMembers ()
+               {
+                       if (locase_table != null)
+                               return locase_table;
+                       locase_table = new Hashtable ();
+                       foreach (DictionaryEntry entry in member_hash) {
+                               ArrayList members = (ArrayList)entry.Value;
+                               for (int ii = 0; ii < members.Count; ++ii) {
+                                       CacheEntry member_entry = (CacheEntry) members [ii];
+                                       if ((member_entry.EntryType & EntryType.Public) == 0)
+                                               continue;
+                                       // TODO: Does anyone know easier way how to detect that member is internal ?
+                                       switch (member_entry.EntryType & EntryType.MaskType) {
+                                               case EntryType.Constructor:
+                                                       continue;
+                                               case EntryType.Field:
+                                                       if ((((FieldInfo)member_entry.Member).Attributes & (FieldAttributes.Assembly | FieldAttributes.Public)) == FieldAttributes.Assembly)
+                                                               continue;
+                                                       break;
+                                               case EntryType.Method:
+                                                       if ((((MethodInfo)member_entry.Member).Attributes & (MethodAttributes.Assembly | MethodAttributes.Public)) == MethodAttributes.Assembly)
+                                                               continue;
+                                                       break;
+                                               case EntryType.Property:
+                                                       PropertyInfo pi = (PropertyInfo)member_entry.Member;
+                                                       if (pi.GetSetMethod () == null && pi.GetGetMethod () == null)
+                                                               continue;
+                                                       break;
+                                               case EntryType.Event:
+                                                       EventInfo ei = (EventInfo)member_entry.Member;
+                                                       MethodInfo mi = ei.GetAddMethod ();
+                                                       if ((mi.Attributes & (MethodAttributes.Assembly | MethodAttributes.Public)) == MethodAttributes.Assembly)
+                                                               continue;
+                                                       break;
+                                       }
+                                       string lcase = ((string)entry.Key).ToLower (System.Globalization.CultureInfo.InvariantCulture);
+                                       locase_table [lcase] = member_entry.Member;
+                                       break;
+                               }
+                       }
+                       return locase_table;
+               }
+               public Hashtable Members {
+                       get {
+                               return member_hash;
+                       }
+               }
+               /// <summary>
+               /// Cls compliance check whether methods or constructors parameters differing only in ref or out, or in array rank
+               /// </summary>
+               public void VerifyClsParameterConflict (ArrayList al, MethodCore method, MemberInfo this_builder)
+               {
+                       EntryType tested_type = (method is Constructor ? EntryType.Constructor : EntryType.Method) | EntryType.Public;
+                       for (int i = 0; i < al.Count; ++i) {
+                               MemberCache.CacheEntry entry = (MemberCache.CacheEntry) al [i];
+               
+                               // skip itself
+                               if (entry.Member == this_builder)
+                                       continue;
+               
+                               if ((entry.EntryType & tested_type) != tested_type)
+                                       continue;
+               
+                               MethodBase method_to_compare = (MethodBase)entry.Member;
+                               if (AttributeTester.AreOverloadedMethodParamsClsCompliant (method.ParameterTypes, TypeManager.GetArgumentTypes (method_to_compare)))
+                                       continue;
+
+                               IMethodData md = TypeManager.GetMethod (method_to_compare);
+
+                               // TODO: now we are ignoring CLSCompliance(false) on method from other assembly which is buggy.
+                               // However it is exactly what csc does.
+                               if (md != null && !md.IsClsCompliaceRequired (method.Parent))
+                                       continue;
+               
+                               Report.SymbolRelatedToPreviousError (entry.Member);
+                               Report.Error (3006, method.Location, "Overloaded method '{0}' differing only in ref or out, or in array rank, is not CLS-compliant", method.GetSignatureForError ());
+                       }
+               }
        }
 }