X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Reflection.Emit%2FTypeBuilder.cs;h=c1dbb550a0a10d4d98fd69095894186343dc128e;hb=b0eff411fcc55fa6a7bbc5ee97bb592fe3204309;hp=b1d34980d02afead57c1bf9a7136ec616e57934c;hpb=0243a47fd9cd87afd570b58056d8129c4322cceb;p=mono.git diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs index b1d34980d02..c1dbb550a0a 100644 --- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs @@ -40,9 +40,14 @@ using System.Globalization; using System.Collections; using System.Security; using System.Security.Permissions; +using System.Diagnostics.SymbolStore; namespace System.Reflection.Emit { - +#if NET_2_0 + [ComVisible (true)] + [ClassInterfaceAttribute (ClassInterfaceType.None)] + [ComDefaultInterfaceAttribute (typeof (_TypeBuilder))] +#endif public sealed class TypeBuilder : Type { #region Sync with reflection.h private string tname; @@ -64,14 +69,15 @@ namespace System.Reflection.Emit { private ModuleBuilder pmodule; private int class_size; private PackingSize packing_size; + 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; - #endregion private Type created; + #endregion string fullname; public const int UnspecifiedTypeSize = 0; @@ -87,7 +93,10 @@ 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); @@ -95,7 +104,8 @@ namespace System.Reflection.Emit { 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 = ""; this.nspace = ""; pmodule = mb; @@ -163,8 +173,17 @@ namespace System.Reflection.Emit { [MonoTODO] public override Type UnderlyingSystemType { get { - // This should return the type itself for non-enum types but - // that breaks mcs. + + // Return this as requested by Zoltan. + + return this; + +#if false + // Dont know what to do with the rest, should be killed: + // See bug: 75008. + // + ////// This should return the type itself for non-enum types but + ////// that breaks mcs. if (fields != null) { foreach (FieldBuilder f in fields) { if ((f != null) && (f.Attributes & FieldAttributes.Static) == 0) @@ -172,6 +191,7 @@ namespace System.Reflection.Emit { } } throw new InvalidOperationException ("Underlying type information on enumeration is not specified."); +#endif } } @@ -191,7 +211,8 @@ namespace System.Reflection.Emit { public override Guid GUID { get { - throw not_supported (); + check_created (); + return created.GUID; } } @@ -220,8 +241,7 @@ namespace System.Reflection.Emit { (action == SecurityAction.RequestRefuse)) throw new ArgumentException ("Request* values are not permitted", "action"); - if (is_created) - throw not_after_created (); + check_not_created (); if (permissions != null) { /* Check duplicate actions */ @@ -240,11 +260,13 @@ namespace System.Reflection.Emit { attrs |= TypeAttributes.HasSecurity; } +#if NET_2_0 + [ComVisible (true)] +#endif 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 @@ -267,6 +289,8 @@ namespace System.Reflection.Emit { CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) { + check_created (); + if (ctors == null) return null; @@ -314,12 +338,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) { @@ -364,6 +392,9 @@ namespace System.Reflection.Emit { return res; } +#if NET_2_0 + [ComVisible (true)] +#endif public TypeBuilder DefineNestedType (string name, TypeAttributes attr, Type parent, Type[] interfaces) { return DefineNestedType (name, attr, parent, interfaces, PackingSize.Unspecified, UnspecifiedTypeSize); } @@ -376,10 +407,16 @@ namespace System.Reflection.Emit { return DefineNestedType (name, attr, parent, null, packsize, UnspecifiedTypeSize); } +#if NET_2_0 + [ComVisible (true)] +#endif public ConstructorBuilder DefineConstructor (MethodAttributes attributes, CallingConventions callingConvention, Type[] parameterTypes) { return DefineConstructor (attributes, callingConvention, parameterTypes, null, null); } +#if NET_2_0 + [ComVisible (true)] +#endif #if NET_2_0 || BOOTSTRAP_NET_2_0 public #else @@ -387,8 +424,7 @@ namespace System.Reflection.Emit { #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]; @@ -402,10 +438,11 @@ namespace System.Reflection.Emit { return cb; } +#if NET_2_0 + [ComVisible (true)] +#endif public ConstructorBuilder DefineDefaultConstructor (MethodAttributes attributes) { - ConstructorBuilder cb = DefineConstructor (attributes, CallingConventions.Standard, new Type [0]); - Type parent_type; if (parent != null) @@ -417,20 +454,22 @@ 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; } - public MethodBuilder DefineMethod( string name, MethodAttributes attributes, Type returnType, Type[] parameterTypes) { - return DefineMethod (name, attributes, CallingConventions.Standard, returnType, parameterTypes); - } - private void append_method (MethodBuilder mb) { if (methods != null) { if (methods.Length == num_methods) { @@ -445,6 +484,10 @@ namespace System.Reflection.Emit { num_methods ++; } + public MethodBuilder DefineMethod( string name, MethodAttributes attributes, Type returnType, Type[] parameterTypes) { + return DefineMethod (name, attributes, CallingConventions.Standard, returnType, parameterTypes); + } + public MethodBuilder DefineMethod( string name, MethodAttributes attributes, CallingConventions callingConvention, Type returnType, Type[] parameterTypes) { return DefineMethod (name, attributes, callingConvention, returnType, null, null, parameterTypes, null, null); } @@ -456,8 +499,7 @@ namespace System.Reflection.Emit { #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))) @@ -499,8 +541,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 ( @@ -527,13 +568,22 @@ namespace System.Reflection.Emit { nativeCallConv, nativeCharSet); } +#if NET_2_0 + public MethodBuilder DefineMethod (string name, MethodAttributes attributes) { + return DefineMethod (name, attributes, CallingConventions.Standard); + } + + public MethodBuilder DefineMethod (string name, MethodAttributes attributes, CallingConventions callConv) { + return DefineMethod (name, attributes, callConv, null, null); + } +#endif + public void DefineMethodOverride( MethodInfo methodInfoBody, MethodInfo methodInfoDeclaration) { if (methodInfoBody == null) 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; @@ -550,12 +600,11 @@ namespace System.Reflection.Emit { #else internal #endif - FieldBuilder DefineField( string 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) { @@ -576,15 +625,23 @@ namespace System.Reflection.Emit { } public PropertyBuilder DefineProperty( string name, PropertyAttributes attributes, Type returnType, Type[] parameterTypes) { + return DefineProperty (name, attributes, returnType, null, null, parameterTypes, null, null); + } + +#if NET_2_0 + public +#else + internal +#endif + PropertyBuilder DefineProperty (string name, PropertyAttributes attributes, Type returnType, Type[] returnTypeRequiredCustomModifiers, Type[] returnTypeOptionalCustomModifiers, Type[] parameterTypes, Type[][] parameterTypeRequiredCustomModifiers, Type[][] parameterTypeOptionalCustomModifiers) { check_name ("name", name); if (parameterTypes != null) 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); + PropertyBuilder res = new PropertyBuilder (this, name, attributes, returnType, returnTypeRequiredCustomModifiers, returnTypeOptionalCustomModifiers, parameterTypes, parameterTypeRequiredCustomModifiers, parameterTypeOptionalCustomModifiers); if (properties != null) { PropertyBuilder[] new_properties = new PropertyBuilder [properties.Length+1]; @@ -598,6 +655,9 @@ namespace System.Reflection.Emit { return res; } +#if NET_2_0 + [ComVisible (true)] +#endif public ConstructorBuilder DefineTypeInitializer() { return DefineConstructor (MethodAttributes.Public | MethodAttributes.Static | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName, CallingConventions.Standard, null); } @@ -617,8 +677,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. @@ -650,20 +710,43 @@ namespace System.Reflection.Emit { // // On classes, define a default constructor if not provided // - if (!(IsInterface || IsValueType) && (ctors == null) && (tname != "")) + if (!(IsInterface || IsValueType) && (ctors == null) && (tname != "") && + (GetAttributeFlagsImpl () & TypeAttributes.Abstract | TypeAttributes.Sealed) != (TypeAttributes.Abstract | TypeAttributes.Sealed)) DefineDefaultConstructor (MethodAttributes.Public); if (ctors != null){ foreach (ConstructorBuilder ctor in ctors) ctor.fixup (); } - + created = create_runtime_class (this); if (created != null) return created; return this; } + internal void GenerateDebugInfo (ISymbolWriter symbolWriter) + { + symbolWriter.OpenNamespace (this.Namespace); + + if (methods != null) { + for (int i = 0; i < num_methods; ++i) { + MethodBuilder metb = (MethodBuilder) methods[i]; + metb.GenerateDebugInfo (symbolWriter); + } + } + + if (ctors != null) { + foreach (ConstructorBuilder ctor in ctors) + ctor.GenerateDebugInfo (symbolWriter); + } + + symbolWriter.CloseNamespace (); + } + +#if NET_2_0 + [ComVisible (true)] +#endif public override ConstructorInfo[] GetConstructors (BindingFlags bindingAttr) { if (ctors == null) @@ -702,11 +785,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 */ @@ -716,9 +801,13 @@ 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(). @@ -845,7 +934,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 () { @@ -860,11 +950,13 @@ 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 (); + check_created (); + return created.GetMembers (bindingAttr); } private MethodInfo[] GetMethodsByName (string name, BindingFlags bindingAttr, bool ignoreCase, Type reflected_type) { @@ -934,9 +1026,7 @@ namespace System.Reflection.Emit { CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) { - if (!is_created) - /* MS.Net throws this exception if the type is unfinished... */ - throw not_supported (); + check_created (); bool ignoreCase = ((bindingAttr & BindingFlags.IgnoreCase) != 0); MethodInfo[] methods = GetMethodsByName (name, bindingAttr, ignoreCase, this); @@ -981,13 +1071,14 @@ namespace System.Reflection.Emit { } 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) { @@ -1055,14 +1146,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 () @@ -1093,7 +1183,8 @@ namespace System.Reflection.Emit { public override RuntimeTypeHandle TypeHandle { get { - throw not_supported (); + check_created (); + return created.TypeHandle; } } @@ -1129,14 +1220,16 @@ namespace System.Reflection.Emit { int nnamed = (int)data [pos++]; nnamed |= ((int)data [pos++]) << 8; for (int i = 0; i < nnamed; ++i) { - byte named_type = data [pos++]; + //byte named_type = data [pos++]; + pos ++; byte type = data [pos++]; 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); + //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 @@ -1155,11 +1248,14 @@ namespace System.Reflection.Emit { switch ((CharSet)value) { case CharSet.None: case CharSet.Ansi: + attrs &= ~(TypeAttributes.UnicodeClass | TypeAttributes.AutoClass); break; case CharSet.Unicode: + attrs &= ~TypeAttributes.AutoClass; attrs |= TypeAttributes.UnicodeClass; break; case CharSet.Auto: + attrs &= ~TypeAttributes.UnicodeClass; attrs |= TypeAttributes.AutoClass; break; default: @@ -1191,6 +1287,10 @@ namespace System.Reflection.Emit { cattrs [0] = customBuilder; } } + +#if NET_2_0 + [ComVisible (true)] +#endif public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) { SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute)); } @@ -1199,8 +1299,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) { @@ -1233,8 +1332,7 @@ namespace System.Reflection.Emit { check_name ("name", name); if ((size <= 0) || (size > 0x3f0000)) throw new ArgumentException ("size", "Data size must be > 0 and < 0x3f0000"); - if (is_created) - throw not_after_created (); + check_not_created (); string s = "$ArrayType$"+UnmanagedDataCount.ToString(); UnmanagedDataCount++; @@ -1253,15 +1351,19 @@ 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); } +#if NET_2_0 + [ComVisible (true)] +#endif public override InterfaceMapping GetInterfaceMap (Type interfaceType) { if (created == null) @@ -1281,9 +1383,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 () { - return new InvalidOperationException ("Unable to change after type has been created."); + if (is_created) + throw new InvalidOperationException ("Unable to change after type has been created."); + } + + private void check_created () + { + if (!is_created) + throw not_supported (); } private void check_name (string argName, string name) @@ -1307,13 +1416,41 @@ namespace System.Reflection.Emit { return base.IsAssignableFrom (c); } +#if NET_2_0 + [ComVisible (true)] +#endif [MonoTODO] public override bool IsSubclassOf (Type c) { return base.IsSubclassOf (c); } + [MonoTODO ("arrays")] + internal bool IsAssignableTo (Type c) + { + if (c == this) + return true; + + if (c.IsInterface) { + if (interfaces == null) + return false; + foreach (Type t in interfaces) + if (c.IsAssignableFrom (t)) + return true; + return false; + } + + if (parent == null) + return c == typeof (object); + else + return c.IsAssignableFrom (parent); + } + #if NET_2_0 || BOOTSTRAP_NET_2_0 + public bool IsCreated () { + return is_created; + } + public override Type[] GetGenericArguments () { if (generic_params != null) @@ -1324,14 +1461,14 @@ namespace System.Reflection.Emit { public override Type GetGenericTypeDefinition () { - setup_generic_class (this); + create_generic_class (); return base.GetGenericTypeDefinition (); } public override bool HasGenericArguments { get { - throw new NotImplementedException (); + return generic_params != null; } } @@ -1358,8 +1495,10 @@ namespace System.Reflection.Emit { } } - public GenericTypeParameterBuilder[] DefineGenericParameters (string[] names) + public GenericTypeParameterBuilder[] DefineGenericParameters (params string[] names) { + setup_generic_class (); + generic_params = new GenericTypeParameterBuilder [names.Length]; for (int i = 0; i < names.Length; i++) generic_params [i] = new GenericTypeParameterBuilder ( @@ -1372,6 +1511,33 @@ namespace System.Reflection.Emit { { return DefineMethod (name, attributes, CallingConventions.Standard, null, null); } + + public static ConstructorInfo GetConstructor (Type instanciated, ConstructorInfo ctor) + { + ConstructorInfo res = instanciated.GetConstructor (ctor); + if (res == null) + throw new System.Exception ("constructor not found"); + else + return res; + } + + public static MethodInfo GetMethod (Type instanciated, MethodInfo meth) + { + MethodInfo res = instanciated.GetMethod (meth); + if (res == null) + throw new System.Exception ("method not found"); + else + return res; + } + + public static FieldInfo GetField (Type instanciated, FieldInfo fld) + { + FieldInfo res = instanciated.GetField (fld); + if (res == null) + throw new System.Exception ("field not found"); + else + return res; + } #endif } }