Merge pull request #498 from Unroll-Me/master

[mono.git] / mcs / class / corlib / System.Reflection.Emit / MonoArrayMethod.cs

diff --git a/mcs/class/corlib/System.Reflection.Emit/MonoArrayMethod.cs b/mcs/class/corlib/System.Reflection.Emit/MonoArrayMethod.cs
old mode 100755 (executable)
new mode 100644 (file)
index a94a2d1..dc9ca40
--- a/mcs/class/corlib/System.Reflection.Emit/MonoArrayMethod.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/MonoArrayMethod.cs
@@ -8,13 +8,39 @@
 // (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.
+//
+
+#if !FULL_AOT_RUNTIME
 using System;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace System.Reflection {
+       [StructLayout (LayoutKind.Sequential)]
        internal class MonoArrayMethod: MethodInfo {
+#pragma warning disable 649
                internal RuntimeMethodHandle mhandle;
                internal Type parent;
                internal Type ret;
@@ -22,6 +48,7 @@ namespace System.Reflection {
                internal string name;
                internal int table_idx;
                internal CallingConventions call_conv;
+#pragma warning restore 649            
 
                internal MonoArrayMethod (Type arrayClass, string methodName, CallingConventions callingConvention, Type returnType, Type[] parameterTypes) {
                        name = methodName;
@@ -31,7 +58,7 @@ namespace System.Reflection {
                        call_conv = callingConvention;
                }
                
-               [MonoTODO]
+               [MonoTODO("Always returns this")]
                public override MethodInfo GetBaseDefinition() {
                        return this; /* FIXME */
                }
@@ -40,22 +67,29 @@ namespace System.Reflection {
                                return ret;
                        }
                }
-               [MonoTODO]
+
+               [MonoTODO("Not implemented.  Always returns null")]
                public override ICustomAttributeProvider ReturnTypeCustomAttributes { 
                        get {return null;}
                }
                
-               [MonoTODO]
+               [MonoTODO("Not implemented.  Always returns zero")]
                public override MethodImplAttributes GetMethodImplementationFlags() {
                        return (MethodImplAttributes)0;
                }
 
-               [MonoTODO]
+               [MonoTODO("Not implemented.  Always returns an empty array")]
                public override ParameterInfo[] GetParameters() {
                        return new ParameterInfo [0];
                }
+               
+               [MonoTODO("Not implemented.  Always returns 0")]
+               internal override int GetParameterCount ()
+               {
+                       return 0;
+               }               
 
-               [MonoTODO]
+               [MonoTODO("Not implemented")]
                public override Object Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) {
                        throw new NotImplementedException ();
                }
@@ -63,7 +97,8 @@ namespace System.Reflection {
                public override RuntimeMethodHandle MethodHandle { 
                        get {return mhandle;} 
                }
-               [MonoTODO]
+
+               [MonoTODO("Not implemented.  Always returns zero")]
                public override MethodAttributes Attributes { 
                        get {
                                return (MethodAttributes)0;
@@ -98,21 +133,18 @@ namespace System.Reflection {
                }
 
                public override string ToString () {
-                       string parms = "";
+                       string parms = String.Empty;
                        ParameterInfo[] p = GetParameters ();
                        for (int i = 0; i < p.Length; ++i) {
                                if (i > 0)
                                        parms = parms + ", ";
                                parms = parms + p [i].ParameterType.Name;
                        }
-                       return ReturnType.Name+" "+Name+"("+parms+")";
+                       if (ReturnType != null)
+                               return ReturnType.Name+" "+Name+"("+parms+")";
+                       else
+                               return "void "+Name+"("+parms+")";
                }
-
-#if NET_1_2
-               public override Type[] GetGenericArguments ()
-               {
-                       throw new NotImplementedException ();
-               }
-#endif
        }
 }
+#endif