Small bug fix, to render better an acurrate error
[mono.git] / mcs / mcs / typemanager.cs
index a19878daf654b1b2cc32a24ae781228e3ffcd4ec..58f9a0168cc7ed2386ff67a511741714f536acbd 100755 (executable)
@@ -9,11 +9,21 @@
 // (C) 2001 Ximian, Inc (http://www.ximian.com)
 //
 //
+
+//
+// We will eventually remove the SIMPLE_SPEEDUP, and should never change 
+// the behavior of the compilation.  This can be removed if we rework
+// the code to get a list of namespaces available.
+//
+#define SIMPLE_SPEEDUP
+
 using System;
+using System.IO;
 using System.Globalization;
 using System.Collections;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Runtime.CompilerServices;
 using System.Diagnostics;
@@ -51,6 +61,7 @@ public class TypeManager {
        static public Type icloneable_type;
        static public Type type_type;
        static public Type ienumerator_type;
+       static public Type ienumerable_type;
        static public Type idisposable_type;
        static public Type default_member_type;
        static public Type iasyncresult_type;
@@ -65,11 +76,14 @@ public class TypeManager {
        static public Type methodimpl_attr_type;
        static public Type marshal_as_attr_type;
        static public Type param_array_type;
+       static public Type guid_attr_type;
        static public Type void_ptr_type;
        static public Type indexer_name_type;
        static public Type exception_type;
+       static public Type invalid_operation_exception_type;
        static public object obsolete_attribute_type;
        static public object conditional_attribute_type;
+       static public Type in_attribute_type;
 
        //
        // An empty array of types
@@ -118,11 +132,15 @@ public class TypeManager {
        // These methods are called by code generated by the compiler
        //
        static public MethodInfo string_concat_string_string;
+       static public MethodInfo string_concat_string_string_string;
+       static public MethodInfo string_concat_string_string_string_string;
        static public MethodInfo string_concat_object_object;
        static public MethodInfo string_isinterneted_string;
        static public MethodInfo system_type_get_type_from_handle;
        static public MethodInfo object_getcurrent_void;
        static public MethodInfo bool_movenext_void;
+       static public MethodInfo ienumerable_getenumerator_void;
+       static public MethodInfo void_reset_void;
        static public MethodInfo void_dispose_void;
        static public MethodInfo void_monitor_enter_object;
        static public MethodInfo void_monitor_exit_object;
@@ -142,9 +160,11 @@ public class TypeManager {
        //
        // The attribute constructors.
        //
+       static public ConstructorInfo object_ctor;
        static public ConstructorInfo cons_param_array_attribute;
        static public ConstructorInfo void_decimal_ctor_five_args;
        static public ConstructorInfo unverifiable_code_ctor;
+       static public ConstructorInfo invalid_operation_ctor;
        
        // <remarks>
        //   Holds the Array of Assemblies that have been loaded
@@ -456,6 +476,57 @@ public class TypeManager {
                modules = n;
        }
 
+       static Hashtable references = new Hashtable ();
+       
+       //
+       // Gets the reference to T version of the Type (T&)
+       //
+       public static Type GetReferenceType (Type t)
+       {
+               string tname = t.FullName + "&";
+               
+               Type ret = t.Assembly.GetType (tname);
+
+               //
+               // If the type comes from the assembly we are building
+               // We need the Hashtable, because .NET 1.1 will return different instance types
+               // every time we call ModuleBuilder.GetType.
+               //
+               if (ret == null){
+                       if (references [t] == null)
+                               references [t] = CodeGen.ModuleBuilder.GetType (tname);
+                       ret = (Type) references [t];
+               }
+
+               return ret;
+       }
+
+       static Hashtable pointers = new Hashtable ();
+
+       //
+       // Gets the pointer to T version of the Type  (T*)
+       //
+       public static Type GetPointerType (Type t)
+       {
+               string tname = t.FullName + "*";
+               
+               Type ret = t.Assembly.GetType (tname);
+               
+               //
+               // If the type comes from the assembly we are building
+               // We need the Hashtable, because .NET 1.1 will return different instance types
+               // every time we call ModuleBuilder.GetType.
+               //
+               if (ret == null){
+                       if (pointers [t] == null)
+                               pointers [t] = CodeGen.ModuleBuilder.GetType (tname);
+                       
+                       ret = (Type) pointers [t];
+               }
+
+               return ret;
+       }
+       
        //
        // Low-level lookup, cache-less
        //
@@ -478,6 +549,8 @@ public class TypeManager {
                return null;
        }
 
+       static Hashtable negative_hits = new Hashtable ();
+       
        //
        // This function is used when you want to avoid the lookups, and want to go
        // directly to the source.  This will use the cache.
@@ -499,7 +572,32 @@ public class TypeManager {
                types [name] = t;
                return t;
        }
-       
+
+       //
+       // UNUSED: This version tries to reduce the impact of calling LookupType by validating if
+       // UNUSED: the namespace exists
+       //
+       public static Type xLookupType (string ns, string name, out string res)
+       {
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               
+               if (!IsNamespace (ns)){
+                       res = null;
+                       return null;
+               }
+
+               res = DeclSpace.MakeFQN (ns, name);
+               return LookupType (res);
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+       }
+
        /// <summary>
        ///   Returns the Type associated with @name, takes care of the fact that
        ///   reflection expects nested types to be separated from the main type
@@ -517,67 +615,175 @@ public class TypeManager {
                if (t != null)
                        return t;
 
-               //
-               // Optimization: ComposedCast will work with an existing type, and might already have the
-               // full name of the type, so the full system lookup can probably be avoided.
-               //
-               
+               // Two thirds of the failures are caught here.
+               if (negative_hits.Contains (name))
+                       return null;
+
                string [] elements = name.Split ('.');
                int count = elements.Length;
 
                for (int n = 1; n <= count; n++){
                        string top_level_type = String.Join (".", elements, 0, n);
 
+                       // One third of the failures are caught here.
+                       if (negative_hits.Contains (top_level_type))
+                               continue;
+                       
                        t = (Type) types [top_level_type];
                        if (t == null){
                                t = LookupTypeReflection (top_level_type);
-                               if (t == null)
+                               if (t == null){
+                                       negative_hits [top_level_type] = true;
                                        continue;
+                               }
                        }
                        
                        if (count == n){
                                types [name] = t;
                                return t;
                        } 
+
+                       //
+                       // We know that System.Object does not have children, and since its the parent of 
+                       // all the objects, it always gets probbed for inner classes. 
+                       //
+                       if (top_level_type == "System.Object")
+                               return null;
                        
                        string newt = top_level_type + "+" + String.Join ("+", elements, n, count - n);
-                       t = LookupTypeDirect (newt);
-                       if (t != null)
-                               types [newt] = t;
+                       //Console.WriteLine ("Looking up: " + newt + " " + name);
+                       t = LookupTypeReflection (newt);
+                       if (t == null)
+                               negative_hits [name] = true;
+                       else
+                               types [name] = t;
                        return t;
                }
+               negative_hits [name] = true;
                return null;
        }
 
-       //
-       // Returns a list of all namespaces in the assemblies and types loaded.
-       //
-       public static Hashtable GetNamespaces ()
-       {
-               Hashtable namespaces = new Hashtable ();
-
-               foreach (Assembly a in assemblies){
-                       foreach (Type t in a.GetTypes ()){
-                               string ns = t.Namespace;
-
-                               if (namespaces.Contains (ns))
-                                       continue;
-                               namespaces [ns] = ns;
-                       }
-               }
+       // Total list of known namespaces for the compilation 
+       static string [] namespaces;
 
+       static Hashtable AddModuleNamespaces (Hashtable h)
+       {
                foreach (ModuleBuilder mb in modules){
                        foreach (Type t in mb.GetTypes ()){
                                string ns = t.Namespace;
 
-                               if (namespaces.Contains (ns))
+                               if (h.Contains (ns))
                                        continue;
-                               namespaces [ns] = ns;
+                               h [ns] = ns;
                        }
                }
-               return namespaces;
+               return h;
        }
        
+       
+       /// <summary>
+       ///   Computes the namespaces that we import from the assemblies we reference.
+       /// </summary>
+       public static void ComputeNamespaces ()
+       {
+               MethodInfo assembly_get_namespaces = typeof (Assembly).GetMethod ("GetNamespaces");
+
+               //
+               // First add the assembly namespaces
+               //
+               Hashtable namespaces_hash = new Hashtable ();
+               if (assembly_get_namespaces != null){
+                       int count = assemblies.Length;
+                       int total;
+
+                       for (int i = 0; i < count; i++){
+                               Assembly a = assemblies [i];
+                               string [] namespaces = (string []) assembly_get_namespaces.Invoke (a, null);
+                               foreach (string ns in namespaces){
+                                       if (ns == "")
+                                               continue;
+                                       if (namespaces_hash.Contains (ns))
+                                               continue;
+                                       namespaces_hash [ns] = true;
+                               }
+                       }
+               } else {
+                       foreach (Assembly a in assemblies){
+                               foreach (Type t in a.GetTypes ()){
+                                       string ns = t.Namespace;
+
+                                       // t.Namespace returns null for <PrivateImplDetails>
+                                       if (ns == ""|| ns == null)
+                                               continue;
+                                       if (namespaces_hash.Contains (ns))
+                                               continue;
+                                       namespaces_hash [ns] = true;
+                               }
+                       }
+               }
+               //
+               // Now insert all the namespaces defined by the application
+               //
+               StringBuilder s = null;
+               foreach (Namespace ns in Namespace.UserDefinedNamespaces){
+                       string name = ns.Name;
+                       if (name == "")
+                               continue;
+                       if (name == null)
+                               throw new Exception ();
+                       if (namespaces_hash.Contains (name))
+                               continue;
+                       
+                       if (name.IndexOf ('.') != -1){
+                               if (s == null)
+                                       s = new StringBuilder ();
+                               string [] pieces = name.Split ('.');
+                               for (int i = 1; i < pieces.Length; i++){
+                                       s.Length = 0;
+                               
+                                       s.Append (pieces [0]);
+                                       for (int j = 1; j < i; j++){
+                                               s.Append (".");
+                                               s.Append (pieces [j]);
+                                       }
+                                       string n = s.ToString ();
+                                       if (namespaces_hash.Contains (n))
+                                               continue;
+                                       namespaces_hash [n] = true;
+                               }
+                       }
+                       
+                       namespaces_hash [name] = true;
+               }
+
+               //
+               // Store it sorted
+               //
+               int idx = 0;
+               TypeManager.namespaces = new string [namespaces_hash.Count];
+               foreach (string ns in namespaces_hash.Keys){
+                       namespaces [idx++] = ns;
+               }
+               Array.Sort (namespaces);
+       }
+
+       public static bool IsNamespace (string name)
+       {
+               if (Array.BinarySearch (namespaces, name) < 0)
+                       return false;
+               
+               return true;
+       }
+
+       public static bool NamespaceClash (string name)
+       {
+               if (Array.BinarySearch (namespaces, name) < 0)
+                       return false;
+
+               Report.Error (519, String.Format ("`{0}' clashes with a predefined namespace", name));
+               return true;
+       }
+
        /// <summary>
        ///   Returns the C# name of a type if possible, or the full type name otherwise
        /// </summary>
@@ -585,7 +791,7 @@ public class TypeManager {
        {
                return Regex.Replace (t.FullName, 
                        @"^System\." +
-                       @"(Int32|UInt32|Int16|Uint16|Int64|UInt64|" +
+                       @"(Int32|UInt32|Int16|UInt16|Int64|UInt64|" +
                        @"Single|Double|Char|Decimal|Byte|SByte|Object|" +
                        @"Boolean|String|Void)" +
                        @"(\W+|\b)", 
@@ -642,7 +848,7 @@ public class TypeManager {
        /// </summary>
        static Type CoreLookupType (string name)
        {
-               Type t = LookupType (name);
+               Type t = LookupTypeDirect (name);
 
                if (t == null){
                        Report.Error (518, "The predefined type `" + name + "' is not defined or imported");
@@ -756,6 +962,7 @@ public class TypeManager {
                asynccallback_type   = CoreLookupType ("System.AsyncCallback");
                iasyncresult_type    = CoreLookupType ("System.IAsyncResult");
                ienumerator_type     = CoreLookupType ("System.Collections.IEnumerator");
+               ienumerable_type     = CoreLookupType ("System.Collections.IEnumerable");
                idisposable_type     = CoreLookupType ("System.IDisposable");
                icloneable_type      = CoreLookupType ("System.ICloneable");
                monitor_type         = CoreLookupType ("System.Threading.Monitor");
@@ -765,8 +972,15 @@ public class TypeManager {
                attribute_usage_type = CoreLookupType ("System.AttributeUsageAttribute");
                dllimport_type       = CoreLookupType ("System.Runtime.InteropServices.DllImportAttribute");
                methodimpl_attr_type = CoreLookupType ("System.Runtime.CompilerServices.MethodImplAttribute");
-               marshal_as_attr_type  = CoreLookupType ("System.Runtime.InteropServices.MarshalAsAttribute");
-               param_array_type      = CoreLookupType ("System.ParamArrayAttribute");
+               marshal_as_attr_type = CoreLookupType ("System.Runtime.InteropServices.MarshalAsAttribute");
+               param_array_type     = CoreLookupType ("System.ParamArrayAttribute");
+               in_attribute_type    = CoreLookupType ("System.Runtime.InteropServices.InAttribute");
+
+               //
+               // Sigh. Remove this before the release.  Wonder what versions of Mono
+               // people are running.
+               //
+               guid_attr_type        = LookupType ("System.Runtime.InteropServices.GuidAttribute");
 
                unverifiable_code_type= CoreLookupType ("System.Security.UnverifiableCodeAttribute");
 
@@ -775,6 +989,7 @@ public class TypeManager {
                indexer_name_type     = CoreLookupType ("System.Runtime.CompilerServices.IndexerNameAttribute");
 
                exception_type        = CoreLookupType ("System.Exception");
+               invalid_operation_exception_type = CoreLookupType ("System.InvalidOperationException");
 
                //
                // Attribute types
@@ -813,19 +1028,19 @@ public class TypeManager {
 
                        Type [] system_type_type_arg = { system_type_type, system_type_type, system_type_type };
 
-                       try {
                        system_void_set_corlib_type_builders = GetMethod (
                                system_assemblybuilder_type, "SetCorlibTypeBuilders",
                                system_type_type_arg);
 
-                       object[] args = new object [3];
-                       args [0] = object_type;
-                       args [1] = value_type;
-                       args [2] = enum_type;
-
-                       system_void_set_corlib_type_builders.Invoke (CodeGen.AssemblyBuilder, args);
-                       } catch {
-                               Console.WriteLine ("Corlib compilation is not supported in Microsoft.NET due to bugs in it");
+                       if (system_void_set_corlib_type_builders != null){
+                               object[] args = new object [3];
+                               args [0] = object_type;
+                               args [1] = value_type;
+                               args [2] = enum_type;
+                               
+                               system_void_set_corlib_type_builders.Invoke (CodeGen.AssemblyBuilder, args);
+                       } else {
+                               Report.Error (-26, "Corlib compilation is not supported in Microsoft.NET due to bugs in it");
                        }
                }
        }
@@ -841,6 +1056,12 @@ public class TypeManager {
                Type [] string_string = { string_type, string_type };
                string_concat_string_string = GetMethod (
                        string_type, "Concat", string_string);
+               Type [] string_string_string = { string_type, string_type, string_type };
+               string_concat_string_string_string = GetMethod (
+                       string_type, "Concat", string_string_string);
+               Type [] string_string_string_string = { string_type, string_type, string_type, string_type };
+               string_concat_string_string_string_string = GetMethod (
+                       string_type, "Concat", string_string_string_string);
 
                Type [] object_object = { object_type, object_type };
                string_concat_object_object = GetMethod (
@@ -869,6 +1090,8 @@ public class TypeManager {
                        ienumerator_type, "get_Current", void_arg);
                bool_movenext_void = GetMethod (
                        ienumerator_type, "MoveNext", void_arg);
+               void_reset_void = GetMethod (
+                       ienumerator_type, "Reset", void_arg);
                void_dispose_void = GetMethod (
                        idisposable_type, "Dispose", void_arg);
                int_get_offset_to_string_data = GetMethod (
@@ -877,7 +1100,9 @@ public class TypeManager {
                        array_type, "get_Length", void_arg);
                int_array_get_rank = GetMethod (
                        array_type, "get_Rank", void_arg);
-
+               ienumerable_getenumerator_void = GetMethod (
+                       ienumerable_type, "GetEnumerator", void_arg);
+               
                //
                // Int32 arguments
                //
@@ -933,7 +1158,17 @@ public class TypeManager {
 
                unverifiable_code_ctor = GetConstructor (
                        unverifiable_code_type, void_arg);
-               
+
+               //
+               // InvalidOperationException
+               //
+               invalid_operation_ctor = GetConstructor (
+                       invalid_operation_exception_type, void_arg);
+
+
+               // Object
+               object_ctor = GetConstructor (object_type, void_arg);
+
        }
 
        const BindingFlags instance_and_static = BindingFlags.Static | BindingFlags.Instance;
@@ -1020,7 +1255,7 @@ public class TypeManager {
                // a TypeBuilder array will return a Type, not a TypeBuilder,
                // and we can not call FindMembers on this type.
                //
-               if (t.IsSubclassOf (TypeManager.array_type)) {
+               if (t == TypeManager.array_type || t.IsSubclassOf (TypeManager.array_type)) {
                        used_cache = true;
                        return TypeHandle.ArrayType.MemberCache.FindMembers (
                                mt, bf, name, FilterWithClosure_delegate, null);
@@ -1077,6 +1312,21 @@ public class TypeManager {
                        return false;
        }
 
+       //
+       // This is like IsBuiltinType, but lacks decimal_type, we should also clean up
+       // the pieces in the code where we use IsBuiltinType and special case decimal_type.
+       // 
+       public static bool IsCLRType (Type t)
+       {
+               if (t == object_type || t == int32_type || t == uint32_type ||
+                   t == int64_type || t == uint64_type || t == float_type || t == double_type ||
+                   t == char_type || t == short_type || t == bool_type ||
+                   t == sbyte_type || t == byte_type || t == ushort_type)
+                       return true;
+               else
+                       return false;
+       }
+
        public static bool IsDelegateType (Type t)
        {
                if (t.IsSubclassOf (TypeManager.delegate_type))
@@ -1087,7 +1337,7 @@ public class TypeManager {
        
        public static bool IsEnumType (Type t)
        {
-               if (t.IsSubclassOf (TypeManager.enum_type))
+               if (t == TypeManager.enum_type || t.IsSubclassOf (TypeManager.enum_type))
                        return true;
                else
                        return false;
@@ -1096,7 +1346,6 @@ public class TypeManager {
        //
        // Whether a type is unmanaged.  This is used by the unsafe code (25.2)
        //
-       Hashtable managed_types;
        public static bool IsUnmanagedType (Type t)
        {
                if (IsBuiltinType (t) && t != TypeManager.string_type)
@@ -1113,15 +1362,20 @@ public class TypeManager {
                                TypeContainer tc = LookupTypeContainer (t);
 
                                foreach (Field f in tc.Fields){
+                                       if (f.FieldBuilder.IsStatic)
+                                               continue;
                                        if (!IsUnmanagedType (f.FieldBuilder.FieldType))
                                                return false;
                                }
                        } else {
                                FieldInfo [] fields = t.GetFields ();
 
-                               foreach (FieldInfo f in fields)
+                               foreach (FieldInfo f in fields){
+                                       if (f.IsStatic)
+                                               continue;
                                        if (!IsUnmanagedType (f.FieldType))
                                                return false;
+                               }
                        }
                        return true;
                }
@@ -1131,7 +1385,7 @@ public class TypeManager {
                
        public static bool IsValueType (Type t)
        {
-               if (t.IsSubclassOf (TypeManager.value_type))
+               if (t.IsSubclassOf (TypeManager.value_type) && (t != TypeManager.enum_type))
                        return true;
                else
                        return false;
@@ -1168,10 +1422,18 @@ public class TypeManager {
        //
        public static bool IsNestedChildOf (Type type, Type parent)
        {
-               if ((type == parent) || type.IsSubclassOf (parent))
+               if (type == parent)
                        return false;
-               else
-                       return IsSubclassOrNestedChildOf (type, parent);
+
+               type = type.DeclaringType;
+               while (type != null) {
+                       if ((type == parent) || type.IsSubclassOf (parent))
+                               return true;
+
+                       type = type.DeclaringType;
+               }
+
+               return false;
        }
 
        /// <summary>
@@ -1189,6 +1451,38 @@ public class TypeManager {
                }
        }
 
+       static Hashtable attr_to_allowmult;
+
+       public static void RegisterAttributeAllowMultiple (Type attr_type, bool allow)
+       {
+               if (attr_to_allowmult == null)
+                       attr_to_allowmult = new PtrHashtable ();
+
+               if (attr_to_allowmult.Contains (attr_type))
+                       return;
+
+               attr_to_allowmult.Add (attr_type, allow);
+                              
+       }
+
+       public static bool AreMultipleAllowed (Type attr_type)
+       {
+               if (!(attr_type is TypeBuilder)) {
+                       System.Attribute [] attrs = System.Attribute.GetCustomAttributes (attr_type);
+
+                       foreach (System.Attribute tmp in attrs)
+                               if (tmp is AttributeUsageAttribute)
+                                       return ((AttributeUsageAttribute) tmp).AllowMultiple;
+
+                       return false;
+               }
+               
+               if (attr_to_allowmult == null)
+                       return false;
+
+               return (bool) attr_to_allowmult [attr_type];
+       }
+
        static Hashtable builder_to_constant;
 
        public static void RegisterConstant (FieldBuilder fb, Const c)
@@ -1364,7 +1658,7 @@ public class TypeManager {
 
                        return (MethodInfo) pair.Second;
                } else
-                       return ei.GetAddMethod ();
+                       return ei.GetRemoveMethod ();
        }
 
        static Hashtable priv_fields_events;
@@ -1412,57 +1706,6 @@ public class TypeManager {
                return true;
        }
 
-       //
-       // FIXME: we need to return the accessors depending on whether
-       // they are visible or not.
-       //
-       static public MethodInfo [] GetAccessors (PropertyInfo pi)
-       {
-               MethodInfo [] ret;
-
-               if (pi is PropertyBuilder){
-                       Pair pair = (Pair) properties [pi];
-
-                       ret = new MethodInfo [2];
-                       ret [0] = (MethodInfo) pair.First;
-                       ret [1] = (MethodInfo) pair.Second;
-
-                       return ret;
-               } else {
-                       MethodInfo [] mi = new MethodInfo [2];
-
-                       //
-                       // Why this and not pi.GetAccessors?
-                       // Because sometimes index 0 is the getter
-                       // sometimes it is 1
-                       //
-                       mi [0] = pi.GetGetMethod (true);
-                       mi [1] = pi.GetSetMethod (true);
-
-                       return mi;
-               }
-       }
-
-       static public MethodInfo GetPropertyGetter (PropertyInfo pi)
-       {
-               if (pi is PropertyBuilder){
-                       Pair de = (Pair) properties [pi];
-
-                       return (MethodInfo) de.Second;
-               } else
-                       return pi.GetSetMethod ();
-       }
-
-       static public MethodInfo GetPropertySetter (PropertyInfo pi)
-       {
-               if (pi is PropertyBuilder){
-                       Pair de = (Pair) properties [pi];
-
-                       return (MethodInfo) de.First;
-               } else
-                       return pi.GetGetMethod ();
-       }
-
        /// <summary>
        ///   Given an array of interface types, expand and eliminate repeated ocurrences
        ///   of an interface.  
@@ -1565,11 +1808,13 @@ public class TypeManager {
 
        // This is a custom version of Convert.ChangeType() which works
        // with the TypeBuilder defined types when compiling corlib.
-       public static object ChangeType (object value, Type conversionType)
+       public static object ChangeType (object value, Type conversionType, out bool error)
        {
-               if (!(value is IConvertible))
-                       throw new ArgumentException ();
-
+               if (!(value is IConvertible)){
+                       error = true;
+                       return null;
+               }
+               
                IConvertible convertValue = (IConvertible) value;
                CultureInfo ci = CultureInfo.CurrentCulture;
                NumberFormatInfo provider = ci.NumberFormat;
@@ -1580,6 +1825,7 @@ public class TypeManager {
                // the system type itself.  You cannot use Type.GetTypeCode()
                // on such a type - it'd always return TypeCode.Object.
                //
+               error = false;
                if (conversionType.Equals (typeof (Boolean)))
                        return (object)(convertValue.ToBoolean (provider));
                else if (conversionType.Equals (typeof (Byte)))
@@ -1613,7 +1859,8 @@ public class TypeManager {
                else if (conversionType.Equals (typeof (Object)))
                        return (object)(value);
                else 
-                       throw new InvalidCastException ();
+                       error = true;
+               return null;
        }
 
        //
@@ -1936,13 +2183,18 @@ public class TypeManager {
        //
        static Type     closure_invocation_type;
        static Type     closure_queried_type;
-       static Type     closure_start_type;
+       static Type     closure_qualifier_type;
 
        //
        // The assembly that defines the type is that is calling us
        //
        static Assembly closure_invocation_assembly;
 
+       static internal bool FilterNone (MemberInfo m, object filter_criteria)
+       {
+               return true;
+       }
+       
        //
        // This filter filters by name + whether it is ok to include private
        // members in the search
@@ -1955,9 +2207,9 @@ public class TypeManager {
                //
 
                if ((filter_criteria != null) && (m.Name != (string) filter_criteria))
-                               return false;
+                       return false;
 
-               if ((closure_start_type == closure_invocation_type) &&
+               if (((closure_qualifier_type == null) || (closure_qualifier_type == closure_invocation_type)) &&
                    (m.DeclaringType == closure_invocation_type))
                        return true;
 
@@ -1970,7 +2222,8 @@ public class TypeManager {
                        MethodAttributes ma = mb.Attributes & MethodAttributes.MemberAccessMask;
 
                        if (ma == MethodAttributes.Private)
-                               return closure_private_ok || (closure_invocation_type == m.DeclaringType);
+                               return closure_private_ok || (closure_invocation_type == m.DeclaringType) ||
+                                       IsNestedChildOf (closure_invocation_type, m.DeclaringType);
 
                        //
                        // FamAndAssem requires that we not only derivate, but we are on the
@@ -2001,8 +2254,9 @@ public class TypeManager {
 
                                // Although a derived class can access protected members of its base class
                                // it cannot do so through an instance of the base class (CS1540).
-                               if ((closure_invocation_type != closure_start_type) &&
-                                   closure_invocation_type.IsSubclassOf (closure_start_type))
+                               if (!mb.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
+                                   (closure_qualifier_type != null) &&
+                                   closure_invocation_type.IsSubclassOf (closure_qualifier_type))
                                        return false;
 
                                return true;
@@ -2017,7 +2271,8 @@ public class TypeManager {
                        FieldAttributes fa = fi.Attributes & FieldAttributes.FieldAccessMask;
 
                        if (fa == FieldAttributes.Private)
-                               return closure_private_ok || (closure_invocation_type == m.DeclaringType);
+                               return closure_private_ok || (closure_invocation_type == m.DeclaringType) ||
+                                       IsNestedChildOf (closure_invocation_type, m.DeclaringType);
 
                        //
                        // FamAndAssem requires that we not only derivate, but we are on the
@@ -2048,8 +2303,9 @@ public class TypeManager {
 
                                // Although a derived class can access protected members of its base class
                                // it cannot do so through an instance of the base class (CS1540).
-                               if ((closure_invocation_type != closure_start_type) &&
-                                   closure_invocation_type.IsSubclassOf (closure_start_type))
+                               if (!fi.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
+                                   (closure_qualifier_type != null) &&
+                                   closure_invocation_type.IsSubclassOf (closure_qualifier_type))
                                        return false;
 
                                return true;
@@ -2060,51 +2316,73 @@ public class TypeManager {
                }
 
                //
-               // EventInfos and PropertyInfos, return true
+               // EventInfos and PropertyInfos, return true because they lack permission
+               // informaiton, so we need to check later on the methods.
                //
                return true;
        }
 
        static MemberFilter FilterWithClosure_delegate = new MemberFilter (FilterWithClosure);
+       static MemberFilter FilterNone_delegate = new MemberFilter (FilterNone);
 
        //
        // Looks up a member called `name' in the `queried_type'.  This lookup
-       // is done by code that is contained in the definition for `invocation_type'.
+       // is done by code that is contained in the definition for `invocation_type'
+       // through a qualifier of type `qualifier_type' (or null if there is no qualifier).
+       //
+       // `invocation_type' is used to check whether we're allowed to access the requested
+       // member wrt its protection level.
+       //
+       // When called from MemberAccess, `qualifier_type' is the type which is used to access
+       // the requested member (`class B { A a = new A (); a.foo = 5; }'; here invocation_type
+       // is B and qualifier_type is A).  This is used to do the CS1540 check.
+       //
+       // When resolving a SimpleName, `qualifier_type' is null.
+       //
+       // The `qualifier_type' is used for the CS1540 check; it's normally either null or
+       // the same than `queried_type' - except when we're being called from BaseAccess;
+       // in this case, `invocation_type' is the current type and `queried_type' the base
+       // type, so this'd normally trigger a CS1540.
        //
        // The binding flags are `bf' and the kind of members being looked up are `mt'
        //
+       // The return value always includes private members which code in `invocation_type'
+       // is allowed to access (using the specified `qualifier_type' if given); only use
+       // BindingFlags.NonPublic to bypass the permission check.
+       //
        // Returns an array of a single element for everything but Methods/Constructors
        // that might return multiple matches.
        //
-       public static MemberInfo [] MemberLookup (Type invocation_type, Type queried_type, 
-                                                 MemberTypes mt, BindingFlags original_bf, string name)
+       public static MemberInfo [] MemberLookup (Type invocation_type, Type qualifier_type,
+                                                 Type queried_type,  MemberTypes mt,
+                                                 BindingFlags original_bf, string name)
        {
                Timer.StartTimer (TimerType.MemberLookup);
 
-               MemberInfo[] retval = RealMemberLookup (invocation_type, queried_type,
-                                                       mt, original_bf, name);
+               MemberInfo[] retval = RealMemberLookup (invocation_type, qualifier_type,
+                                                       queried_type, mt, original_bf, name);
 
                Timer.StopTimer (TimerType.MemberLookup);
 
                return retval;
        }
 
-       static MemberInfo [] RealMemberLookup (Type invocation_type, Type queried_type, 
-                                              MemberTypes mt, BindingFlags original_bf, string name)
+       static MemberInfo [] RealMemberLookup (Type invocation_type, Type qualifier_type,
+                                              Type queried_type, MemberTypes mt,
+                                              BindingFlags original_bf, string name)
        {
                BindingFlags bf = original_bf;
                
                ArrayList method_list = null;
                Type current_type = queried_type;
                bool searching = (original_bf & BindingFlags.DeclaredOnly) == 0;
-               bool private_ok;
-               bool always_ok_flag = false;
                bool skip_iface_check = true, used_cache = false;
+               bool always_ok_flag = false;
 
                closure_name = name;
                closure_invocation_type = invocation_type;
                closure_invocation_assembly = invocation_type != null ? invocation_type.Assembly : null;
-               closure_start_type = queried_type;
+               closure_qualifier_type = qualifier_type;
 
                //
                // If we are a nested class, we always have access to our container
@@ -2115,7 +2393,7 @@ public class TypeManager {
                        if (invocation_name.IndexOf ('+') != -1){
                                string container = queried_type.FullName + "+";
                                int container_length = container.Length;
-                               
+
                                if (invocation_name.Length > container_length){
                                        string shared = invocation_name.Substring (0, container_length);
                                
@@ -2137,20 +2415,15 @@ public class TypeManager {
                        //    public, private and protected (internal does not come into the
                        //    equation)
                        //
-                       if (invocation_type != null){
-                               if (invocation_type == current_type){
-                                       private_ok = (bf & BindingFlags.NonPublic) != 0;
-                               } else
-                                       private_ok = always_ok_flag;
-
-                               if (private_ok || invocation_type.IsSubclassOf (current_type))
-                                       bf = original_bf | BindingFlags.NonPublic;
-                       } else {
-                               private_ok = false;
-                               bf = original_bf & ~BindingFlags.NonPublic;
-                       }
+                       if ((invocation_type != null) &&
+                           ((invocation_type == current_type) ||
+                            IsNestedChildOf (invocation_type, current_type)) ||
+                           always_ok_flag)
+                               bf = original_bf | BindingFlags.NonPublic;
+                       else
+                               bf = original_bf;
 
-                       closure_private_ok = private_ok;
+                       closure_private_ok = (original_bf & BindingFlags.NonPublic) != 0;
                        closure_queried_type = current_type;
 
                        Timer.StopTimer (TimerType.MemberLookup);
@@ -2188,7 +2461,7 @@ public class TypeManager {
                        
                        if (list.Count == 0)
                                continue;
-                       
+
                        //
                        // Events and types are returned by both `static' and `instance'
                        // searches, which means that our above FindMembers will
@@ -2205,11 +2478,23 @@ public class TypeManager {
                        if (list [0] is PropertyInfo)
                                return (MemberInfo []) list;
 
+                       //
+                       // We found an event: the cache lookup returns both the event and
+                       // its private field.
+                       //
+                       if (list [0] is EventInfo) {
+                               if ((list.Count == 2) && (list [1] is FieldInfo))
+                                       return new MemberInfo [] { list [0] };
+
+                               // Oooops
+                               return null;
+                       }
+
                        //
                        // We found methods, turn the search into "method scan"
                        // mode.
                        //
-                       
+
                        method_list = CopyNewMethods (method_list, list);
                        mt &= (MemberTypes.Method | MemberTypes.Constructor);
                } while (searching);
@@ -2241,13 +2526,96 @@ public class TypeManager {
                foreach (Type itype in ifaces){
                        MemberInfo [] x;
 
-                       x = MemberLookup (null, itype, mt, bf, name);
+                       x = MemberLookup (null, null, itype, mt, bf, name);
                        if (x != null)
                                return x;
                }
                                        
                return null;
        }
+
+       //
+       // This is used to extract properties and event declarations from a type
+       //
+       static MemberInfo [] SpecialContainerLookup (Type t, bool is_static)
+       {
+               BindingFlags bf = BindingFlags.DeclaredOnly | (is_static ? BindingFlags.Static : BindingFlags.Instance);
+
+               bf |= BindingFlags.Public | BindingFlags.NonPublic;
+               
+               if (t is TypeBuilder) {
+                       DeclSpace decl = (DeclSpace) builder_to_declspace [t];
+
+                       return (MemberInfo []) decl.FindMembers (
+                               MemberTypes.Property | MemberTypes.Event,
+                               bf, FilterNone_delegate, null);
+               } else {
+                       return t.FindMembers (MemberTypes.Property | MemberTypes.Event,
+                                             bf, FilterNone_delegate, null);
+
+               }
+       }
+       
+       public static bool IsSpecialMethod (MethodBase mb)
+       {
+               Type t = mb.DeclaringType;
+               
+               MemberInfo [] matches = TypeManager.SpecialContainerLookup (t, mb.IsStatic);
+               if (matches == null)
+                       return false;
+               
+               foreach (MemberInfo mi in matches){
+                       if (mi is PropertyBuilder){
+                               Pair p = (Pair) properties [mi];
+
+                               if (p.First == mb || p.Second == mb)
+                                       return true;
+                       } else if (mi is PropertyInfo){
+                               MethodInfo [] methods = ((PropertyInfo) mi).GetAccessors (true);
+                               
+                               foreach (MethodInfo m in methods){
+                                       if (m == mb)
+                                               return true;
+                               }
+                       } else if (mi is MyEventBuilder){
+                               Pair p = (Pair) events [mi];
+
+                               if (p.First == mb || p.Second == mb)
+                                       return true;
+                       } else if (mi is EventInfo){
+                               EventInfo ei = ((EventInfo) mi);
+                               
+                               if (ei.GetAddMethod (true) == mb)
+                                       return true;
+                               
+                               if (ei.GetRemoveMethod (true) == mb)
+                                       return true;
+                               
+                               if (ei.GetRaiseMethod (true) == mb)
+                                       return true;
+                       }
+               }
+
+               //
+               // Now check if it is an operator method
+               //
+               string s = mb.Name;
+
+               if (s.StartsWith ("op_")){
+                       foreach (string name in Unary.oper_names){
+                               if (s == name)
+                                       return true;
+                       }
+
+                       foreach (string name in Binary.oper_names){
+                               if (s == name)
+                                       return true;
+                       }
+               }
+               
+               return false;
+       }
+               
 #endregion
        
 }