Merge pull request #487 from mayerwin/patch-1
[mono.git] / mcs / class / corlib / System.Reflection.Emit / ConstructorBuilder.cs
index 436a7856fa6cfce9677d13e1feed28961f4472c9..2391dc8be2cae1cf3696be5be1e14be8c5b007e4 100644 (file)
@@ -1,5 +1,5 @@
 //
-// System.Reflection.Emit/ConstructorBuilder.cs
+// System.Reflection.Emit.ConstructorBuilder.cs
 //
 // Author:
 //   Paolo Molaro (lupus@ximian.com)
@@ -30,6 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !FULL_AOT_RUNTIME
 using System;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -41,28 +42,31 @@ using System.Diagnostics.SymbolStore;
 
 namespace System.Reflection.Emit {
 
-#if NET_2_0
        [ComVisible (true)]
        [ComDefaultInterface (typeof (_ConstructorBuilder))]
-#endif
        [ClassInterface (ClassInterfaceType.None)]
+       [StructLayout (LayoutKind.Sequential)]
        public sealed class ConstructorBuilder : ConstructorInfo, _ConstructorBuilder {
+       
+#pragma warning disable 169, 414
                private RuntimeMethodHandle mhandle;
                private ILGenerator ilgen;
-               private Type[] parameters;
+               internal Type[] parameters;
                private MethodAttributes attrs;
                private MethodImplAttributes iattrs;
                private int table_idx;
                private CallingConventions call_conv;
                private TypeBuilder type;
-               private ParameterBuilder[] pinfo;
+               internal ParameterBuilder[] pinfo;
                private CustomAttributeBuilder[] cattrs;
                private bool init_locals = true;
                private Type[][] paramModReq;
                private Type[][] paramModOpt;
                private RefEmitPermissionSet[] permissions;
+#pragma warning restore 169, 414
 
-               internal ConstructorBuilder (TypeBuilder tb, MethodAttributes attributes, CallingConventions callingConvention, Type[] parameterTypes, Type[][] paramModReq, Type[][] paramModOpt) {
+               internal ConstructorBuilder (TypeBuilder tb, MethodAttributes attributes, CallingConventions callingConvention, Type[] parameterTypes, Type[][] paramModReq, Type[][] paramModOpt)
+               {
                        attrs = attributes | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName;
                        call_conv = callingConvention;
                        if (parameterTypes != null) {
@@ -74,31 +78,57 @@ namespace System.Reflection.Emit {
                                System.Array.Copy (parameterTypes, this.parameters, parameterTypes.Length);
                        }
                        type = tb;
-                       table_idx = get_next_table_index (this, 0x06, true);
                        this.paramModReq = paramModReq;
                        this.paramModOpt = paramModOpt;
+                       table_idx = get_next_table_index (this, 0x06, true);
+
+                       ((ModuleBuilder) tb.Module).RegisterToken (this, GetToken ().Token);
                }
-               
+
+               [MonoTODO]
+               public override CallingConventions CallingConvention {
+                       get {
+                               return call_conv;
+                       }
+               }
+
                public bool InitLocals {
-                       get {return init_locals;}
-                       set {init_locals = value;}
+                       get {
+                               return init_locals;
+                       }
+                       set {
+                               init_locals = value;
+                       }
                }
 
                internal TypeBuilder TypeBuilder {
-                       get {return type;}
+                       get {
+                               return type;
+                       }
                }
                
-               public override MethodImplAttributes GetMethodImplementationFlags() {
+               public override MethodImplAttributes GetMethodImplementationFlags ()
+               {
                        return iattrs;
                }
-               public override ParameterInfo[] GetParameters() {
+
+               public override ParameterInfo[] GetParameters ()
+               {
+                       if (!type.is_created)
+                               throw not_created ();
+
+                       return GetParametersInternal ();
+               }
+
+               internal ParameterInfo [] GetParametersInternal ()
+               {
                        if (parameters == null)
-                               return null;
+                               return new ParameterInfo [0];
 
-                       ParameterInfo[] retval = new ParameterInfo [parameters.Length];
-                       for (int i = 0; i < parameters.Length; i++) {
-                               retval [i] = new ParameterInfo (pinfo == null ? null : pinfo [i+1], parameters [i], this, i + 1);
-                       }
+                       ParameterInfo [] retval = new ParameterInfo [parameters.Length];
+                       for (int i = 0; i < parameters.Length; i++)
+                               retval [i] = new ParameterInfo (pinfo == null ? null
+                                       : pinfo [i + 1], parameters [i], this, i + 1);
 
                        return retval;
                }
@@ -110,40 +140,75 @@ namespace System.Reflection.Emit {
                        
                        return parameters.Length;
                }
+
+               internal override Type GetParameterType (int pos) {
+                       return parameters [pos];
+               }
                
-               public override Object Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) {
+               public override Object Invoke (Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
+               {
                        throw not_supported ();
                }
-               public override object Invoke(BindingFlags invokeAttr, Binder binder, object[] parameters, CultureInfo culture) {
+
+               public override object Invoke (BindingFlags invokeAttr, Binder binder, object[] parameters, CultureInfo culture)
+               {
                        throw not_supported ();
                }
 
-               public override RuntimeMethodHandle MethodHandle { 
+               public override RuntimeMethodHandle MethodHandle {
                        get {
-                               return mhandle;
+                               throw not_supported ();
                        }
                }
 
-               public override MethodAttributes Attributes { 
-                       get {return attrs;} 
+               public override MethodAttributes Attributes {
+                       get {
+                               return attrs;
+                       }
+               }
+
+               public override Type ReflectedType {
+                       get {
+                               return type;
+                       }
                }
-               public override Type ReflectedType { get {return type;}}
-               public override Type DeclaringType { get {return type;}}
-               public Type ReturnType { get {return null;}}
-               public override string Name { 
-                       get {return (attrs & MethodAttributes.Static) != 0 ? ".cctor" : ".ctor";}
+
+               public override Type DeclaringType {
+                       get {
+                               return type;
+                       }
+               }
+
+#if NET_4_0
+               [Obsolete]
+#endif
+               public Type ReturnType {
+                       get {
+                               return null;
+                       }
+               }
+
+               public override string Name {
+                       get {
+                               return (attrs & MethodAttributes.Static) != 0 ? ConstructorInfo.TypeConstructorName : ConstructorInfo.ConstructorName;
+                       }
                }
+
                public string Signature {
-                       get {return "constructor signature";}
+                       get {
+                               return "constructor signature";
+                       }
                }
 
-               public void AddDeclarativeSecurity( SecurityAction action, PermissionSet pset) {
+               public void AddDeclarativeSecurity (SecurityAction action, PermissionSet pset)
+               {
+#if !NET_2_1
                        if (pset == null)
                                throw new ArgumentNullException ("pset");
                        if ((action == SecurityAction.RequestMinimum) ||
                                (action == SecurityAction.RequestOptional) ||
                                (action == SecurityAction.RequestRefuse))
-                               throw new ArgumentOutOfRangeException ("Request* values are not permitted", "action");
+                               throw new ArgumentOutOfRangeException ("action", "Request* values are not permitted");
 
                        RejectIfCreated ();
 
@@ -162,11 +227,12 @@ namespace System.Reflection.Emit {
 
                        permissions [permissions.Length - 1] = new RefEmitPermissionSet (action, pset.ToXml ().ToString ());
                        attrs |= MethodAttributes.HasSecurity;
+#endif
                }
 
-               public ParameterBuilder DefineParameter(int iSequence, ParameterAttributes attributes, string strParamName)
+               public ParameterBuilder DefineParameter (int iSequence, ParameterAttributes attributes, string strParamName)
                {
-                       if ((iSequence < 1) || (iSequence > parameters.Length))
+                       if (iSequence < 1 || iSequence > GetParameterCount ())
                                throw new ArgumentOutOfRangeException ("iSequence");
                        if (type.is_created)
                                throw not_after_created ();
@@ -178,46 +244,36 @@ namespace System.Reflection.Emit {
                        return pb;
                }
 
-               public override bool IsDefined (Type attribute_type, bool inherit) {
+               public override bool IsDefined (Type attributeType, bool inherit)
+               {
                        throw not_supported ();
                }
 
-               public override object [] GetCustomAttributes (bool inherit) {
-                       /*
-                        * On MS.NET, this always returns not_supported, but we can't do this
-                        * since there would be no way to obtain custom attributes of 
-                        * dynamically created ctors.
-                        */
-                       if (type.is_created)
-                               return MonoCustomAttrs.GetCustomAttributes (this, inherit);
-                       else
-                               throw not_supported ();
+               public override object [] GetCustomAttributes (bool inherit)
+               {
+                       throw not_supported ();
                }
 
-               public override object [] GetCustomAttributes (Type attributeType, bool inherit) {
-                       if (type.is_created)
-                               return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
-                       else
-                               throw not_supported ();
+               public override object [] GetCustomAttributes (Type attributeType, bool inherit)
+               {
+                       throw not_supported ();
                }
 
-               public ILGenerator GetILGenerator () {
+               public ILGenerator GetILGenerator ()
+               {
                        return GetILGenerator (64);
                }
 
-#if NET_2_0
-               public
-#else
-               internal 
-#endif
-               ILGenerator GetILGenerator (int size) {
+               public ILGenerator GetILGenerator (int streamSize)
+               {
                        if (ilgen != null)
                                return ilgen;
-                       ilgen = new ILGenerator (type.Module, ((ModuleBuilder)type.Module).GetTokenGenerator (), size);
+                       ilgen = new ILGenerator (type.Module, ((ModuleBuilder)type.Module).GetTokenGenerator (), streamSize);
                        return ilgen;
                }
 
-               public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+               public void SetCustomAttribute (CustomAttributeBuilder customBuilder)
+               {
                        if (customBuilder == null)
                                throw new ArgumentNullException ("customBuilder");
 
@@ -241,10 +297,9 @@ namespace System.Reflection.Emit {
                        }
                }
 
-#if NET_2_0
                [ComVisible (true)]
-#endif
-               public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+               public void SetCustomAttribute (ConstructorInfo con, byte[] binaryAttribute)
+               {
                        if (con == null)
                                throw new ArgumentNullException ("con");
                        if (binaryAttribute == null)
@@ -252,53 +307,47 @@ namespace System.Reflection.Emit {
 
                        SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
                }
-               public void SetImplementationFlags( MethodImplAttributes attributes) {
+
+               public void SetImplementationFlags (MethodImplAttributes attributes)
+               {
                        if (type.is_created)
                                throw not_after_created ();
 
                        iattrs = attributes;
                }
-               public Module GetModule() {
+
+               public Module GetModule ()
+               {
                        return type.Module;
                }
-               public MethodToken GetToken() {
+
+               public MethodToken GetToken ()
+               {
                        return new MethodToken (0x06000000 | table_idx);
                }
 
                [MonoTODO]
-               public void SetSymCustomAttribute( string name, byte[] data) {
+               public void SetSymCustomAttribute (string name, byte[] data)
+               {
                        if (type.is_created)
                                throw not_after_created ();
                }
 
-#if NET_2_0 || BOOTSTRAP_NET_2_0
-               public override bool IsGenericMethodDefinition {
-                       get {
-                               return false;
-                       }
-               }
-
-               public override bool IsGenericMethod {
-                       get {
-                               return false;
-                       }
-               }
-
-
                public override Module Module {
                        get {
                                return base.Module;
                        }
                }
-#endif
 
-               public override string ToString() {
+               public override string ToString ()
+               {
                        return "ConstructorBuilder ['" + type.Name + "']";
                }
 
-               internal void fixup () {
+               internal void fixup ()
+               {
                        if (((attrs & (MethodAttributes.Abstract | MethodAttributes.PinvokeImpl)) == 0) && ((iattrs & (MethodImplAttributes.Runtime | MethodImplAttributes.InternalCall)) == 0)) {
-                       if ((ilgen == null) || (ILGenerator.Mono_GetCurrentOffset (ilgen) == 0))
+                       if ((ilgen == null) || (ilgen.ILOffset == 0))
                                throw new InvalidOperationException ("Method '" + Name + "' does not have a method body.");
                        }
                        if (ilgen != null)
@@ -316,23 +365,32 @@ namespace System.Reflection.Emit {
                        }
                }
 
-               internal override int get_next_table_index (object obj, int table, bool inc) {
+               internal override int get_next_table_index (object obj, int table, bool inc)
+               {
                        return type.get_next_table_index (obj, table, inc);
                }
 
-               private void RejectIfCreated () {
+               private void RejectIfCreated ()
+               {
                        if (type.is_created)
                                throw new InvalidOperationException ("Type definition of the method is complete.");
                }
 
-               private Exception not_supported () {
+               private Exception not_supported ()
+               {
                        return new NotSupportedException ("The invoked member is not supported in a dynamic module.");
                }
 
-               private Exception not_after_created () {
+               private Exception not_after_created ()
+               {
                        return new InvalidOperationException ("Unable to change after type has been created.");
                }
 
+               private Exception not_created ()
+               {
+                       return new NotSupportedException ("The type is not yet created.");
+               }
+
                void _ConstructorBuilder.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
                        throw new NotImplementedException ();
@@ -354,3 +412,4 @@ namespace System.Reflection.Emit {
                }
        }
 }
+#endif