2005-01-31 Zoltan Varga <vargaz@freemail.hu>
[mono.git] / mcs / class / corlib / System.Reflection.Emit / TypeBuilder.cs
index 73f358a322b9ba1d7a16dfc9f8e4102154a6b5c7..9e2468fae1784851527a79af32a9a5172f48b8be 100644 (file)
@@ -7,6 +7,29 @@
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Text;
 using System.Reflection;
@@ -21,6 +44,7 @@ using System.Security.Permissions;
 namespace System.Reflection.Emit {
 
        public sealed class TypeBuilder : Type {
+       #region Sync with reflection.h
        private string tname;
        private string nspace;
        private Type parent;
@@ -35,13 +59,20 @@ namespace System.Reflection.Emit {
        private EventBuilder[] events;
        private CustomAttributeBuilder[] cattrs;
        internal TypeBuilder[] subtypes;
-       private TypeAttributes attrs;
+       internal TypeAttributes attrs;
        private int table_idx;
        private ModuleBuilder pmodule;
        private int class_size;
        private PackingSize packing_size;
-       private MonoGenericParam[] generic_params;
+       private IntPtr generic_container;
+#if NET_2_0 || BOOTSTRAP_NET_2_0
+       private GenericTypeParameterBuilder[] generic_params;
+#else
+        private Object generic_params; /* so offsets don't change */
+#endif
+       private RefEmitPermissionSet[] permissions;     
        private Type created;
+       #endregion
        string fullname;
 
        public const int UnspecifiedTypeSize = 0;
@@ -57,12 +88,19 @@ namespace System.Reflection.Emit {
                private extern void create_internal_class (TypeBuilder tb);
                
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern void setup_generic_class (TypeBuilder tb);
+               private extern void setup_generic_class ();
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               private extern void create_generic_class ();
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               private extern EventInfo get_event_info (EventBuilder eb);
 
                internal TypeBuilder (ModuleBuilder mb, TypeAttributes attr) {
                        this.parent = null;
                        this.attrs = attr;
-                       this.class_size = -1;
+                       this.class_size = UnspecifiedTypeSize;
+                       this.table_idx = 1;
                        fullname = this.tname = "<Module>";
                        this.nspace = "";
                        pmodule = mb;
@@ -158,7 +196,8 @@ namespace System.Reflection.Emit {
        
                public override Guid GUID {
                        get {
-                           throw not_supported ();
+                               check_created ();
+                               return created.GUID;
                        }
                }
 
@@ -179,16 +218,37 @@ namespace System.Reflection.Emit {
                }
                public override Type ReflectedType {get {return nesting_type;}}
 
-               [MonoTODO]
                public void AddDeclarativeSecurity( SecurityAction action, PermissionSet pset) {
-                       throw new NotImplementedException ();
+                       if (pset == null)
+                               throw new ArgumentNullException ("pset");
+                       if ((action == SecurityAction.RequestMinimum) ||
+                               (action == SecurityAction.RequestOptional) ||
+                               (action == SecurityAction.RequestRefuse))
+                               throw new ArgumentException ("Request* values are not permitted", "action");
+
+                       check_not_created ();
+
+                       if (permissions != null) {
+                               /* Check duplicate actions */
+                               foreach (RefEmitPermissionSet set in permissions)
+                                       if (set.action == action)
+                                               throw new InvalidOperationException ("Multiple permission sets specified with the same SecurityAction.");
+
+                               RefEmitPermissionSet[] new_array = new RefEmitPermissionSet [permissions.Length + 1];
+                               permissions.CopyTo (new_array, 0);
+                               permissions = new_array;
+                       }
+                       else
+                               permissions = new RefEmitPermissionSet [1];
+
+                       permissions [permissions.Length - 1] = new RefEmitPermissionSet (action, pset.ToXml ().ToString ());
+                       attrs |= TypeAttributes.HasSecurity;
                }
 
                public void AddInterfaceImplementation( Type interfaceType) {
                        if (interfaceType == null)
                                throw new ArgumentNullException ("interfaceType");
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
 
                        if (interfaces != null) {
                                // Check for duplicates
@@ -211,6 +271,8 @@ namespace System.Reflection.Emit {
                                                                       CallingConventions callConvention, Type[] types,
                                                                       ParameterModifier[] modifiers)
                {
+                       check_created ();
+                       
                        if (ctors == null)
                                return null;
 
@@ -258,12 +320,16 @@ namespace System.Reflection.Emit {
                
                public override object[] GetCustomAttributes(bool inherit)
                {
-                       throw not_supported ();
+                       check_created ();
+
+                       return created.GetCustomAttributes (inherit);
                }
                
                public override object[] GetCustomAttributes(Type attributeType, bool inherit)
                {
-                       throw not_supported ();
+                       check_created ();
+
+                       return created.GetCustomAttributes (attributeType, inherit);
                }
 
                public TypeBuilder DefineNestedType (string name) {
@@ -324,15 +390,14 @@ namespace System.Reflection.Emit {
                        return DefineConstructor (attributes, callingConvention, parameterTypes, null, null);
                }
 
-#if NET_1_2
+#if NET_2_0 || BOOTSTRAP_NET_2_0
                public
 #else
                internal
 #endif
                ConstructorBuilder DefineConstructor (MethodAttributes attributes, CallingConventions callingConvention, Type[] parameterTypes, Type[][] requiredCustomModifiers, Type[][] optionalCustomModifiers)
                {
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
                        ConstructorBuilder cb = new ConstructorBuilder (this, attributes, callingConvention, parameterTypes, requiredCustomModifiers, optionalCustomModifiers);
                        if (ctors != null) {
                                ConstructorBuilder[] new_ctors = new ConstructorBuilder [ctors.Length+1];
@@ -348,8 +413,6 @@ namespace System.Reflection.Emit {
 
                public ConstructorBuilder DefineDefaultConstructor (MethodAttributes attributes)
                {
-                       ConstructorBuilder cb = DefineConstructor (attributes, CallingConventions.Standard, new Type [0]);
-
                        Type parent_type;
 
                        if (parent != null)
@@ -361,12 +424,18 @@ namespace System.Reflection.Emit {
                                parent_type.GetConstructor (
                                        BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
                                        null, Type.EmptyTypes, null);
+                       if (parent_constructor == null) {
+                               throw new NotSupportedException ("Parent does"
+                                       + " not have a default constructor."
+                                       + " The default constructor must be"
+                                       + " explicitly defined.");
+                       }
 
+                       ConstructorBuilder cb = DefineConstructor (attributes, 
+                               CallingConventions.Standard, new Type[0]);
                        ILGenerator ig = cb.GetILGenerator ();
-                       if (parent_constructor != null){
-                               ig.Emit (OpCodes.Ldarg_0);
-                               ig.Emit (OpCodes.Call, parent_constructor);
-                       }
+                       ig.Emit (OpCodes.Ldarg_0);
+                       ig.Emit (OpCodes.Call, parent_constructor);
                        ig.Emit (OpCodes.Ret);
                        return cb;
                }
@@ -393,15 +462,14 @@ namespace System.Reflection.Emit {
                        return DefineMethod (name, attributes, callingConvention, returnType, null, null, parameterTypes, null, null);
                }
 
-#if NET_1_2
+#if NET_2_0 || BOOTSTRAP_NET_2_0
                public
 #else
                internal
 #endif
                MethodBuilder DefineMethod( string name, MethodAttributes attributes, CallingConventions callingConvention, Type returnType, Type[] returnTypeRequiredCustomModifiers, Type[] returnTypeOptionalCustomModifiers, Type[] parameterTypes, Type[][] parameterTypeRequiredCustomModifiers, Type[][] parameterTypeOptionalCustomModifiers) {
                        check_name ("name", name);
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
                        if (IsInterface && (
                                !((attributes & MethodAttributes.Abstract) != 0) || 
                                !((attributes & MethodAttributes.Virtual) != 0)))
@@ -418,7 +486,7 @@ namespace System.Reflection.Emit {
                        return DefinePInvokeMethod (name, dllName, entryName, attributes, callingConvention, returnType, null, null, parameterTypes, null, null, nativeCallConv, nativeCharSet);
                }
 
-#if NET_1_2
+#if NET_2_0 || BOOTSTRAP_NET_2_0
                public
 #else
                internal
@@ -443,8 +511,7 @@ namespace System.Reflection.Emit {
                                throw new ArgumentException ("attributes", "PInvoke methods must be static and native and cannot be abstract.");
                        if (IsInterface)
                                throw new ArgumentException ("PInvoke methods cannot exist on interfaces.");            
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
 
                        MethodBuilder res 
                                = new MethodBuilder (
@@ -476,8 +543,7 @@ namespace System.Reflection.Emit {
                                throw new ArgumentNullException ("methodInfoBody");
                        if (methodInfoDeclaration == null)
                                throw new ArgumentNullException ("methodInfoDeclaration");
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
 
                        if (methodInfoBody is MethodBuilder) {
                                MethodBuilder mb = (MethodBuilder)methodInfoBody;
@@ -489,17 +555,16 @@ namespace System.Reflection.Emit {
                        return DefineField (fieldName, type, null, null, attributes);
                }
 
-#if NET_1_2
+#if NET_2_0 || BOOTSTRAP_NET_2_0
                public
 #else
                internal
 #endif
-           FieldBuilder DefineFieldstring fieldName, Type type, Type[] requiredCustomAttributes, Type[] optionalCustomAttributes, FieldAttributes attributes) {
+           FieldBuilder DefineField (string fieldName, Type type, Type[] requiredCustomAttributes, Type[] optionalCustomAttributes, FieldAttributes attributes) {
                        check_name ("fieldName", fieldName);
                        if (type == typeof (void))
                                throw new ArgumentException ("type",  "Bad field type in defining field.");
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
 
                        FieldBuilder res = new FieldBuilder (this, fieldName, type, attributes, requiredCustomAttributes, optionalCustomAttributes);
                        if (fields != null) {
@@ -525,8 +590,7 @@ namespace System.Reflection.Emit {
                                foreach (Type param in parameterTypes)
                                        if (param == null)
                                                throw new ArgumentNullException ("parameterTypes");
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
 
                        PropertyBuilder res = new PropertyBuilder (this, name, attributes, returnType, parameterTypes);
 
@@ -561,8 +625,8 @@ namespace System.Reflection.Emit {
                
                public Type CreateType() {
                        /* handle nesting_type */
-                       if (is_created)
-                               throw not_after_created ();
+                       if (created != null)
+                               return created;
 
                        // Fire TypeResolve events for fields whose type is an unfinished
                        // value type.
@@ -594,7 +658,8 @@ namespace System.Reflection.Emit {
                        //
                        // On classes, define a default constructor if not provided
                        //
-                       if (!(IsInterface || IsValueType) && (ctors == null) && (tname != "<Module>"))
+                       if (!(IsInterface || IsValueType) && (ctors == null) && (tname != "<Module>") && 
+                               (GetAttributeFlagsImpl () & TypeAttributes.Abstract | TypeAttributes.Sealed) != (TypeAttributes.Abstract | TypeAttributes.Sealed))
                                DefineDefaultConstructor (MethodAttributes.Public);
 
                        if (ctors != null){
@@ -646,11 +711,13 @@ namespace System.Reflection.Emit {
                }
 
                public override Type GetElementType () { 
-                       throw not_supported ();
+                       check_created ();
+                       return created.GetElementType ();
                }
 
                public override EventInfo GetEvent (string name, BindingFlags bindingAttr) {
-                       throw not_supported ();
+                       check_created ();
+                       return created.GetEvent (name, bindingAttr);
                }
 
                /* Needed to keep signature compatibility with MS.NET */
@@ -660,9 +727,60 @@ namespace System.Reflection.Emit {
                }
 
                public override EventInfo[] GetEvents (BindingFlags bindingAttr) {
-                       // FIXME: Under MS.NET, this throws a NotImplementedException
-                       // But mcs calls this method. How can that be?
-                       return new EventInfo [0];
+                       /* FIXME: mcs calls this
+                          check_created ();
+                       */
+                       if (!is_created)
+                               return new EventInfo [0];
+                       else
+                               return created.GetEvents (bindingAttr);
+               }
+
+               // This is only used from MonoGenericInst.initialize().
+               internal EventInfo[] GetEvents_internal (BindingFlags bindingAttr)
+               {
+                       if (events == null)
+                               return new EventInfo [0];
+                       ArrayList l = new ArrayList ();
+                       bool match;
+                       MethodAttributes mattrs;
+                       MethodInfo accessor;
+
+                       foreach (EventBuilder eb in events) {
+                               if (eb == null)
+                                       continue;
+                               EventInfo c = get_event_info (eb);
+                               match = false;
+                               accessor = c.GetAddMethod (true);
+                               if (accessor == null)
+                                       accessor = c.GetRemoveMethod (true);
+                               if (accessor == null)
+                                       continue;
+                               mattrs = accessor.Attributes;
+                               if ((mattrs & MethodAttributes.MemberAccessMask) == MethodAttributes.Public) {
+                                       if ((bindingAttr & BindingFlags.Public) != 0)
+                                               match = true;
+                               } else {
+                                       if ((bindingAttr & BindingFlags.NonPublic) != 0)
+                                               match = true;
+                               }
+                               if (!match)
+                                       continue;
+                               match = false;
+                               if ((mattrs & MethodAttributes.Static) != 0) {
+                                       if ((bindingAttr & BindingFlags.Static) != 0)
+                                               match = true;
+                               } else {
+                                       if ((bindingAttr & BindingFlags.Instance) != 0)
+                                               match = true;
+                               }
+                               if (!match)
+                                       continue;
+                               l.Add (c);
+                       }
+                       EventInfo[] result = new EventInfo [l.Count];
+                       l.CopyTo (result);
+                       return result;
                }
 
                public override FieldInfo GetField( string name, BindingFlags bindingAttr) {
@@ -742,7 +860,8 @@ namespace System.Reflection.Emit {
                }
 
                public override Type GetInterface (string name, bool ignoreCase) {
-                       throw not_supported ();
+                       check_created ();
+                       return created.GetInterface (name, ignoreCase);
                }
                
                public override Type[] GetInterfaces () {
@@ -757,23 +876,44 @@ namespace System.Reflection.Emit {
 
                public override MemberInfo[] GetMember (string name, MemberTypes type,
                                                                                                BindingFlags bindingAttr) {
-                       throw not_supported ();
+                       check_created ();
+                       return created.GetMember (name, type, bindingAttr);
                }
 
                public override MemberInfo[] GetMembers (BindingFlags bindingAttr) {
-                       throw not_supported ();
-               }
-
-               public override MethodInfo[] GetMethods (BindingFlags bindingAttr) {
-                       if (methods == null)
+                       check_created ();
+                       return created.GetMembers (bindingAttr);
+               }
+
+               private MethodInfo[] GetMethodsByName (string name, BindingFlags bindingAttr, bool ignoreCase, Type reflected_type) {
+                       MethodInfo[] candidates;
+                       if (((bindingAttr & BindingFlags.DeclaredOnly) == 0) && (parent != null)) {
+                               MethodInfo[] parent_methods = parent.GetMethods (bindingAttr);
+                               if (methods == null)
+                                       candidates = parent_methods;
+                               else {
+                                       candidates = new MethodInfo [methods.Length + parent_methods.Length];
+                                       parent_methods.CopyTo (candidates, 0);
+                                       methods.CopyTo (candidates, parent_methods.Length);
+                               }
+                       }
+                       else
+                               candidates = methods;
+                                       
+                       if (candidates == null)
                                return new MethodInfo [0];
+
                        ArrayList l = new ArrayList ();
                        bool match;
                        MethodAttributes mattrs;
 
-                       foreach (MethodInfo c in methods) {
+                       foreach (MethodInfo c in candidates) {
                                if (c == null)
                                        continue;
+                               if (name != null) {
+                                       if (String.Compare (c.Name, name, ignoreCase) != 0)
+                                               continue;
+                               }
                                match = false;
                                mattrs = c.Attributes;
                                if ((mattrs & MethodAttributes.MemberAccessMask) == MethodAttributes.Public) {
@@ -797,23 +937,74 @@ namespace System.Reflection.Emit {
                                        continue;
                                l.Add (c);
                        }
+
                        MethodInfo[] result = new MethodInfo [l.Count];
                        l.CopyTo (result);
                        return result;
                }
 
-               protected override MethodInfo GetMethodImpl( string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
-                       throw not_supported ();
+               public override MethodInfo[] GetMethods (BindingFlags bindingAttr) {
+                       return GetMethodsByName (null, bindingAttr, false, this);
                }
-               
+
+               protected override MethodInfo GetMethodImpl (string name, BindingFlags bindingAttr,
+                                                            Binder binder,
+                                                            CallingConventions callConvention,
+                                                            Type[] types, ParameterModifier[] modifiers)
+               {
+                       check_created ();
+
+                       bool ignoreCase = ((bindingAttr & BindingFlags.IgnoreCase) != 0);
+                       MethodInfo[] methods = GetMethodsByName (name, bindingAttr, ignoreCase, this);
+                       MethodInfo found = null;
+                       MethodBase[] match;
+                       int typesLen = (types != null) ? types.Length : 0;
+                       int count = 0;
+                       
+                       foreach (MethodInfo m in methods) {
+                               // Under MS.NET, Standard|HasThis matches Standard...
+                               if (callConvention != CallingConventions.Any && ((m.CallingConvention & callConvention) != callConvention))
+                                       continue;
+                               found = m;
+                               count++;
+                       }
+
+                       if (count == 0)
+                               return null;
+                       
+                       if (count == 1 && typesLen == 0) 
+                               return found;
+
+                       match = new MethodBase [count];
+                       if (count == 1)
+                               match [0] = found;
+                       else {
+                               count = 0;
+                               foreach (MethodInfo m in methods) {
+                                       if (callConvention != CallingConventions.Any && ((m.CallingConvention & callConvention) != callConvention))
+                                               continue;
+                                       match [count++] = m;
+                               }
+                       }
+                       
+                       if (types == null) 
+                               return (MethodInfo) Binder.FindMostDerivedMatch (match);
+
+                       if (binder == null)
+                               binder = Binder.DefaultBinder;
+                       
+                       return (MethodInfo)binder.SelectMethod (bindingAttr, match, types, modifiers);
+               }
+
                public override Type GetNestedType( string name, BindingFlags bindingAttr) {
-                       throw not_supported ();
+                       check_created ();
+                       return created.GetNestedType (name, bindingAttr);
                }
 
                public override Type[] GetNestedTypes (BindingFlags bindingAttr) {
                        bool match;
                        ArrayList result = new ArrayList ();
-               
+
                        if (subtypes == null)
                                return Type.EmptyTypes;
                        foreach (TypeBuilder t in subtypes) {
@@ -881,14 +1072,13 @@ namespace System.Reflection.Emit {
                }
 
                protected override bool HasElementTypeImpl () {
-                       // According to the MSDN docs, this is supported for TypeBuilders,
-                       // but in reality, it is not
-                       throw not_supported ();
-                       //                      return IsArrayImpl() || IsByRefImpl() || IsPointerImpl ();
+                       check_created ();
+                       return created.HasElementType;
                }
 
                public override object InvokeMember( string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters) {
-                       throw not_supported ();
+                       check_created ();
+                       return created.InvokeMember (name, invokeAttr, binder, target, args, modifiers, culture, namedParameters);
                }
 
                protected override bool IsArrayImpl ()
@@ -919,7 +1109,8 @@ namespace System.Reflection.Emit {
                
                public override RuntimeTypeHandle TypeHandle { 
                        get { 
-                               throw not_supported (); 
+                               check_created ();
+                               return created.TypeHandle;
                        } 
                }
 
@@ -957,8 +1148,19 @@ namespace System.Reflection.Emit {
                                for (int i = 0; i < nnamed; ++i) {
                                        byte named_type = data [pos++];
                                        byte type = data [pos++];
-                                       int len = CustomAttributeBuilder.decode_len (data, pos, out pos);
-                                       string named_name = CustomAttributeBuilder.string_from_bytes (data, pos, len);
+                                       int len;
+                                       string named_name;
+
+                                       if (type == 0x55) {
+                                               len = CustomAttributeBuilder.decode_len (data, pos, out pos);
+                                               string named_typename = CustomAttributeBuilder.string_from_bytes (data, pos, len);
+                                               pos += len;
+                                               // FIXME: Check that 'named_type' and 'named_typename' match, etc.
+                                               //        See related code/FIXME in mono/mono/metadata/reflection.c
+                                       }
+
+                                       len = CustomAttributeBuilder.decode_len (data, pos, out pos);
+                                       named_name = CustomAttributeBuilder.string_from_bytes (data, pos, len);
                                        pos += len;
                                        /* all the fields are integers in StructLayout */
                                        int value = (int)data [pos++];
@@ -1014,8 +1216,7 @@ namespace System.Reflection.Emit {
                        check_name ("name", name);
                        if (eventtype == null)
                                throw new ArgumentNullException ("eventtype");
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
 
                        EventBuilder res = new EventBuilder (this, name, attributes, eventtype);
                        if (events != null) {
@@ -1030,37 +1231,33 @@ namespace System.Reflection.Emit {
                        return res;
                }
 
-               static int InitializedDataCount = 0;
-               
                public FieldBuilder DefineInitializedData( string name, byte[] data, FieldAttributes attributes) {
-                       check_name ("name", name);
                        if (data == null)
                                throw new ArgumentNullException ("data");
                        if ((data.Length == 0) || (data.Length > 0x3f0000))
                                throw new ArgumentException ("data", "Data size must be > 0 and < 0x3f0000");
-                       if (is_created)
-                               throw not_after_created ();
 
-                       string s = "$ArrayType$"+InitializedDataCount.ToString();
-                       TypeBuilder datablobtype = DefineNestedType (s,
-                               TypeAttributes.NestedPrivate|TypeAttributes.ExplicitLayout|TypeAttributes.Sealed,
-                               pmodule.assemblyb.corlib_value_type, null, PackingSize.Size1, data.Length);
-                       datablobtype.CreateType ();
-                       FieldBuilder res = DefineField (name, datablobtype, attributes|FieldAttributes.Assembly|FieldAttributes.Static|FieldAttributes.HasFieldRVA);
+                       FieldBuilder res = DefineUninitializedData (name, data.Length, attributes);
                        res.SetRVAData (data);
-                       InitializedDataCount++;
+
                        return res;
                }
 
-               [MonoTODO]
+               static int UnmanagedDataCount = 0;
+               
                public FieldBuilder DefineUninitializedData( string name, int size, FieldAttributes attributes) {
                        check_name ("name", name);
                        if ((size <= 0) || (size > 0x3f0000))
-                               throw new ArgumentException ("data", "Data size must be > 0 and < 0x3f0000");
-                       if (is_created)
-                               throw not_after_created ();
+                               throw new ArgumentException ("size", "Data size must be > 0 and < 0x3f0000");
+                       check_not_created ();
 
-                       throw new NotImplementedException ();
+                       string s = "$ArrayType$"+UnmanagedDataCount.ToString();
+                       UnmanagedDataCount++;
+                       TypeBuilder datablobtype = DefineNestedType (s,
+                               TypeAttributes.NestedPrivate|TypeAttributes.ExplicitLayout|TypeAttributes.Sealed,
+                               pmodule.assemblyb.corlib_value_type, null, PackingSize.Size1, size);
+                       datablobtype.CreateType ();
+                       return DefineField (name, datablobtype, attributes|FieldAttributes.Static|FieldAttributes.HasFieldRVA);
                }
 
                public TypeToken TypeToken {
@@ -1071,10 +1268,11 @@ namespace System.Reflection.Emit {
                public void SetParent (Type parentType) {
                        if (parentType == null)
                                throw new ArgumentNullException ("parentType");
-                       if (is_created)
-                               throw not_after_created ();
+                       check_not_created ();
 
                        parent = parentType;
+                       // will just set the parent-related bits if called a second time
+                       setup_internal_class (this);
                }
                internal int get_next_table_index (object obj, int table, bool inc) {
                        return pmodule.get_next_table_index (obj, table, inc);
@@ -1099,9 +1297,16 @@ namespace System.Reflection.Emit {
                        return new NotSupportedException ("The invoked member is not supported in a dynamic module.");
                }
 
-               private Exception not_after_created ()
+               private void check_not_created ()
+               {
+                       if (is_created)
+                               throw new InvalidOperationException ("Unable to change after type has been created.");
+               }
+
+               private void check_created ()
                {
-                       return new InvalidOperationException ("Unable to change after type has been created.");
+                       if (!is_created)
+                               throw not_supported ();
                }
 
                private void check_name (string argName, string name)
@@ -1114,10 +1319,39 @@ namespace System.Reflection.Emit {
                                throw new ArgumentException (argName, "Illegal name.");
                }
 
-#if NET_1_2
+               public override String ToString ()
+               {
+                       return FullName;
+               }
+
+               [MonoTODO]
+               public override bool IsAssignableFrom (Type c)
+               {
+                       return base.IsAssignableFrom (c);
+               }
+
+               [MonoTODO]
+               public override bool IsSubclassOf (Type c)
+               {
+                       return base.IsSubclassOf (c);
+               }
+
+#if NET_2_0 || BOOTSTRAP_NET_2_0
+               public bool IsCreated () {
+                       return is_created;
+               }
+
+               public override Type[] GetGenericArguments ()
+               {
+                       if (generic_params != null)
+                               return generic_params;
+
+                       throw new InvalidOperationException ();
+               }
+
                public override Type GetGenericTypeDefinition ()
                {
-                       setup_generic_class (this);
+                       create_generic_class ();
 
                        return base.GetGenericTypeDefinition ();
                }
@@ -1130,7 +1364,7 @@ namespace System.Reflection.Emit {
 
                public override bool ContainsGenericParameters {
                        get {
-                               throw new NotImplementedException ();
+                               return generic_params != null;
                        }
                }
 
@@ -1151,29 +1385,16 @@ namespace System.Reflection.Emit {
                        }
                }
 
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern MonoGenericParam define_generic_parameter (string name, int index);
-               
-               public Type DefineGenericParameter (string name)
+               public GenericTypeParameterBuilder[] DefineGenericParameters (params string[] names)
                {
-                       int index;
-                       if (generic_params != null) {
-                               MonoGenericParam[] new_generic_params = new MonoGenericParam [generic_params.Length+1];
-                               System.Array.Copy (generic_params, new_generic_params, generic_params.Length);
-                               index = generic_params.Length;
-                               generic_params = new_generic_params;
-                       } else {
-                               generic_params = new MonoGenericParam [1];
-                               index = 0;
-                       }
+                       setup_generic_class ();
 
-                       generic_params [index] = define_generic_parameter (name, index);
-                       return generic_params [index];
-               }
+                       generic_params = new GenericTypeParameterBuilder [names.Length];
+                       for (int i = 0; i < names.Length; i++)
+                               generic_params [i] = new GenericTypeParameterBuilder (
+                                       this, null, names [i], i);
 
-               public void SetGenericParameterConstraints (int index, Type[] constraints)
-               {
-                       generic_params [index].SetConstraints (constraints);
+                       return generic_params;
                }
 
                public MethodBuilder DefineGenericMethod (string name, MethodAttributes attributes)