* Makefile (centum_tests): Add Mono.Security and
[mono.git] / mcs / gmcs / decl.cs
old mode 100755 (executable)
new mode 100644 (file)
index bbddec4..28b142c
@@ -7,6 +7,7 @@
 // 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
 //
@@ -17,6 +18,7 @@ using System.Collections;
 using System.Globalization;
 using System.Reflection.Emit;
 using System.Reflection;
+using System.Xml;
 
 namespace Mono.CSharp {
 
@@ -39,6 +41,11 @@ namespace Mono.CSharp {
                        this.TypeArguments = args;
                }
 
+               public MemberName (MemberName left, string name)
+                       : this (left, name, null)
+               {
+               }
+
                public MemberName (MemberName left, string name, TypeArguments args)
                        : this (name, args)
                {
@@ -48,6 +55,22 @@ namespace Mono.CSharp {
                public MemberName (MemberName left, MemberName right)
                        : this (left, right.Name, right.TypeArguments)
                {
+                       Name = right.Name;
+                       Left = (right.Left == null) ? left : new MemberName (left, right.Left);
+                       TypeArguments = right.TypeArguments;
+               }
+
+               static readonly char [] dot_array = { '.' };
+
+               public static MemberName FromDotted (string name)
+               {
+                       string [] elements = name.Split (dot_array);
+                       int count = elements.Length;
+                       int i = 0;
+                       MemberName n = new MemberName (elements [i++]);
+                       while (i < count)
+                               n = new MemberName (n, elements [i++]);
+                       return n;
                }
 
                public string GetName ()
@@ -87,17 +110,12 @@ namespace Mono.CSharp {
                        }
                }
 
-               public string GetFullName ()
+               public string GetMethodName ()
                {
-                       string full_name;
-                       if (TypeArguments != null)
-                               full_name = Name + "<" + TypeArguments + ">";
-                       else
-                               full_name = Name;
                        if (Left != null)
-                               return Left.GetFullName () + "." + full_name;
+                               return Left.GetTypeName () + "." + Name;
                        else
-                               return full_name;
+                               return Name;
                }
 
                public static string MakeName (string name, TypeArguments args)
@@ -115,7 +133,6 @@ namespace Mono.CSharp {
 
                public string GetTypeName ()
                {
-                       string suffix = "";
                        if (Left != null)
                                return Left.GetTypeName () + "." +
                                        MakeName (Name, TypeArguments);
@@ -123,20 +140,58 @@ namespace Mono.CSharp {
                                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);
 
                                return new MemberAccess (lexpr, Name, TypeArguments, loc);
                        } else {
                                if (TypeArguments != null)
-                                       return new ConstructedType (Name, TypeArguments, loc);
+                                       return new SimpleName (Basename, TypeArguments, loc);
                                else
                                        return new SimpleName (Name, loc);
                        }
                }
 
+               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)
@@ -159,6 +214,43 @@ namespace Mono.CSharp {
                        else
                                return full_name;
                }
+
+               public override bool Equals (object other)
+               {
+                       return Equals (other as MemberName);
+               }
+
+               public bool Equals (MemberName other)
+               {
+                       if (this == other)
+                               return true;
+                       if (other == null || Name != other.Name)
+                               return false;
+
+                       if ((TypeArguments != null) &&
+                           (other.TypeArguments == null || TypeArguments.Count != other.TypeArguments.Count))
+                               return false;
+
+                       if ((TypeArguments == null) && (other.TypeArguments != null))
+                               return false;
+
+                       if (Left == null)
+                               return other.Left == null;
+
+                       return Left.Equals (other.Left);
+               }
+
+               public override int GetHashCode ()
+               {
+                       int hash = Name.GetHashCode ();
+                       for (MemberName n = Left; n != null; n = n.Left)
+                               hash ^= n.Name.GetHashCode ();
+
+                       if (TypeArguments != null)
+                               hash ^= TypeArguments.Count << 5;
+
+                       return hash & 0x7FFFFFFF;
+               }
        }
 
        /// <summary>
