Revert my patch to constants, they broke corlib and System
[mono.git] / mcs / mcs / decl.cs
index 3dd6e4277d367ec4905cbf1cb6ffeb89b35c6214..1a2c46c2c28643998cfa2733bcbbc868d87c6c8c 100755 (executable)
@@ -2,6 +2,7 @@
 // decl.cs: Declaration base class for structs, classes, enums and interfaces.
 //
 // Author: Miguel de Icaza (miguel@gnu.org)
+//         Marek Safar (marek.safar@seznam.cz)
 //
 // Licensed under the terms of the GNU GPL
 //
 
 using System;
 using System.Collections;
+using System.Globalization;
 using System.Reflection.Emit;
 using System.Reflection;
 
 namespace Mono.CSharp {
 
+       public class MemberName {
+               public string Name;
+               public readonly MemberName Left;
+
+               public static readonly MemberName Null = new MemberName ("");
+
+               public MemberName (string name)
+               {
+                       this.Name = name;
+               }
+
+               public MemberName (MemberName left, string name)
+                       : this (name)
+               {
+                       this.Left = left;
+               }
+
+               public MemberName (MemberName left, MemberName right)
+                       : this (left, right.Name)
+               {
+               }
+
+               public string GetName ()
+               {
+                       return GetName (false);
+               }
+
+               public string GetName (bool is_generic)
+               {
+                       string name = is_generic ? Basename : Name;
+                       if (Left != null)
+                               return Left.GetName (is_generic) + "." + name;
+                       else
+                               return name;
+               }
+
+               public string GetFullName ()
+               {
+                       if (Left != null)
+                               return Left.GetFullName () + "." + Name;
+                       else
+                               return Name;
+               }
+
+               public string GetTypeName ()
+               {
+                       if (Left != null)
+                               return Left.GetTypeName () + "." + Name;
+                       else
+                               return Name;
+               }
+
+               public Expression GetTypeExpression (Location loc)
+               {
+                       if (Left != null) {
+                               Expression lexpr = Left.GetTypeExpression (loc);
+
+                               return new MemberAccess (lexpr, Name, loc);
+                       } else {
+                               return new SimpleName (Name, loc);
+                       }
+               }
+
+               public MemberName Clone ()
+               {
+                       if (Left != null)
+                               return new MemberName (Left.Clone (), Name);
+                       else
+                               return new MemberName (Name);
+               }
+
+               public string Basename {
+                       get {
+                               return Name;
+                       }
+               }
+
+               public override string ToString ()
+               {
+                       return GetFullName ();
+               }
+       }
+
        /// <summary>
-       ///   Base representation for members.  This is only used to keep track
-       ///   of Name, Location and Modifier flags.
+       ///   Base representation for members.  This is used to keep track
+       ///   of Name, Location and Modifier flags, and handling Attributes.
        /// </summary>
-       public abstract class MemberCore {
+       public abstract class MemberCore : Attributable {
                /// <summary>
                ///   Public name
                /// </summary>
-               public string Name;
+               public string Name {
+                       get {
+                               // !(this is GenericMethod) && !(this is Method)
+                               return MemberName.GetName (false);
+                       }
+               }
+
+               public readonly MemberName MemberName;
 
                /// <summary>
                ///   Modifier flags that the user specified in the source code
                /// </summary>
                public int ModFlags;
 
+               public readonly TypeContainer Parent;
+
                /// <summary>
                ///   Location where this declaration happens
                /// </summary>
                public readonly Location Location;
 
+               [Flags]
+               public enum Flags {
+                       Obsolete_Undetected = 1,                // Obsolete attribute has not been detected yet
+                       Obsolete = 1 << 1,                      // Type has obsolete attribute
+                       ClsCompliance_Undetected = 1 << 2,      // CLS Compliance has not been detected yet
+                       ClsCompliant = 1 << 3,                  // Type is CLS Compliant
+                       CloseTypeCreated = 1 << 4,              // Tracks whether we have Closed the type
+                       HasCompliantAttribute_Undetected = 1 << 5,      // Presence of CLSCompliantAttribute has not been detected
+                       HasClsCompliantAttribute = 1 << 6,                      // Type has CLSCompliantAttribute
+                       ClsCompliantAttributeTrue = 1 << 7,                     // Type has CLSCompliant (true)
+                       Excluded_Undetected = 1 << 8,           // Conditional attribute has not been detected yet
+                       Excluded = 1 << 9,                                      // Method is conditional
+                       TestMethodDuplication = 1 << 10         // Test for duplication must be performed
+               }
+
                /// <summary>
-               ///   Attributes for this type
+               ///   MemberCore flags at first detected then cached
                /// </summary>
-               Attributes attributes;
+               internal Flags caching_flags;
 
-               public MemberCore (string name, Attributes attrs, Location loc)
+               public MemberCore (TypeContainer parent, MemberName name, Attributes attrs,
+                                  Location loc)
+                       : base (attrs)
                {
-                       Name = name;
+                       Parent = parent;
+                       MemberName = name;
                        Location = loc;
-                       attributes = attrs;
+                       caching_flags = Flags.Obsolete_Undetected | Flags.ClsCompliance_Undetected | Flags.HasCompliantAttribute_Undetected | Flags.Excluded_Undetected;
+               }
+
+               /// <summary>
+               /// Tests presence of ObsoleteAttribute and report proper error
+               /// </summary>
+               protected void CheckUsageOfObsoleteAttribute (Type type)
+               {
+                       if (type == null)
+                               return;
+
+                       ObsoleteAttribute obsolete_attr = AttributeTester.GetObsoleteAttribute (type);
+                       if (obsolete_attr == null)
+                               return;
+
+                       AttributeTester.Report_ObsoleteMessage (obsolete_attr, type.FullName, Location);
                }
 
-               public abstract bool Define (TypeContainer parent);
+               public abstract bool Define ();
 
                // 
                // Returns full member name for error message
                //
-               public virtual string GetSignatureForError () {
+               public virtual string GetSignatureForError ()
+               {
                        return Name;
                }
 
-               public Attributes OptAttributes 
+               /// <summary>
+               /// Use this method when MethodBuilder is null
+               /// </summary>
+               public virtual string GetSignatureForError (TypeContainer tc)
                {
+                       return Name;
+               }
+
+               /// <summary>
+               /// Base Emit method. This is also entry point for CLS-Compliant verification.
+               /// </summary>
+               public virtual void Emit ()
+               {
+                       // Hack with Parent == null is for EnumMember 
+                       if (Parent == null || (GetObsoleteAttribute (Parent) == null && Parent.GetObsoleteAttribute (Parent) == null))
+                               VerifyObsoleteAttribute ();
+
+                       if (!RootContext.VerifyClsCompliance)
+                               return;
+
+                       VerifyClsCompliance (Parent);
+               }
+
+               public bool InUnsafe {
                        get {
-                               return attributes;
-                       }
-                       set {
-                               attributes = value;
+                               return ((ModFlags & Modifiers.UNSAFE) != 0) || Parent.UnsafeContext;
                        }
                }
 
@@ -85,6 +232,131 @@ namespace Mono.CSharp {
                        Expression.UnsafeError (Location);
                        return false;
                }
+
+               /// <summary>
+               /// Returns instance of ObsoleteAttribute for this MemberCore
+               /// </summary>
+               public ObsoleteAttribute GetObsoleteAttribute (DeclSpace ds)
+               {
+                       // ((flags & (Flags.Obsolete_Undetected | Flags.Obsolete)) == 0) is slower, but why ?
+                       if ((caching_flags & Flags.Obsolete_Undetected) == 0 && (caching_flags & Flags.Obsolete) == 0) {
+                               return null;
+                       }
+
+                       caching_flags &= ~Flags.Obsolete_Undetected;
+
+                       if (OptAttributes == null)
+                               return null;
+
+                       // TODO: remove this allocation
+                       EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
+                               null, null, ds.ModFlags, false);
+
+                       Attribute obsolete_attr = OptAttributes.Search (TypeManager.obsolete_attribute_type, ec);
+                       if (obsolete_attr == null)
+                               return null;
+
+                       ObsoleteAttribute obsolete = obsolete_attr.GetObsoleteAttribute (ds);
+                       if (obsolete == null)
+                               return null;
+
+                       caching_flags |= Flags.Obsolete;
+                       return obsolete;
+               }
+
+               /// <summary>
+               /// Analyze whether CLS-Compliant verification must be execute for this MemberCore.
+               /// </summary>
+               public override bool IsClsCompliaceRequired (DeclSpace container)
+               {
+                       if ((caching_flags & Flags.ClsCompliance_Undetected) == 0)
+                               return (caching_flags & Flags.ClsCompliant) != 0;
+
+                       if (GetClsCompliantAttributeValue (container) && IsExposedFromAssembly (container)) {
+                               caching_flags &= ~Flags.ClsCompliance_Undetected;
+                               caching_flags |= Flags.ClsCompliant;
+                               return true;
+                       }
+
+                       caching_flags &= ~Flags.ClsCompliance_Undetected;
+                       return false;
+               }
+
+               /// <summary>
+               /// Returns true when MemberCore is exposed from assembly.
+               /// </summary>
+               protected bool IsExposedFromAssembly (DeclSpace ds)
+               {
+                       if ((ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
+                               return false;
+                       
+                       DeclSpace parentContainer = ds;
+                       while (parentContainer != null && parentContainer.ModFlags != 0) {
+                               if ((parentContainer.ModFlags & (Modifiers.PUBLIC | Modifiers.PROTECTED)) == 0)
+                                       return false;
+                               parentContainer = parentContainer.Parent;
+                       }
+                       return true;
+               }
+
+               /// <summary>
+               /// Resolve CLSCompliantAttribute value or gets cached value.
+               /// </summary>
+               bool GetClsCompliantAttributeValue (DeclSpace ds)
+               {
+                       if (OptAttributes != null) {
+                               EmitContext ec = new EmitContext (ds.Parent, ds, ds.Location,
+                                                                 null, null, ds.ModFlags, false);
+                               Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
+                               if (cls_attribute != null) {
+                                       caching_flags |= Flags.HasClsCompliantAttribute;
+                                       return cls_attribute.GetClsCompliantAttributeValue (ds);
+                               }
+                       }
+                       return ds.GetClsCompliantAttributeValue ();
+               }
+
+               /// <summary>
+               /// Returns true if MemberCore is explicitly marked with CLSCompliantAttribute
+               /// </summary>
+               protected bool HasClsCompliantAttribute {
+                       get {
+                               return (caching_flags & Flags.HasClsCompliantAttribute) != 0;
+                       }
+               }
+
+
+               /// <summary>
+               /// The main virtual method for CLS-Compliant verifications.
+               /// The method returns true if member is CLS-Compliant and false if member is not
+               /// CLS-Compliant which means that CLS-Compliant tests are not necessary. A descendants override it
+               /// and add their extra verifications.
+               /// </summary>
+               protected virtual bool VerifyClsCompliance (DeclSpace ds)
+               {
+                       if (!IsClsCompliaceRequired (ds)) {
+                               if ((RootContext.WarningLevel >= 2) && HasClsCompliantAttribute && !IsExposedFromAssembly (ds)) {
+                                       Report.Warning (3019, Location, "CLS compliance checking will not be performed on '{0}' because it is private or internal", GetSignatureForError ());
+                               }
+                               return false;
+                       }
+
+                       if (!CodeGen.Assembly.IsClsCompliant) {
+                               if (HasClsCompliantAttribute) {
+                                       Report.Error (3014, Location, "'{0}' cannot be marked as CLS-compliant because the assembly does not have a CLSCompliant attribute", GetSignatureForError ());
+                               }
+                               return false;
+                       }
+
+                       int index = Name.LastIndexOf ('.');
+                       if (Name [index > 0 ? index + 1 : 0] == '_') {
+                               Report.Error (3008, Location, "Identifier '{0}' is not CLS-compliant", GetSignatureForError () );
+                       }
+                       return true;
+               }
+
+               protected abstract void VerifyObsoleteAttribute ();
+
        }
 
        /// <summary>
@@ -102,11 +374,6 @@ namespace Mono.CSharp {
                /// </summary>
                public TypeBuilder TypeBuilder;
 
-               /// <summary>
-               ///   This variable tracks whether we have Closed the type
-               /// </summary>
-               public bool Created = false;
-               
                //
                // This is the namespace in which this typecontainer
                // was declared.  We use this to resolve names.
@@ -117,115 +384,62 @@ namespace Mono.CSharp {
                
                public string Basename;
                
-               /// <summary>
-               ///   defined_names is used for toplevel objects
-               /// </summary>
                protected Hashtable defined_names;
 
-               TypeContainer parent;           
+               static string[] attribute_targets = new string [] { "type" };
 
-               public DeclSpace (NamespaceEntry ns, TypeContainer parent, string name, Attributes attrs, Location l)
-                       : base (name, attrs, l)
+               public DeclSpace (NamespaceEntry ns, TypeContainer parent, MemberName name,
+                                 Attributes attrs, Location l)
+                       : base (parent, name, attrs, l)
                {
                        NamespaceEntry = ns;
-                       Basename = name.Substring (1 + name.LastIndexOf ('.'));
+                       Basename = name.Name;
                        defined_names = new Hashtable ();
-                       this.parent = parent;
-               }
-
-               public void RecordDecl ()
-               {
-                       if ((NamespaceEntry != null) && (parent == RootContext.Tree.Types))
-                               NamespaceEntry.DefineName (Basename, this);
-               }
-
-               /// <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)
+               protected bool AddToContainer (MemberCore symbol, bool is_method, string fullname, string basename)
                {
-                       if (basename == Basename)
-                               return AdditionResult.EnclosingClash;
+                       if (basename == Basename) {
+                               Report.SymbolRelatedToPreviousError (this);
+                               Report.Error (542, "'{0}': member names cannot be the same as their enclosing type", symbol.Location, symbol.GetSignatureForError ());
+                               return false;
+                       }
+
+                       MemberCore mc = (MemberCore)defined_names [fullname];
+
+                       if (is_method && (mc is MethodCore || mc is IMethodData)) {
+                               symbol.caching_flags |= Flags.TestMethodDuplication;
+                               mc.caching_flags |= Flags.TestMethodDuplication;
+                               return true;
+                       }
 
-                       if (defined_names.Contains (name))
-                               return AdditionResult.NameExists;
+                       if (mc != null) {
+                               Report.SymbolRelatedToPreviousError (mc);
+                               Report.Error (102, symbol.Location, "The type '{0}' already contains a definition for '{1}'", GetSignatureForError (), basename);
+                               return false;
+                       }
 
-                       return AdditionResult.Success;
+                       defined_names.Add (fullname, 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)
+               public void RecordDecl ()
                {
-                       defined_names.Add (name, o);
-
-#if DEBUGME
-                       int p = name.LastIndexOf ('.');
-                       int l = name.Length;
-                       length += l;
-                       small += l -p;
-#endif
+                       if ((NamespaceEntry != null) && (Parent == RootContext.Tree.Types))
+                               NamespaceEntry.DefineName (MemberName.Basename, this);
                }
 
                /// <summary>
-               ///   Returns the object associated with a given name in the declaration
-               ///   space.  This is the inverse operation of `DefineName'
+               ///   Returns the MemberCore associated with a given name in the declaration
+               ///   space. It doesn't return method based symbols !!
                /// </summary>
-               public object GetDefinition (string name)
+               /// 
+               public MemberCore GetDefinition (string name)
                {
-                       return defined_names [name];
+                       return (MemberCore)defined_names [name];
                }
                
                bool in_transit = false;
@@ -244,12 +458,6 @@ namespace Mono.CSharp {
                        }
                }
 
-               public TypeContainer Parent {
-                       get {
-                               return parent;
-                       }
-               }
-
                /// <summary>
                ///   Looks up the alias for the name
                /// </summary>
@@ -268,8 +476,8 @@ namespace Mono.CSharp {
                //
                public bool IsTopLevel {
                        get {
-                               if (parent != null){
-                                       if (parent.parent == null)
+                               if (Parent != null){
+                                       if (Parent.Parent == null)
                                                return true;
                                }
                                return false;
@@ -278,7 +486,7 @@ namespace Mono.CSharp {
 
                public virtual void CloseType ()
                {
-                       if (!Created){
+                       if ((caching_flags & Flags.CloseTypeCreated) == 0){
                                try {
                                        TypeBuilder.CreateType ();
                                } catch {
@@ -293,7 +501,7 @@ namespace Mono.CSharp {
                                        // Note that this still creates the type and
                                        // it is possible to save it
                                }
-                               Created = true;
+                               caching_flags |= Flags.CloseTypeCreated;
                        }
                }
 
@@ -315,8 +523,8 @@ namespace Mono.CSharp {
                        get {
                                if ((ModFlags & Modifiers.UNSAFE) != 0)
                                        return true;
-                               if (parent != null)
-                                       return parent.UnsafeContext;
+                               if (Parent != null)
+                                       return Parent.UnsafeContext;
                                return false;
                        }
                }
@@ -338,64 +546,36 @@ namespace Mono.CSharp {
                }
 
                // <summary>
-               //    Looks up the type, as parsed into the expression `e' 
+               //    Looks up the type, as parsed into the expression `e'.
                // </summary>
+               //[Obsolete ("This method is going away soon")]
                public Type ResolveType (Expression e, bool silent, Location loc)
                {
-                       if (type_resolve_ec == null)
-                               type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
-                       type_resolve_ec.loc = loc;
-                       type_resolve_ec.ContainerType = TypeBuilder;
-
-                       int errors = Report.Errors;
-                       TypeExpr d = e.ResolveAsTypeTerminal (type_resolve_ec);
-                       
-                       if (d == null || d.eclass != ExprClass.Type){
-                               if (!silent && errors == Report.Errors){
-                                       Report.Error (246, loc, "Cannot find type `"+ e.ToString () +"'");
-                               }
-                               return null;
-                       }
-
-                       if (!d.CheckAccessLevel (this)) {
-                               Report. Error (122, loc,  "`" + d.Name + "' " +
-                                      "is inaccessible because of its protection level");
-                               return null;
-                       }
-
-                       return d.Type;
+                       TypeExpr d = ResolveTypeExpr (e, silent, loc);
+                       return d == null ? null : d.Type;
                }
 
                // <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)
                {
                        if (type_resolve_ec == null)
-                               type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
+                               type_resolve_ec = GetTypeResolveEmitContext (Parent, loc);
                        type_resolve_ec.loc = loc;
                        type_resolve_ec.ContainerType = TypeBuilder;
 
-                       TypeExpr d = e.ResolveAsTypeTerminal (type_resolve_ec);
-                        
-                       if (d == null || d.eclass != ExprClass.Type){
-                               if (!silent){
-                                       Report.Error (246, loc, "Cannot find type `"+ e +"'");
-                               }
-                               return null;
-                       }
-
-                       return d;
+                       return e.ResolveAsTypeTerminal (type_resolve_ec, silent);
                }
                
-               public bool CheckAccessLevel (Type check_type) 
+               public bool CheckAccessLevel (Type check_type)
                {
                        if (check_type == TypeBuilder)
                                return true;
                        
                        TypeAttributes check_attr = check_type.Attributes & TypeAttributes.VisibilityMask;
-                       
+
                        //
                        // Broken Microsoft runtime, return public for arrays, no matter what 
                        // the accessibility is for their underlying class, and they return 
@@ -404,6 +584,12 @@ namespace Mono.CSharp {
                        if (check_type.IsArray || check_type.IsPointer)
                                return CheckAccessLevel (TypeManager.GetElementType (check_type));
 
+                       if (TypeBuilder == null)
+                               // FIXME: TypeBuilder will be null when invoked by Class.GetNormalBases().
+                               //        However, this is invoked again later -- so safe to return true.
+                               //        May also be null when resolving top-level attributes.
+                               return true;
+
                        switch (check_attr){
                        case TypeAttributes.Public:
                                return true;
@@ -412,38 +598,15 @@ namespace Mono.CSharp {
                                //
                                // This test should probably use the declaringtype.
                                //
-                               if (check_type.Assembly == TypeBuilder.Assembly){
-                                       return true;
-                               }
-                               return false;
+                               return check_type.Assembly == TypeBuilder.Assembly;
                                
                        case TypeAttributes.NestedPublic:
                                return true;
 
                        case TypeAttributes.NestedPrivate:
-                               string check_type_name = check_type.FullName;
-                               string type_name = TypeBuilder.FullName;
-                               
-                               int cio = check_type_name.LastIndexOf ('+');
-                               string 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 (check_type);
 
                        case TypeAttributes.NestedFamily:
-                               //
-                               // Only accessible to methods in current type or any subtypes
-                               //
                                return FamilyAccessible (check_type);
 
                        case TypeAttributes.NestedFamANDAssem:
@@ -463,24 +626,32 @@ namespace Mono.CSharp {
 
                }
 
-               protected bool FamilyAccessible (Type check_type)
+               protected bool NestedAccessible (Type check_type)
                {
-                       Type declaring = check_type.DeclaringType;
-                       if (TypeBuilder.IsSubclassOf (declaring))
-                               return true;
-
                        string check_type_name = check_type.FullName;
-                       
+
+                       // At this point, we already know check_type is a nested class.
                        int cio = check_type_name.LastIndexOf ('+');
-                       string container = check_type_name.Substring (0, cio);
-                       
-                       //
-                       // Check if the check_type is a nested class of the current type
-                       //
-                       if (check_type_name.StartsWith (container + "+"))
+
+                       // Ensure that the string 'container' has a '+' in it to avoid false matches
+                       string container = check_type_name.Substring (0, cio + 1);
+
+                       // Ensure that type_name ends with a '+' so that it can match 'container', if necessary
+                       string type_name = TypeBuilder.FullName + "+";
+
+                       // If the current class is nested inside the container of check_type,
+                       // we can access check_type even if it is private or protected.
+                       return type_name.StartsWith (container);
+               }
+
+               protected bool FamilyAccessible (Type check_type)
+               {
+                       Type declaring = check_type.DeclaringType;
+                       if (TypeBuilder == declaring ||
+                           TypeBuilder.IsSubclassOf (declaring))
                                return true;
 
-                       return false;
+                       return NestedAccessible (check_type);
                }
 
                // Access level of a type.
@@ -603,18 +774,27 @@ namespace Mono.CSharp {
                        object r;
                        
                        error = false;
+                       int p = name.LastIndexOf ('.');
 
                        if (dh.Lookup (ns, name, out r))
                                return (Type) r;
                        else {
+                               //
+                               // If the type is not a nested type, we do not need `LookupType's processing.
+                               // If the @name does not have a `.' in it, this cant be a nested type.
+                               //
                                if (ns != ""){
-                                       if (Namespace.IsNamespace (ns)){
-                                               string fullname = (ns != "") ? ns + "." + name : name;
-                                               t = TypeManager.LookupType (fullname);
+                                       if (Namespace.IsNamespace (ns)) {
+                                               if (p != -1)
+                                                       t = TypeManager.LookupType (ns + "." + name);
+                                               else
+                                                       t = TypeManager.LookupTypeDirect (ns + "." + name);
                                        } else
                                                t = null;
-                               } else
+                               } else if (p != -1)
                                        t = TypeManager.LookupType (name);
+                               else
+                                       t = TypeManager.LookupTypeDirect (name);
                        }
                        
                        if (t != null) {
@@ -625,7 +805,7 @@ namespace Mono.CSharp {
                        //
                        // 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);
@@ -732,6 +912,19 @@ namespace Mono.CSharp {
                                if (t != null)
                                        return t;
 
+                               if (name.IndexOf ('.') > 0)
+                                       continue;
+
+                               string alias_value = ns.LookupAlias (name);
+                               if (alias_value != null) {
+                                       t = LookupInterfaceOrClass ("", alias_value, out error);
+                                       if (error)
+                                               return null;
+
+                                       if (t != null)
+                                               return t;
+                               }
+
                                //
                                // Now check the using clause list
                                //
@@ -776,6 +969,67 @@ namespace Mono.CSharp {
                public abstract MemberCache MemberCache {
                        get;
                }
+
+               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb)
+               {
+                       try {
+                               TypeBuilder.SetCustomAttribute (cb);
+                       } catch (System.ArgumentException e) {
+                               Report.Warning (-21, a.Location,
+                                               "The CharSet named property on StructLayout\n"+
+                                               "\tdoes not work correctly on Microsoft.NET\n"+
+                                               "\tYou might want to remove the CharSet declaration\n"+
+                                               "\tor compile using the Mono runtime instead of the\n"+
+                                               "\tMicrosoft .NET runtime\n"+
+                                               "\tThe runtime gave the error: " + e);
+                       }
+               }
+
+               /// <summary>
+               /// Goes through class hierarchy and get value of first CLSCompliantAttribute that found.
+               /// If no is attribute exists then return assembly CLSCompliantAttribute.
+               /// </summary>
+               public bool GetClsCompliantAttributeValue ()
+               {
+                       if ((caching_flags & Flags.HasCompliantAttribute_Undetected) == 0)
+                               return (caching_flags & Flags.ClsCompliantAttributeTrue) != 0;
+
+                       caching_flags &= ~Flags.HasCompliantAttribute_Undetected;
+
+                       if (OptAttributes != null) {
+                               EmitContext ec = new EmitContext (Parent, this, Location,
+                                                                 null, null, ModFlags, false);
+                               Attribute cls_attribute = OptAttributes.GetClsCompliantAttribute (ec);
+                               if (cls_attribute != null) {
+                                       caching_flags |= Flags.HasClsCompliantAttribute;
+                                       if (cls_attribute.GetClsCompliantAttributeValue (this)) {
+                                               caching_flags |= Flags.ClsCompliantAttributeTrue;
+                                               return true;
+                                       }
+                                       return false;
+                               }
+                       }
+
+                       if (Parent == null) {
+                               if (CodeGen.Assembly.IsClsCompliant) {
+                                       caching_flags |= Flags.ClsCompliantAttributeTrue;
+                                       return true;
+                               }
+                               return false;
+                       }
+
+                       if (Parent.GetClsCompliantAttributeValue ()) {
+                               caching_flags |= Flags.ClsCompliantAttributeTrue;
+                               return true;
+                       }
+                       return false;
+               }
+
+               public override string[] ValidAttributeTargets {
+                       get {
+                               return attribute_targets;
+                       }
+               }
        }
 
        /// <summary>
@@ -953,7 +1207,7 @@ namespace Mono.CSharp {
                ///   This is used when creating the member cache for a class to get all
                ///   members from the parent class.
                /// </summary>
-               IMemberContainer Parent {
+               IMemberContainer ParentContainer {
                        get;
                }
 
@@ -1005,8 +1259,6 @@ namespace Mono.CSharp {
                protected Hashtable member_hash;
                protected Hashtable method_hash;
                
-               Hashtable interface_hash;
-
                /// <summary>
                ///   Create a new MemberCache for the given IMemberContainer `container'.
                /// </summary>
@@ -1023,15 +1275,14 @@ namespace Mono.CSharp {
                        // TypeManager.object_type), we deep-copy its MemberCache here.
                        if (Container.IsInterface) {
                                MemberCache parent;
-                               interface_hash = new Hashtable ();
                                
-                               if (Container.Parent != null)
-                                       parent = Container.Parent.MemberCache;
+                               if (Container.ParentContainer != null)
+                                       parent = Container.ParentContainer.MemberCache;
                                else
                                        parent = TypeHandle.ObjectType.MemberCache;
                                member_hash = SetupCacheForInterface (parent);
-                       } else if (Container.Parent != null)
-                               member_hash = SetupCache (Container.Parent.MemberCache);
+                       } else if (Container.ParentContainer != null)
+                               member_hash = SetupCache (Container.ParentContainer.MemberCache);
                        else
                                member_hash = new Hashtable ();
 
@@ -1068,15 +1319,20 @@ namespace Mono.CSharp {
                /// <summary>
                ///   Add the contents of `new_hash' to `hash'.
                /// </summary>
-               void AddHashtable (Hashtable hash, Hashtable new_hash)
+               void AddHashtable (Hashtable hash, MemberCache cache)
                {
+                       Hashtable new_hash = cache.member_hash;
                        IDictionaryEnumerator it = new_hash.GetEnumerator ();
                        while (it.MoveNext ()) {
                                ArrayList list = (ArrayList) hash [it.Key];
-                               if (list != null)
-                                       list.AddRange ((ArrayList) it.Value);
-                               else
-                                       hash [it.Key] = ((ArrayList) it.Value).Clone ();
+                               if (list == null)
+                                       hash [it.Key] = list = new ArrayList ();
+
+                               foreach (CacheEntry entry in (ArrayList) it.Value) {
+                                       if (entry.Container != cache.Container)
+                                               break;
+                                       list.Add (entry);
+                               }
                        }
                }
 
@@ -1093,23 +1349,12 @@ namespace Mono.CSharp {
                        foreach (TypeExpr iface in ifaces) {
                                Type itype = iface.Type;
 
-                               if (interface_hash.Contains (itype))
-                                       continue;
-                               
-                               interface_hash [itype] = null;
-
                                IMemberContainer iface_container =
                                        TypeManager.LookupMemberContainer (itype);
 
                                MemberCache iface_cache = iface_container.MemberCache;
 
-                               AddHashtable (hash, iface_cache.member_hash);
-                               
-                               if (iface_cache.interface_hash == null)
-                                       continue;
-                               
-                               foreach (Type parent_contains in iface_cache.interface_hash.Keys)
-                                       interface_hash [parent_contains] = null;
+                               AddHashtable (hash, iface_cache);
                        }
 
                        return hash;
@@ -1188,14 +1433,10 @@ namespace Mono.CSharp {
                        MemberInfo [] members = type.GetMethods (bf);
 
                         Array.Reverse (members);
-                        
+
                        foreach (MethodBase member in members) {
                                string name = member.Name;
 
-                               // Varargs methods aren't allowed in C# code.
-                               if ((member.CallingConvention & CallingConventions.VarArgs) != 0)
-                                       continue;
-
                                // We use a name-based hash table of ArrayList's.
                                ArrayList list = (ArrayList) method_hash [name];
                                if (list == null) {
@@ -1359,8 +1600,10 @@ namespace Mono.CSharp {
                ArrayList global = new ArrayList ();
                bool using_global = false;
                
-               public MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
-                                              MemberFilter filter, object criteria)
+               static MemberInfo [] emptyMemberInfo = new MemberInfo [0];
+               
+               public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf, string name,
+                                                 MemberFilter filter, object criteria)
                {
                        if (using_global)
                                throw new Exception ();
@@ -1381,9 +1624,9 @@ namespace Mono.CSharp {
                                applicable = (ArrayList) method_hash [name];
                        else
                                applicable = (ArrayList) member_hash [name];
-                       
+
                        if (applicable == null)
-                               return MemberList.Empty;
+                               return emptyMemberInfo;
 
                        //
                        // 32  slots gives 53 rss/54 size
@@ -1401,6 +1644,7 @@ namespace Mono.CSharp {
 
                        IMemberContainer current = Container;
 
+
                        // `applicable' is a list of all members with the given member name `name'
                        // in the current class and all its parent classes.  The list is sorted in
                        // reverse order due to the way how the cache is initialy created (to speed
@@ -1452,7 +1696,23 @@ namespace Mono.CSharp {
                        using_global = false;
                        MemberInfo [] copy = new MemberInfo [global.Count];
                        global.CopyTo (copy);
-                       return new MemberList (copy);
+                       return copy;
+               }
+               
+               // find the nested type @name in @this.
+               public Type FindNestedType (string name)
+               {
+                       ArrayList applicable = (ArrayList) member_hash [name];
+                       if (applicable == null)
+                               return null;
+                       
+                       for (int i = applicable.Count-1; i >= 0; i--) {
+                               CacheEntry entry = (CacheEntry) applicable [i];
+                               if ((entry.EntryType & EntryType.NestedType & EntryType.MaskType) != 0)
+                                       return (Type) entry.Member;
+                       }
+                       
+                       return null;
                }
                
                //
@@ -1479,21 +1739,56 @@ namespace Mono.CSharp {
                        for (int i = applicable.Count - 1; i >= 0; i--) {
                                CacheEntry entry = (CacheEntry) applicable [i];
                                
-                               if ((entry.EntryType & (is_property ? EntryType.Property : EntryType.Method)) == 0)
+                               if ((entry.EntryType & (is_property ? (EntryType.Property | EntryType.Field) : EntryType.Method)) == 0)
                                        continue;
 
                                PropertyInfo pi = null;
                                MethodInfo mi = null;
-                               Type [] cmpAttrs;
+                               FieldInfo fi = null;
+                               Type [] cmpAttrs = null;
                                
                                if (is_property) {
-                                       pi = (PropertyInfo) entry.Member;
-                                       cmpAttrs = TypeManager.GetArgumentTypes (pi);
+                                       if ((entry.EntryType & EntryType.Field) != 0) {
+                                               fi = (FieldInfo)entry.Member;
+
+                                               // TODO: For this case we ignore member type
+                                               //fb = TypeManager.GetField (fi);
+                                               //cmpAttrs = new Type[] { fb.MemberType };
+                                       } else {
+                                               pi = (PropertyInfo) entry.Member;
+                                               cmpAttrs = TypeManager.GetArgumentTypes (pi);
+                                       }
                                } else {
                                        mi = (MethodInfo) entry.Member;
                                        cmpAttrs = TypeManager.GetArgumentTypes (mi);
                                }
-                               
+
+                               if (fi != null) {
+                                       // TODO: Almost duplicate !
+                                       // Check visibility
+                                       switch (fi.Attributes & FieldAttributes.FieldAccessMask) {
+                                               case FieldAttributes.Private:
+                                                       //
+                                                       // A private method is Ok if we are a nested subtype.
+                                                       // The spec actually is not very clear about this, see bug 52458.
+                                                       //
+                                                       if (invocationType != entry.Container.Type &
+                                                               TypeManager.IsNestedChildOf (invocationType, entry.Container.Type))
+                                                               continue;
+
+                                                       break;
+                                               case FieldAttributes.FamANDAssem:
+                                               case FieldAttributes.Assembly:
+                                                       //
+                                                       // Check for assembly methods
+                                                       //
+                                                       if (mi.DeclaringType.Assembly != CodeGen.Assembly.Builder)
+                                                               continue;
+                                                       break;
+                                       }
+                                       return entry.Member;
+                               }
+
                                //
                                // Check the arguments
                                //
@@ -1549,5 +1844,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 ());
+                       }
+               }
        }
 }