Small bug fix, to render better an acurrate error
[mono.git] / mcs / mcs / typemanager.cs
index 45d845cd317d43ad0b2c33cdee0a9c93477c1e0c..58f9a0168cc7ed2386ff67a511741714f536acbd 100755 (executable)
@@ -23,6 +23,7 @@ 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;
@@ -60,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;
@@ -78,8 +80,10 @@ public class TypeManager {
        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
@@ -135,6 +139,8 @@ public class TypeManager {
        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;
@@ -154,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
@@ -468,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
        //
@@ -513,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
@@ -531,27 +615,27 @@ public class TypeManager {
                if (t != null)
                        return t;
 
-#if SIMPLE_SPEEDUP
+               // Two thirds of the failures are caught here.
                if (negative_hits.Contains (name))
                        return null;
-#endif
-               
-               //
-               // 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.
-               //
-               
+
                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){
@@ -567,37 +651,20 @@ public class TypeManager {
                                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;
                }
-
-#if SIMPLE_SPEEDUP
                negative_hits [name] = true;
-#endif
                return null;
        }
 
-       static Hashtable assemblies_namespaces = new Hashtable ();
-       
-       //
-       // Returns a list of all namespaces in the assemblies and types loaded.
-       //
-       static Hashtable ExtractAssemblyNamespaces ()
-       {
-               foreach (Assembly a in assemblies){
-                       foreach (Type t in a.GetTypes ()){
-                               string ns = t.Namespace;
-
-                               if (assemblies_namespaces.Contains (ns))
-                                       continue;
-                               assemblies_namespaces [ns] = ns;
-                       }
-               }
-
-               return assemblies_namespaces;
-       }
+       // Total list of known namespaces for the compilation 
+       static string [] namespaces;
 
        static Hashtable AddModuleNamespaces (Hashtable h)
        {
@@ -615,126 +682,108 @@ public class TypeManager {
        
        
        /// <summary>
-       ///   Returns the list of namespaces that are active for this executable
+       ///   Computes the namespaces that we import from the assemblies we reference.
        /// </summary>
-       public static Hashtable GetAssemblyNamespaces (string executable_name)
-       {
-               string cache_name = executable_name + ".nsc";
-               Hashtable cached_namespaces = LoadCache (cache_name);
-
-               if (cached_namespaces != null)
-                       assemblies_namespaces = cached_namespaces;
-               else {
-                       Console.WriteLine ("rebuilding namespace cache");
-                       assemblies_namespaces = ExtractAssemblyNamespaces ();
-                       SaveCache (cache_name);
-               }
-
-               return assemblies_namespaces;
-       }
-
-       public static Hashtable GetNamespaces ()
-       {
-               if (assemblies_namespaces == null)
-                       assemblies_namespaces = ExtractAssemblyNamespaces ();
-
-               Hashtable nh = (Hashtable) assemblies_namespaces.Clone ();
-
-               return AddModuleNamespaces (nh);
-       }
-       
-       //
-       // Loads the namespace cache for the given executable name
-       //
-       static Hashtable LoadCache (string cache_file)
+       public static void ComputeNamespaces ()
        {
-               if (!File.Exists (cache_file)){
-                       Console.WriteLine ("Cache not found");
-                       return null;
-               }
-               
+               MethodInfo assembly_get_namespaces = typeof (Assembly).GetMethod ("GetNamespaces");
 
-               Hashtable cached_module_list, cached_namespaces;
-               try {
-                       using (FileStream fs = File.OpenRead (cache_file)){
-                               StreamReader reader = new StreamReader (fs);
-                               
-                               int assembly_count = Int32.Parse (reader.ReadLine ());
+               //
+               // 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;
 
-                               if (assembly_count != assemblies.Length){
-                                       Console.WriteLine ("Assembly missmatch ({0}, {1})", assembly_count, assemblies.Length);
-                                       return null;
+                                       // 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;
                                
-                               int namespace_count = Int32.Parse (reader.ReadLine ());
-                               
-                               cached_module_list = new Hashtable (assembly_count);
-                               for (int i = 0; i < assembly_count; i++)
-                                       cached_module_list [reader.ReadLine ()] = true;
-
-                               cached_namespaces = new Hashtable (namespace_count);
-                               for (int i = 0; i < namespace_count; i++){
-                                       string s = reader.ReadLine ();
-                                       cached_namespaces [s] = s;
+                                       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;
                                }
                        }
-
-                       //
-                       // Now, check that the cache is still valid
-                       //
                        
-                       foreach (Assembly a in assemblies)
-                               if (cached_module_list [a.CodeBase] == null){
-                                       Console.WriteLine ("assembly not found in cache: " + a.CodeBase);
-                                       return null;
-                               }
+                       namespaces_hash [name] = true;
+               }
 
-                       return cached_namespaces;
-               } catch {
+               //
+               // Store it sorted
+               //
+               int idx = 0;
+               TypeManager.namespaces = new string [namespaces_hash.Count];
+               foreach (string ns in namespaces_hash.Keys){
+                       namespaces [idx++] = ns;
                }
-               return null;
+               Array.Sort (namespaces);
        }
 
-       static void SaveCache (string cache_file)
+       public static bool IsNamespace (string name)
        {
-               try {
-                       using (FileStream fs = File.OpenWrite (cache_file)){
-                               StreamWriter writer = new StreamWriter (fs);
-
-                               writer.WriteLine (assemblies.Length);
-                               writer.WriteLine (assemblies_namespaces.Count);
-
-                               foreach (Assembly a in assemblies)
-                                       writer.WriteLine (a.CodeBase);
-
-                               foreach (DictionaryEntry de in assemblies_namespaces){
-                                       writer.WriteLine ((string) de.Key);
-                               }
-
-                               writer.Flush ();
-                               fs.Flush ();
-                       }
-               } catch (Exception e) {
-                       Console.WriteLine ("Failed: " + e);
-               }
+               if (Array.BinarySearch (namespaces, name) < 0)
+                       return false;
+               
+               return true;
        }
-       
-       public static void GetAllTypes ()
-       {
-               Hashtable namespaces = new Hashtable ();
 
-               foreach (Assembly a in assemblies){
-                       foreach (Type t in a.GetTypes ()){
-                       }
-               }
+       public static bool NamespaceClash (string name)
+       {
+               if (Array.BinarySearch (namespaces, name) < 0)
+                       return false;
 
-               foreach (ModuleBuilder mb in modules){
-                       foreach (Type t in mb.GetTypes ()){
-                       }
-               }
+               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>
@@ -742,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)", 
@@ -799,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");
@@ -913,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");
@@ -922,14 +972,13 @@ 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");
 
                //
-               // Temporary while people upgrade their corlibs
-               //
-               //
-               // Change from LookupType to CoreLookupType before release
+               // Sigh. Remove this before the release.  Wonder what versions of Mono
+               // people are running.
                //
                guid_attr_type        = LookupType ("System.Runtime.InteropServices.GuidAttribute");
 
@@ -940,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
@@ -978,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");
                        }
                }
        }
@@ -1040,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 (
@@ -1048,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
                //
@@ -1104,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;
@@ -1191,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);
@@ -1273,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;
@@ -1321,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;
@@ -1358,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>
@@ -1379,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)
@@ -1554,7 +1658,7 @@ public class TypeManager {
 
                        return (MethodInfo) pair.Second;
                } else
-                       return ei.GetAddMethod ();
+                       return ei.GetRemoveMethod ();
        }
 
        static Hashtable priv_fields_events;
@@ -1704,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;
@@ -1719,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)))
@@ -1752,7 +1859,8 @@ public class TypeManager {
                else if (conversionType.Equals (typeof (Object)))
                        return (object)(value);
                else 
-                       throw new InvalidCastException ();
+                       error = true;
+               return null;
        }
 
        //
@@ -2082,6 +2190,11 @@ public class TypeManager {
        //
        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
@@ -2109,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
@@ -2157,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
@@ -2208,6 +2323,7 @@ public class TypeManager {
        }
 
        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
@@ -2307,7 +2423,7 @@ public class TypeManager {
                        else
                                bf = original_bf;
 
-                       closure_private_ok = (bf & BindingFlags.NonPublic) != 0;
+                       closure_private_ok = (original_bf & BindingFlags.NonPublic) != 0;
                        closure_queried_type = current_type;
 
                        Timer.StopTimer (TimerType.MemberLookup);
@@ -2345,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
@@ -2362,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);
@@ -2405,6 +2533,89 @@ public class TypeManager {
                                        
                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
        
 }