@@ -169,22 +261,45 @@ namespace Mono.CSharp {
                /// <summary>
                ///   Public name
                /// </summary>
-               public string Name;
 
-               public readonly MemberName MemberName;
+               protected string cached_name;
+               public string Name {
+                       get {
+                               if (cached_name == null)
+                                       cached_name = MemberName.GetName (!(this is GenericMethod) && !(this is Method));
+                               return cached_name;
+                       }
+               }
+
+                // Is not readonly because of IndexerName attribute
+               private MemberName member_name;
+               public MemberName MemberName {
+                       get { return member_name; }
+               }
 
                /// <summary>
                ///   Modifier flags that the user specified in the source code
                /// </summary>
                public int ModFlags;
 
-               public readonly TypeContainer Parent;
+               public /*readonly*/ TypeContainer Parent;
 
                /// <summary>
                ///   Location where this declaration happens
                /// </summary>
                public readonly Location Location;
 
+               /// <summary>
+               ///   XML documentation comment
+               /// </summary>
+               public string DocComment;
+
+               /// <summary>
+               ///   Represents header string for documentation comment 
+               ///   for each member types.
+               /// </summary>
+               public abstract string DocCommentHeader { get; }
+
                [Flags]
                public enum Flags {
                        Obsolete_Undetected = 1,                // Obsolete attribute has not been detected yet
@@ -196,26 +311,35 @@ namespace Mono.CSharp {
                        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
-
+                       Excluded = 1 << 9,                                      // Method is conditional
+                       TestMethodDuplication = 1 << 10,                // Test for duplication must be performed
+                       IsUsed = 1 << 11
                }
   
                /// <summary>
                ///   MemberCore flags at first detected then cached
                /// </summary>
-               protected Flags caching_flags;
+               internal Flags caching_flags;
 
                public MemberCore (TypeContainer parent, MemberName name, Attributes attrs,
                                   Location loc)
                        : base (attrs)
                {
+                       if (parent is PartialContainer && !(this is PartialContainer))
+                               throw new InternalErrorException ("A PartialContainer cannot be the direct parent of a member");
+
                        Parent = parent;
-                       Name = name.GetName (!(this is GenericMethod) && !(this is Method));
-                       MemberName = name;
+                       member_name = name;
                        Location = loc;
                        caching_flags = Flags.Obsolete_Undetected | Flags.ClsCompliance_Undetected | Flags.HasCompliantAttribute_Undetected | Flags.Excluded_Undetected;
                }
 
+               protected virtual void SetMemberName (MemberName new_name)
+               {
+                       member_name = new_name;
+                       cached_name = null;
+               }
+
                /// <summary>
                /// Tests presence of ObsoleteAttribute and report proper error
                /// </summary>
@@ -241,12 +365,22 @@ namespace Mono.CSharp {
                        return Name;
                }
 
+               /// <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 ()
                {
-                       VerifyObsoleteAttribute ();
+                       // Hack with Parent == null is for EnumMember
+                       if (Parent == null || (GetObsoleteAttribute (Parent) == null && Parent.GetObsoleteAttribute (Parent) == null))
+                               VerifyObsoleteAttribute ();
 
                        if (!RootContext.VerifyClsCompliance)
                                return;
@@ -254,6 +388,23 @@ namespace Mono.CSharp {
                        VerifyClsCompliance (Parent);
                }
 
+               public bool InUnsafe {
+                       get {
+                               return ((ModFlags & Modifiers.UNSAFE) != 0) || Parent.UnsafeContext;
+                       }
+               }
+
+               public virtual bool IsUsed {
+                       get {
+                               return (caching_flags & Flags.IsUsed) != 0;
+                       }
+               }
+
+               public void SetMemberIsUsed ()
+               {
+                       caching_flags |= Flags.IsUsed;
+               }
+
                // 
                // Whehter is it ok to use an unsafe pointer in this type container
                //
@@ -287,15 +438,12 @@ namespace Mono.CSharp {
                        if (OptAttributes == null)
                                return null;
 
-                       // TODO: remove this allocation
-                       EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
-                               null, null, ds.ModFlags, false);
-
-                       Attribute obsolete_attr = OptAttributes.Search (TypeManager.obsolete_attribute_type, ec);
+                       Attribute obsolete_attr = OptAttributes.Search (
+                               TypeManager.obsolete_attribute_type, ds.EmitContext);
                        if (obsolete_attr == null)
                                return null;
 
-                       ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds);
+                       ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds.EmitContext);
                        if (obsolete == null)
                                return null;
 
@@ -324,7 +472,7 @@ namespace Mono.CSharp {
                /// <summary>
                /// Returns true when MemberCore is exposed from assembly.
                /// </summary>
-               protected bool IsExposedFromAssembly (DeclSpace ds)
+               public bool IsExposedFromAssembly (DeclSpace ds)
                {
                        if ((ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
                                return false;
@@ -344,12 +492,11 @@ namespace Mono.CSharp {
                bool GetClsCompliantAttributeValue (DeclSpace ds)
                {
                        if (OptAttributes != null) {
-                               EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
-                                                                 null, null, ds.ModFlags, false);
-                               Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
+                               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);
+                                       return cls_attribute.GetClsCompliantAttributeValue (ds.EmitContext);
                                }
                        }
                        return ds.GetClsCompliantAttributeValue ();
@@ -365,70 +512,11 @@ namespace Mono.CSharp {
                }
 
                /// <summary>
-               /// This method is used to testing error 3005 (Method or parameter name collision).
+               /// It helps to handle error 102 & 111 detection
                /// </summary>
-               protected abstract bool IsIdentifierClsCompliant (DeclSpace ds);
-
-               /// <summary>
-               /// Common helper method for identifier and parameters CLS-Compliant testing.
-               /// When return false error 3005 is reported. True means no violation.
-               /// And error 3006 tests are peformed here because of speed.
-               /// </summary>
-               protected bool IsIdentifierAndParamClsCompliant (DeclSpace ds, string name, MemberInfo methodBuilder, Type[] paramTypes)
+               public virtual bool MarkForDuplicationCheck ()
                {
-                       MemberList ml = ds.FindMembers (MemberTypes.Event | MemberTypes.Field | MemberTypes.Method | MemberTypes.Property, 
-                               BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, System.Type.FilterNameIgnoreCase, name);
-               
-                       if (ml.Count < 2)
-                               return true;
-
-                       bool error3006 = false;
-                       for (int i = 0; i < ml.Count; ++i) {
-                               MemberInfo mi = ml [i];
-                               if (name == mi.Name) {
-                                       MethodBase method = mi as MethodBase;
-                                       if (method == null || method == methodBuilder || paramTypes == null || paramTypes.Length == 0)
-                                               continue;
-
-                                       if (AttributeTester.AreOverloadedMethodParamsClsCompliant (paramTypes, TypeManager.GetArgumentTypes (method))) {
-                                               error3006 = false;
-                                               continue;
-                                       }
-
-                                       error3006 = true;
-                               }
-
-                               // We need to test if member is not marked as CLSCompliant (false) and if type is not only internal
-                               // because BindingFlags.Public returns internal types too
-                               DeclSpace temp_ds = TypeManager.LookupDeclSpace (mi.DeclaringType);
-
-                               // Type is external, we can get attribute directly
-                               if (temp_ds == null) {
-                                       object[] cls_attribute = mi.GetCustomAttributes (TypeManager.cls_compliant_attribute_type, false);
-                                       if (cls_attribute.Length == 1 && (!((CLSCompliantAttribute)cls_attribute[0]).IsCompliant))
-                                               continue;
-                               } else {
-                                       string tmp_name = String.Concat (temp_ds.Name, '.', mi.Name);
-
-                                       MemberCore mc = temp_ds.GetDefinition (tmp_name) as MemberCore;
-                                       if (!mc.IsClsCompliaceRequired (ds))
-                                               continue;
-                               }
-
-                               for (int ii = 0; ii < ml.Count; ++ii) {
-                                       mi = ml [ii];
-                                       if (name == mi.Name)
-                                               continue;
-                                       Report.SymbolRelatedToPreviousError (mi);
-                               }
-
-                               if (error3006)
-                                       Report.Error_T (3006, Location, GetSignatureForError ());
-
-                               return error3006;
-
-                       }
-                       return true;
+                       return false;
                }
 
                /// <summary>
@@ -440,32 +528,59 @@ namespace Mono.CSharp {
                protected virtual bool VerifyClsCompliance (DeclSpace ds)
                {
                        if (!IsClsCompliaceRequired (ds)) {
-                               if (HasClsCompliantAttribute && !IsExposedFromAssembly (ds)) {
-                                       Report.Warning_T (3019, Location, GetSignatureForError ());
+                               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_T (3014, Location, GetSignatureForError ());
+                                       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_T (3008, Location, GetSignatureForError () );
-                       }
-
-                       if (!IsIdentifierClsCompliant (ds)) {
-                               Report.Error_T (3005, Location, GetSignatureForError ());
+                               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>
@@ -488,7 +603,7 @@ namespace Mono.CSharp {
                ///   currently defining.  We need to lookup members on this
                ///   instead of the TypeBuilder.
                /// </summary>
-               public TypeExpr CurrentType;
+               public Type CurrentType;
 
                //
                // This is the namespace in which this typecontainer
@@ -496,17 +611,22 @@ namespace Mono.CSharp {
                //
                public NamespaceEntry NamespaceEntry;
 
-               public Hashtable Cache = new Hashtable ();
+               private Hashtable Cache = new Hashtable ();
                
-               public string Basename;
+               public readonly string Basename;
                
-               /// <summary>
-               ///   defined_names is used for toplevel objects
-               /// </summary>
                protected Hashtable defined_names;
 
                readonly bool is_generic;
                readonly int count_type_params;
+               readonly int count_current_type_params;
+
+               // The emit context for toplevel objects.
+               protected EmitContext ec;
+               
+               public EmitContext EmitContext {
+                       get { return ec; }
+               }
 
                //
                // Whether we are Generic
@@ -529,138 +649,70 @@ namespace Mono.CSharp {
                        : base (parent, name, attrs, l)
                {
                        NamespaceEntry = ns;
-                       Basename = name.Name;
+                       Basename = name.Basename;
                        defined_names = new Hashtable ();
                        if (name.TypeArguments != null) {
                                is_generic = true;
-                               count_type_params = name.TypeArguments.Count;
+                               count_type_params = count_current_type_params = name.TypeArguments.Count;
                        }
                        if (parent != null)
                                count_type_params += parent.count_type_params;
                }
 
-               public void RecordDecl ()
-               {
-                       if ((NamespaceEntry != null) && (Parent == RootContext.Tree.Types))
-                               NamespaceEntry.DefineName (MemberName.Basename, this);
-               }
-
-               /// <summary>
-               ///   The result value from adding an declaration into
-               ///   a struct or a class
-               /// </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
-               }
-
                /// <summary>
-               ///   Returns a status code based purely on the name
-               ///   of the member being added
+               /// Adds the member to defined_names table. It tests for duplications and enclosing name conflicts
                /// </summary>
-               protected AdditionResult IsValid (string basename, string name)
-               {
-                       if (basename == Basename)
-                               return AdditionResult.EnclosingClash;
+               protected bool AddToContainer (MemberCore symbol, string name)
+               {
+                       if (name == Basename && !(this is Interface) && !(this is Enum)) {
+                               if (symbol is TypeParameter)
+                                       Report.Error (694, "Type parameter `{0}' has same name as " +
+                                                     "containing type or method", name);
+                               else {
+                                       Report.SymbolRelatedToPreviousError (this);
+                                       Report.Error (542, "'{0}': member names cannot be the same as their " +
+                                                     "enclosing type", symbol.Location, symbol.GetSignatureForError ());
+                               }
+                               return false;
+                       }
 
-                       if (defined_names.Contains (name))
-                               return AdditionResult.NameExists;
+                       MemberCore mc = (MemberCore) defined_names [name];
 
-                       return AdditionResult.Success;
-               }
+                       if (mc == null) {
+                               defined_names.Add (name, symbol);
+                               return true;
+                       }
 
-               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)
-               {
-                       defined_names.Add (name, o);
+                       if (symbol.MarkForDuplicationCheck () && mc.MarkForDuplicationCheck ())
+                               return true;
 
-#if DEBUGME
-                       int p = name.LastIndexOf ('.');
-                       int l = name.Length;
-                       length += l;
-                       small += l -p;
-#endif
+                       if (symbol is TypeParameter)
+                               Report.Error (692, symbol.Location, "Duplicate type parameter `{0}'", name);
+                       else {
+                               Report.SymbolRelatedToPreviousError (mc);
+                               Report.Error (102, symbol.Location,
+                                             "The type '{0}' already contains a definition for '{1}'",
+                                             GetSignatureForError (), name);
+                       }
+                       return false;
                }
 
-               /// <summary>
-               ///   Returns the object associated with a given name in the declaration
-               ///   space.  This is the inverse operation of `DefineName'
-               /// </summary>
-               public object GetDefinition (string name)
+               public void RecordDecl ()
                {
-                       return defined_names [name];
-               }
-               
-               bool in_transit = false;
-               
-               /// <summary>
-               ///   This function is used to catch recursive definitions
-               ///   in declarations.
-               /// </summary>
-               public bool InTransit {
-                       get {
-                               return in_transit;
-                       }
-
-                       set {
-                               in_transit = value;
-                       }
+                       if ((NamespaceEntry != null) && (Parent == RootContext.Tree.Types))
+                               NamespaceEntry.DefineName (MemberName.Basename, this);
                }
 
                /// <summary>
-               ///   Looks up the alias for the name
+               ///   Returns the MemberCore associated with a given name in the declaration
+               ///   space. It doesn't return method based symbols !!
                /// </summary>
-               public IAlias LookupAlias (string name)
+               /// 
+               public MemberCore GetDefinition (string name)
                {
-                       if (NamespaceEntry != null)
-                               return NamespaceEntry.LookupAlias (name);
-                       else
-                               return null;
+                       return (MemberCore)defined_names [name];
                }
-               
+
                // 
                // root_types contains all the types.  All TopLevel types
                // hence have a parent that points to `root_types', that is
@@ -697,6 +749,12 @@ namespace Mono.CSharp {
                        }
                }
 
+               protected virtual TypeAttributes TypeAttr {
+                       get {
+                               return CodeGen.Module.DefaultCharSetType;
+                       }
+               }
+
                /// <remarks>
                ///  Should be overriten by the appropriate declaration space
                /// </remarks>
@@ -721,123 +779,43 @@ namespace Mono.CSharp {
                        }
                }
 
-               public static string MakeFQN (string nsn, string name)
-               {
-                       if (nsn == "")
-                               return name;
-                       return String.Concat (nsn, ".", name);
-               }
-
                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)
-               {
-                       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_T (122, loc, d.Name);
-                               return null;
-                       }
-
-                       Type t = d.ResolveType (type_resolve_ec);
-                       if (t == null)
-                               return null;
-
-                       TypeContainer tc = TypeManager.LookupTypeContainer (t);
-                       if ((tc != null) && tc.IsGeneric) {
-                               if (!IsGeneric) {
-                                       int tnum = TypeManager.GetNumberOfTypeArguments (t);
-                                       Report.Error (305, loc,
-                                                     "Using the generic type `{0}' " +
-                                                     "requires {1} type arguments",
-                                                     TypeManager.GetFullName (t), tnum);
-                                       return null;
+               protected EmitContext TypeResolveEmitContext {
+                       get {
+                               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, Location.Null, null, null, ModFlags, false);
                                }
-
-                               ConstructedType ctype = new ConstructedType (
-                                       t, TypeParameters, loc);
-
-                               t = ctype.ResolveType (type_resolve_ec);
+                               return type_resolve_ec;
                        }
-
-                       return t;
                }
 
                // <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);
-                       type_resolve_ec.loc = loc;
+                       TypeResolveEmitContext.loc = loc;
+                       TypeResolveEmitContext.ContainerType = TypeBuilder;
                        if (this is GenericMethod)
-                               type_resolve_ec.ContainerType = Parent.TypeBuilder;
+                               TypeResolveEmitContext.ContainerType = Parent.TypeBuilder;
                        else
-                               type_resolve_ec.ContainerType = TypeBuilder;
-
-                       int errors = Report.Errors;
+                               TypeResolveEmitContext.ContainerType = TypeBuilder;
 
-                       TypeExpr d = e.ResolveAsTypeTerminal (type_resolve_ec);
-
-                       if ((d != null) && (d.eclass == ExprClass.Type))
-                               return d;
-
-                       if (silent || (Report.Errors != errors))
-                               return null;
-
-                       if (e is SimpleName){
-                               SimpleName s = new SimpleName (((SimpleName) e).Name, loc);
-                               d = s.ResolveAsTypeTerminal (type_resolve_ec);
-
-                               if ((d == null) || (d.Type == null)) {
-                                       Report.Error (246, loc, "Cannot find type `{0}'", e);
-                                       return null;
-                               }
-
-                               int num_args = TypeManager.GetNumberOfTypeArguments (d.Type);
-
-                               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 (TypeResolveEmitContext);
                }
                
                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;
@@ -848,6 +826,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
                        
@@ -867,10 +851,11 @@ namespace Mono.CSharp {
 
                        case TypeAttributes.NotPublic:
 
-                               // In same cases is null.
                                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.
                                //
@@ -880,25 +865,7 @@ namespace Mono.CSharp {
                                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:
                                //
@@ -923,24 +890,20 @@ 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;
+                       return TypeBuilder == declaring ||
+                               TypeManager.IsNestedChildOf (TypeBuilder, declaring);
+               }
 
-                       string check_type_name = check_type.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 (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.
@@ -1043,69 +1006,6 @@ namespace Mono.CSharp {
 
                        return ~ (~ mAccess | pAccess) == 0;
                }
-               
-               static DoubleHash dh = new DoubleHash (1000);
-
-               Type DefineTypeAndParents (DeclSpace tc)
-               {
-                       DeclSpace container = tc.Parent;
-
-                       if (container.TypeBuilder == null && container.Name != "")
-                               DefineTypeAndParents (container);
-
-                       return tc.DefineType ();
-               }
-               
-               Type LookupInterfaceOrClass (string ns, string name, out bool error)
-               {
-                       DeclSpace parent;
-                       Type t;
-                       object r;
-                       
-                       error = false;
-
-                       if (dh.Lookup (ns, name, out r))
-                               return (Type) r;
-                       else {
-                               if (ns != ""){
-                                       if (Namespace.IsNamespace (ns)){
-                                               string fullname = (ns != "") ? ns + "." + name : name;
-                                               t = TypeManager.LookupType (fullname);
-                                       } else
-                                               t = null;
-                               } else
-                                       t = TypeManager.LookupType (name);
-                       }
-                       
-                       if (t != null) {
-                               dh.Insert (ns, name, t);
-                               return t;
-                       }
-
-                       //
-                       // In case we are fed a composite name, normalize it.
-                       //
-                       int p = name.LastIndexOf ('.');
-                       if (p != -1){
-                               ns = MakeFQN (ns, name.Substring (0, p));
-                               name = name.Substring (p+1);
-                       }
-                       
-                       parent = RootContext.Tree.LookupByNamespace (ns, name);
-                       if (parent == null) {
-                               dh.Insert (ns, name, null);
-                               return null;
-                       }
-
-                       t = DefineTypeAndParents (parent);
-                       if (t == null){
-                               error = true;
-                               return null;
-                       }
-                       
-                       dh.Insert (ns, name, t);
-                       return t;
-               }
 
                public static void Error_AmbiguousTypeReference (Location loc, string name, string t1, string t2)
                {
@@ -1114,153 +1014,70 @@ namespace Mono.CSharp {
                                      name, t1, t2);
                }
 
-               public Type FindNestedType (Location loc, string name,
-                                           out DeclSpace containing_ds)
+               //
+               // Return the nested type with name @name.  Ensures that the nested type
+               // is defined if necessary.  Do _not_ use this when you have a MemberCache handy.
+               //
+               public virtual Type FindNestedType (string name)
                {
-                       Type t;
-                       bool error;
-
-                       containing_ds = this;
-                       while (containing_ds != null){
-                               Type container_type = containing_ds.TypeBuilder;
-                               Type current_type = container_type;
-
-                               while (current_type != null && current_type != TypeManager.object_type) {
-                                       string pre = current_type.FullName;
-
-                                       t = LookupInterfaceOrClass (pre, name, out error);
-                                       if (error)
-                                               return null;
-
-                                       if ((t != null) && containing_ds.CheckAccessLevel (t))
-                                               return t;
-
-                                       current_type = current_type.BaseType;
-                               }
-                               containing_ds = containing_ds.Parent;
-                       }
-
                        return null;
                }
 
-               /// <summary>
-               ///   GetType is used to resolve type names at the DeclSpace level.
-               ///   Use this to lookup class/struct bases, interface bases or 
-               ///   delegate type references
-               /// </summary>
-               ///
-               /// <remarks>
-               ///   Contrast this to LookupType which is used inside method bodies to 
-               ///   lookup types that have already been defined.  GetType is used
-               ///   during the tree resolution process and potentially define
-               ///   recursively the type
-               /// </remarks>
-               public Type FindType (Location loc, string name)
+               private Type LookupNestedTypeInHierarchy (string name)
                {
-                       Type t;
-                       bool error;
-
-                       //
-                       // For the case the type we are looking for is nested within this one
-                       // or is in any base class
-                       //
-                       DeclSpace containing_ds = this;
-
-                       while (containing_ds != null){
-                               Type container_type = containing_ds.TypeBuilder;
-                               Type current_type = container_type;
+                       // if the member cache has been created, lets use it.
+                       // the member cache is MUCH faster.
+                       if (MemberCache != null)
+                               return MemberCache.FindNestedType (name);
 
-                               while (current_type != null && current_type != TypeManager.object_type) {
-                                       string pre = current_type.FullName;
-
-                                       t = LookupInterfaceOrClass (pre, name, out error);
-                                       if (error)
-                                               return null;
-
-                                       if ((t != null) && containing_ds.CheckAccessLevel (t))
-                                               return t;
-
-                                       current_type = current_type.BaseType;
+                       // no member cache. Do it the hard way -- reflection
+                       Type t = null;
+                       for (Type current_type = TypeBuilder;
+                            current_type != null && current_type != TypeManager.object_type;
+                            current_type = current_type.BaseType) {
+                               if (current_type is TypeBuilder) {
+                                       DeclSpace decl = this;
+                                       if (current_type != TypeBuilder)
+                                               decl = TypeManager.LookupDeclSpace (current_type);
+                                       t = decl.FindNestedType (name);
+                               } else {
+                                       t = TypeManager.GetNestedType (current_type, name);
                                }
-                               containing_ds = containing_ds.Parent;
-                       }
-
-                       //
-                       // Attempt to lookup the class on our namespace and all it's implicit parents
-                       //
-                       for (NamespaceEntry ns = NamespaceEntry; ns != null; ns = ns.ImplicitParent) {
-                               t = LookupInterfaceOrClass (ns.FullName, name, out error);
-                               if (error)
-                                       return null;
 
-                               if (t != null)
+                               if (t != null && CheckAccessLevel (t))
                                        return t;
                        }
-                       
-                       //
-                       // Attempt to do a direct unqualified lookup
-                       //
-                       t = LookupInterfaceOrClass ("", name, out error);
-                       if (error)
-                               return null;
-                       
-                       if (t != null)
-                               return t;
-                       
-                       //
-                       // Attempt to lookup the class on any of the `using'
-                       // namespaces
-                       //
-
-                       for (NamespaceEntry ns = NamespaceEntry; ns != null; ns = ns.Parent){
-
-                               t = LookupInterfaceOrClass (ns.FullName, name, out error);
-                               if (error)
-                                       return null;
 
-                               if (t != null)
-                                       return t;
-
-                               if (name.IndexOf ('.') > 0)
-                                       continue;
+                       return null;
+               }
 
-                               IAlias alias_value = ns.LookupAlias (name);
-                               if (alias_value != null) {
-                                       t = LookupInterfaceOrClass ("", alias_value.Name, out error);
-                                       if (error)
-                                               return null;
+               //
+               // Public function used to locate types, this can only
+               // be used after the ResolveTree function has been invoked.
+               //
+               // Set 'ignore_cs0104' to true if you want to ignore cs0104 errors.
+               //
+               // Returns: Type or null if they type can not be found.
+               //
+               public FullNamedExpression LookupType (string name, Location loc, bool ignore_cs0104)
+               {
+                       if (this is PartialContainer)
+                               throw new InternalErrorException ("Should not get here");
 
-                                       if (t != null)
-                                               return t;
-                               }
+                       if (Cache.Contains (name))
+                               return (FullNamedExpression) Cache [name];
 
-                               //
-                               // Now check the using clause list
-                               //
-                               Type match = null;
-                               foreach (Namespace using_ns in ns.GetUsingTable ()) {
-                                       match = LookupInterfaceOrClass (using_ns.Name, name, out error);
-                                       if (error)
-                                               return null;
-
-                                       if (match != null) {
-                                               if (t != null){
-                                                       if (CheckAccessLevel (match)) {
-                                                               Error_AmbiguousTypeReference (loc, name, t.FullName, match.FullName);
-                                                               return null;
-                                                       }
-                                                       continue;
-                                               }
-                                               
-                                               t = match;
-                                       }
-                               }
-                               if (t != null)
-                                       return t;
-                       }
+                       FullNamedExpression e;
+                       Type t = LookupNestedTypeInHierarchy (name);
+                       if (t != null)
+                               e = new TypeExpression (t, Location.Null);
+                       else if (Parent != null && Parent != RootContext.Tree.Types)
+                               e = Parent.LookupType (name, loc, ignore_cs0104);
+                       else
+                               e = NamespaceEntry.LookupNamespaceOrType (this, name, loc, ignore_cs0104);
 
-                       //Report.Error (246, Location, "Can not find type `"+name+"'");
-                       return null;
+                       Cache [name] = e;
+                       return e;
                }
 
                /// <remarks>
@@ -1281,17 +1098,11 @@ namespace Mono.CSharp {
 
                public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
                {
-                       try {
-                               TypeBuilder.SetCustomAttribute (cb);
-                       } catch (System.ArgumentException e) {
-                               Report.Warning (-21, a.Location,
-                                               "The CharSet named property on StructLayout\n"+
-                                               "\tdoes not work correctly on Microsoft.NET\n"+
-                                               "\tYou might want to remove the CharSet declaration\n"+
-                                               "\tor compile using the Mono runtime instead of the\n"+
-                                               "\tMicrosoft .NET runtime\n"+
-                                               "\tThe runtime gave the error: " + e);
+                       if (a.Type == TypeManager.required_attr_type) {
+                               Report.Error (1608, a.Location, "The RequiredAttribute attribute is not permitted on C# types");
+                               return;
                        }
+                       TypeBuilder.SetCustomAttribute (cb);
                }
 
                /// <summary>
@@ -1306,12 +1117,10 @@ namespace Mono.CSharp {
                        caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
 
                        if (OptAttributes != null) {
-                               EmitContext ec = new EmitContext (Parent, this, Location,
-                                                                 null, null, ModFlags, false);
-                               Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
+                               Attribute cls_attribute = OptAttributes.Search (TypeManager.cls_compliant_attribute_type, ec);
                                if (cls_attribute != null) {
                                        caching_flags |= Flags.HasClsCompliantAttribute;
-                                       if (cls_attribute.GetClsCompliantAttributeValue (this)) {
+                                       if (cls_attribute.GetClsCompliantAttributeValue (ec)) {
                                                caching_flags |= Flags.ClsCompliantAttributeTrue;
                                                return true;
                                        }
@@ -1334,49 +1143,6 @@ namespace Mono.CSharp {
                        return false;
                }
 
-
-               // Tests container name for CLS-Compliant name (differing only in case)
-               // Possible optimalization: search in same namespace only
-               protected override bool IsIdentifierClsCompliant (DeclSpace ds)
-               {
-                       int l = Name.Length;
-
-                       if (Namespace.LookupNamespace (NamespaceEntry.FullName, false) != null) {
-                               // Seek through all imported types
-                               foreach (string type_name in TypeManager.all_imported_types.Keys) 
-                               {
-                                       if (l != type_name.Length)
-                                               continue;
-
-                                       if (String.Compare (Name, type_name, true, CultureInfo.InvariantCulture) == 0 && 
-                                               AttributeTester.IsClsCompliant (TypeManager.all_imported_types [type_name] as Type)) {
-                                               Report.SymbolRelatedToPreviousError ((Type)TypeManager.all_imported_types [type_name]);
-                                               return false;
-                               }
-                       }
-                       }
-
-                       // Seek through generated types
-                       foreach (string name in RootContext.Tree.Decls.Keys) {
-                               if (l != name.Length)
-                                       continue;
-
-                               if (String.Compare (Name, name, true, CultureInfo.InvariantCulture) == 0) { 
-
-                                       if (Name == name)
-                                               continue;
-                                       
-                                       DeclSpace found_ds = RootContext.Tree.Decls[name] as DeclSpace;
-                                       if (found_ds.IsClsCompliaceRequired (found_ds.Parent)) {
-                                               Report.SymbolRelatedToPreviousError (found_ds.Location, found_ds.GetSignatureForError ());
-                                               return false;
-                               }
-                       }
-                       }
-
-                       return true;
-               }
-
                //
                // Extensions for generics
                //
@@ -1449,17 +1215,16 @@ namespace Mono.CSharp {
                        return type_param_list;
                }
 
-               public AdditionResult SetParameterInfo (ArrayList constraints_list)
+               public virtual void SetParameterInfo (ArrayList constraints_list)
                {
                        if (!is_generic) {
                                if (constraints_list != null) {
                                        Report.Error (
                                                80, Location, "Contraints are not allowed " +
                                                "on non-generic declarations");
-                                       return AdditionResult.Error;
                                }
 
-                               return AdditionResult.Success;
+                               return;
                        }
 
                        string[] names = MemberName.TypeArguments.GetDeclarations ();
@@ -1471,11 +1236,6 @@ namespace Mono.CSharp {
                        for (int i = 0; i < type_params.Length; i++) {
                                string name = names [i];
 
-                               AdditionResult res = IsValid (name, name);
-
-                               if (res != AdditionResult.Success)
-                                       return res;
-
                                Constraints constraints = null;
                                if (constraints_list != null) {
                                        foreach (Constraints constraint in constraints_list) {
@@ -1486,12 +1246,10 @@ 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]);
+                               AddToContainer (type_params [i], name);
                        }
-
-                       return AdditionResult.Success;
                }
 
                public TypeParameter[] TypeParameters {
@@ -1522,6 +1280,12 @@ namespace Mono.CSharp {
                        }
                }
 
+               public int CountCurrentTypeParameters {
+                       get {
+                               return count_current_type_params;
+                       }
+               }
+
                public TypeParameterExpr LookupGeneric (string name, Location loc)
                {
                        if (!IsGeneric)
@@ -1548,20 +1312,18 @@ namespace Mono.CSharp {
                        get { return Name; }
                }
 
-               TypeExpr IAlias.Type
+               TypeExpr IAlias.ResolveAsType (EmitContext ec)
                {
-                       get {
-                               if (TypeBuilder == null)
-                                       throw new InvalidOperationException ();
-
-                               if (CurrentType != null)
-                                       return CurrentType;
+                       if (TypeBuilder == null)
+                               throw new InvalidOperationException ();
 
+                       if (CurrentType != null)
+                               return new TypeExpression (CurrentType, Location);
+                       else
                                return new TypeExpression (TypeBuilder, Location);
-                       }
                }
 
-               protected override string[] ValidAttributeTargets {
+               public override string[] ValidAttributeTargets {
                        get {
                                return attribute_targets;
                        }
@@ -1738,12 +1500,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;
                }
 
@@ -1794,7 +1556,7 @@ namespace Mono.CSharp {
                public readonly IMemberContainer Container;
                protected Hashtable member_hash;
                protected Hashtable method_hash;
-               
+
                /// <summary>
                ///   Create a new MemberCache for the given IMemberContainer `container'.
                /// </summary>
@@ -1805,27 +1567,20 @@ 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;
-                               
-                               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 ();
 
                        // If this is neither a dynamic type nor an interface, create a special
                        // method cache with all declared and inherited methods.
                        Type type = container.Type;
-                       if (!(type is TypeBuilder) && !type.IsInterface && !type.IsGenericParameter) {
+                       if (!(type is TypeBuilder) && !type.IsInterface &&
+                           // !(type.IsGenericInstance && (type.GetGenericTypeDefinition () is TypeBuilder)) &&
+                           !type.IsGenericInstance &&
+                           (Container.BaseCache == null || Container.BaseCache.method_hash != null)) {
                                method_hash = new Hashtable ();
                                AddMethods (type);
                        }
@@ -1836,35 +1591,64 @@ 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;
                }
 
+               void ClearDeclaredOnly (Hashtable hash)
+               {
+                       IDictionaryEnumerator it = hash.GetEnumerator ();
+                       while (it.MoveNext ()) {
+                               foreach (CacheEntry ce in (ArrayList) it.Value)
+                                       ce.EntryType &= ~EntryType.Declared;
+                       }
+               }
 
                /// <summary>
-               ///   Add the contents of `new_hash' to `hash'.
+               ///   Add the contents of `cache' to the member_hash.
                /// </summary>
-               void AddHashtable (Hashtable hash, MemberCache cache)
+               void AddCacheContents (MemberCache cache)
                {
-                       Hashtable new_hash = cache.member_hash;
-                       IDictionaryEnumerator it = new_hash.GetEnumerator ();
+                       IDictionaryEnumerator it = cache.member_hash.GetEnumerator ();
                        while (it.MoveNext ()) {
-                               ArrayList list = (ArrayList) hash [it.Key];
+                               ArrayList list = (ArrayList) member_hash [it.Key];
                                if (list == null)
-                                       hash [it.Key] = list = new ArrayList ();
+                                       member_hash [it.Key] = list = new ArrayList ();
+
+                               ArrayList entries = (ArrayList) it.Value;
+                               for (int i = entries.Count-1; i >= 0; i--) {
+                                       CacheEntry entry = (CacheEntry) entries [i];
 
-                               foreach (CacheEntry entry in (ArrayList) it.Value) {
                                        if (entry.Container != cache.Container)
                                                break;
                                        list.Add (entry);
@@ -1872,30 +1656,6 @@ namespace Mono.CSharp {
                        }
                }
 
-               /// <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);
-
-                       foreach (TypeExpr iface in ifaces) {
-                               Type itype = iface.Type;
-
-                               IMemberContainer iface_container =
-                                       TypeManager.LookupMemberContainer (itype);
-
-                               MemberCache iface_cache = iface_container.MemberCache;
-
-                               AddHashtable (hash, iface_cache);
-                       }
-
-                       return hash;
-               }
-
                /// <summary>
                ///   Add all members from class `container' to the cache.
                /// </summary>
@@ -1903,8 +1663,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);
@@ -1947,7 +1709,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).
@@ -1970,7 +1732,16 @@ namespace Mono.CSharp {
 
                void AddMethods (BindingFlags bf, Type type)
                {
-                       MemberInfo [] members = type.GetMethods (bf);
+                       //
+                       // Consider the case:
+                       //
+                       //   class X { public virtual int f() {} }
+                       //   class Y : X {}
+                       // 
+                       // When processing 'Y', the method_cache will already have a copy of 'f', 
+                       // with ReflectedType == X.  However, we want to ensure that its ReflectedType == Y
+                       // 
+                       MethodBase [] members = type.GetMethods (bf);
 
                        Array.Reverse (members);
 
@@ -1984,6 +1755,35 @@ namespace Mono.CSharp {
                                        method_hash.Add (name, list);
                                }
 
+                               MethodInfo curr = (MethodInfo) member;
+                               while (curr.IsVirtual && (curr.Attributes & MethodAttributes.NewSlot) == 0) {
+                                       MethodInfo base_method = curr.GetBaseDefinition ();
+
+                                       if (base_method == curr) {
+                                               //
+                                               // Both mcs and CSC 1.1 seem to emit a somewhat broken
+                                               // ...Invoke () function for delegates: it's missing a 'newslot'.
+                                               // CSC 2.0 emits a 'newslot' for a delegate's Invoke.
+                                               //
+                                               // Also, CSC 1.1 appears to emit 'Finalize' without a newslot.
+                                               //
+                                               if ((curr.Name == "Invoke" && TypeManager.IsDelegateType (curr.DeclaringType)) ||
+                                                   (curr.Name == "Finalize" && curr.GetParameters().Length == 0 && curr.DeclaringType == TypeManager.object_type))
+                                                       break;
+
+                                               Report.SymbolRelatedToPreviousError (base_method);
+                                               Report.Warning (-28, 
+                                                               "The method '{0}' is marked 'override'," + 
+                                                               " but doesn't appear to override any virtual or abstract method:" + 
+                                                               " it may be ignored during overload resolution",
+                                                               TypeManager.CSharpSignature (base_method));
+                                               break;
+                                       }
+                                       
+                                       list.Add (new CacheEntry (null, base_method, MemberTypes.Method, bf));
+                                       curr = base_method;
+                               }
+
                                // Unfortunately, the elements returned by Type.GetMethods() aren't
                                // sorted so we need to do this check for every member.
                                BindingFlags new_bf = bf;
@@ -2079,10 +1879,10 @@ namespace Mono.CSharp {
                        MaskType        = Constructor|Event|Field|Method|Property|NestedType
                }
 
-               protected struct CacheEntry {
+               protected class CacheEntry {
                        public readonly IMemberContainer Container;
-                       public readonly EntryType EntryType;
-                       public readonly MemberInfo Member;
+                       public EntryType EntryType;
+                       public MemberInfo Member;
 
                        public CacheEntry (IMemberContainer container, MemberInfo member,
                                           MemberTypes mt, BindingFlags bf)
@@ -2091,6 +1891,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>
@@ -2184,9 +1990,9 @@ namespace Mono.CSharp {
 
 
                        // `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];
@@ -2237,6 +2043,22 @@ namespace Mono.CSharp {
                        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;
+               }
+               
                //
                // This finds the method or property for us to override. invocationType is the type where
                // the override is going to be declared, name is the name of the method/property, and
@@ -2318,7 +2140,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;
                                }
                                
@@ -2340,7 +2162,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;
                                        
@@ -2367,5 +2189,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 ());
+                       }
+               }
        }
 }