Merge pull request #1323 from StephenMcConnel/bug-23591

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

diff --git a/mcs/class/corlib/System.Reflection/MethodInfo.cs b/mcs/class/corlib/System.Reflection/MethodInfo.cs
index 7d2980a36e5a9efc6a3089e19ab99adaf9b7f877..74f96f55428f03dcc775dcd1c09698251f8af648 100644 (file)
--- a/mcs/class/corlib/System.Reflection/MethodInfo.cs
+++ b/mcs/class/corlib/System.Reflection/MethodInfo.cs
@@ -5,10 +5,7 @@
 //   Paolo Molaro (lupus@ximian.com)
 //
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 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
@@ -30,23 +27,152 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace System.Reflection {
 
+       [ComVisible (true)]
+       [ComDefaultInterfaceAttribute (typeof (_MethodInfo))]
        [Serializable]
        [ClassInterface(ClassInterfaceType.None)]
+#if MOBILE
        public abstract class MethodInfo: MethodBase {
-
+#else
+       public abstract class MethodInfo: MethodBase, _MethodInfo {
+#endif
                public abstract MethodInfo GetBaseDefinition();
 
+               internal virtual MethodInfo GetBaseMethod ()
+               {
+                       return this;
+               }
+
                protected MethodInfo() {
                }
+
+
                public override MemberTypes MemberType { get {return MemberTypes.Method;} }
-               public abstract Type ReturnType { get; }
-               public abstract ICustomAttributeProvider ReturnTypeCustomAttributes { get; } 
-       }
 
+               public virtual Type ReturnType {
+                       get { return null; }
+               }
+
+               public abstract ICustomAttributeProvider ReturnTypeCustomAttributes { get; }
+
+#if !MOBILE
+               void _MethodInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               Type _MethodInfo.GetType ()
+               {
+                       // Required or object::GetType becomes virtual final
+                       return base.GetType ();
+               }
+
+               void _MethodInfo.GetTypeInfo (uint iTInfo, uint lcid, IntPtr ppTInfo)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               void _MethodInfo.GetTypeInfoCount (out uint pcTInfo)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               void _MethodInfo.Invoke (uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr)
+               {
+                       throw new NotImplementedException ();
+               }
+#endif
+
+               [ComVisible (true)]
+               public virtual MethodInfo GetGenericMethodDefinition ()
+               {
+                       throw new NotSupportedException ();
+               }
+
+               public virtual MethodInfo MakeGenericMethod (params Type [] typeArguments)
+               {
+                       throw new NotSupportedException (this.GetType().ToString ());
+               }
+
+               // GetGenericArguments, IsGenericMethod, IsGenericMethodDefinition
+               // and ContainsGenericParameters are implemented in the derived classes.
+               [ComVisible (true)]
+               public override Type [] GetGenericArguments () {
+                       return Type.EmptyTypes;
+               }
+
+#if !NET_4_0
+               public override bool IsGenericMethod {
+                       get {
+                               return false;
+                       }
+               }
+
+               public override bool IsGenericMethodDefinition {
+                       get {
+                               return false;
+                       }
+               }
+
+               public override bool ContainsGenericParameters {
+                       get {
+                               return false;
+                       }
+               }
+#endif
+
+               public virtual ParameterInfo ReturnParameter {
+                       get {
+                               throw new NotSupportedException ();
+                       }
+               }
+
+#if NET_4_0
+               public override bool Equals (object obj)
+               {
+                       return obj == (object) this;
+               }
+
+               public override int GetHashCode ()
+               {
+                       return base.GetHashCode ();
+               }
+
+               public static bool operator == (MethodInfo left, MethodInfo right)
+               {
+                       if ((object)left == (object)right)
+                               return true;
+                       if ((object)left == null ^ (object)right == null)
+                               return false;
+                       return left.Equals (right);
+               }
+
+               public static bool operator != (MethodInfo left, MethodInfo right)
+               {
+                       if ((object)left == (object)right)
+                               return false;
+                       if ((object)left == null ^ (object)right == null)
+                               return true;
+                       return !left.Equals (right);
+               }
+#endif
+
+#if NET_4_5
+               public virtual Delegate CreateDelegate (Type delegateType)
+               {
+                       return Delegate.CreateDelegate (delegateType, this);
+               }
+
+               public virtual Delegate CreateDelegate (Type delegateType, object target)
+               {
+                       return Delegate.CreateDelegate (delegateType, target, this);
+               }
+#endif
+       }
 }