fix unboxing of value types in generated delegate code

brianlloyd · brianlloyd · commit 8842290a249b · 2006-06-05T14:11:57.000Z
diff --git a/pythonnet/src/runtime/delegatemanager.cs b/pythonnet/src/runtime/delegatemanager.cs
@@ -147,6 +147,9 @@ private static Type GetDispatcher(Type dtype) {
 	    if (method.ReturnType == voidtype) {
 		il.Emit(OpCodes.Pop);
 	    }
+	    else if (method.ReturnType.IsValueType) {
+		il.Emit(OpCodes.Unbox_Any, method.ReturnType);
+	    }
 
 	    il.Emit(OpCodes.Ret);
 
diff --git a/pythonnet/src/runtime/delegateobject.cs b/pythonnet/src/runtime/delegateobject.cs
@@ -96,7 +96,6 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw) {
 	    if (d == null) {
 		return Exceptions.RaiseTypeError("invalid argument");
 	    }
-
 	    return self.binder.Invoke(ob, args, kw);
 	}
 
diff --git a/pythonnet/src/testing/delegatetest.cs b/pythonnet/src/testing/delegatetest.cs
@@ -20,6 +20,7 @@ namespace Python.Test {
 
     public delegate DelegateTest ObjectDelegate();
     public delegate string StringDelegate();
+    public delegate bool BoolDelegate();
 
 
     public class DelegateTest {
@@ -31,6 +32,7 @@ public class DelegateTest {
 
 	public StringDelegate stringDelegate;
 	public ObjectDelegate objectDelegate;
+	public BoolDelegate boolDelegate;
 
 	public DelegateTest() {
 
@@ -52,6 +54,11 @@ public DelegateTest CallObjectDelegate(ObjectDelegate d) {
 	    return d();
 	}
 
+	public bool CallBoolDelegate(BoolDelegate d) {
+	    return d();
+	}
+
+
     }
 
 
diff --git a/pythonnet/src/tests/test_delegate.py b/pythonnet/src/tests/test_delegate.py
@@ -9,6 +9,7 @@
 
 from Python.Test import DelegateTest, PublicDelegate
 from Python.Test import StringDelegate, ObjectDelegate
+from Python.Test import BoolDelegate
 import sys, os, string, unittest, types
 import Python.Test as Test
 import System
@@ -299,6 +300,21 @@ def sayhello():
         self.failUnless(ob.stringDelegate == d)
 
 
+    def testBoolDelegate(self):
+        """Test boolean delegate."""
+
+        def always_so_negative():
+            return 0
+
+        d = BoolDelegate(always_so_negative)
+        ob = DelegateTest()
+        ob.CallBoolDelegate(d)
+        
+
+        self.failUnless(not d())
+
+        self.failUnless(not ob.CallBoolDelegate(d))
+
     # test async delegates
     
     # test multicast delegates

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,9 @@ private static Type GetDispatcher(Type dtype) {`
`147`	`147`	`if (method.ReturnType == voidtype) {`
`148`	`148`	`il.Emit(OpCodes.Pop);`
`149`	`149`	`}`
	`150`	`+ else if (method.ReturnType.IsValueType) {`
	`151`	`+ il.Emit(OpCodes.Unbox_Any, method.ReturnType);`
	`152`	`+ }`
`150`	`153`
`151`	`154`	`il.Emit(OpCodes.Ret);`
`152`	`155`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw) {`
`96`	`96`	`if (d == null) {`
`97`	`97`	`return Exceptions.RaiseTypeError("invalid argument");`
`98`	`98`	`}`
`99`		`-`
`100`	`99`	`return self.binder.Invoke(ob, args, kw);`
`101`	`100`	`}`
`102`	`101`