Fix for pythonnet#200 - check for params array args correctly

omnicognate · tom · commit 4692e68fe0b1 · 2016-04-06T22:40:09.000+01:00
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -269,10 +269,8 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw,
                             defaultArgList.Add((object)pi[v].DefaultValue);    
                     }
                 } else if ((pynargs > clrnargs) && (clrnargs > 0) &&
-                           (pi[clrnargs-1].ParameterType.IsArray)) {
-                    // The last argument of the mananged functions seems to
-                    // accept multiple arguments as a array. Hopefully it's a
-                    // spam(params object[] egg) style method
+                           Attribute.IsDefined(pi[clrnargs-1], typeof(ParamArrayAttribute))) {
+                    // This is a spam(params object[] egg) style method
                     match = true;
                     arrayStart = clrnargs - 1;
                 }
diff --git a/src/testing/methodtest.cs b/src/testing/methodtest.cs
@@ -117,6 +117,14 @@ public static bool TestStringRefParams (string s, ref string s1) {
             return true;
         }
 
+        public static bool TestNonParamsArrayInLastPlace(int i1, int[] i2) {
+            return false;
+        }
+
+        public static bool TestNonParamsArrayInLastPlace(int i1, int i2, int i3) {
+            return true;
+        }
+
         public static bool TestValueOutParams (string s, out int i1) {
             i1 = 42;
             return true;
diff --git a/src/tests/test_method.py b/src/tests/test_method.py
@@ -304,6 +304,10 @@ def testValueParamsArgs(self):
         self.assertTrue(result[1] == 2)
         self.assertTrue(result[2] == 3)        
 
+    def testNonParamsArrayInLastPlace(self):
+        """Test overload resolution with of non-"params" array as last parameter."""
+        result = MethodTest.TestNonParamsArrayInLastPlace(1, 2, 3)
+        self.assertTrue(result)
 
     def testStringOutParams(self):
         """Test use of string out-parameters."""

Original file line number	Diff line number	Diff line change
`@@ -269,10 +269,8 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw,`
`269`	`269`	`defaultArgList.Add((object)pi[v].DefaultValue);`
`270`	`270`	`}`
`271`	`271`	`} else if ((pynargs > clrnargs) && (clrnargs > 0) &&`
`272`		`- (pi[clrnargs-1].ParameterType.IsArray)) {`
`273`		`- // The last argument of the mananged functions seems to`
`274`		`- // accept multiple arguments as a array. Hopefully it's a`
`275`		`- // spam(params object[] egg) style method`
	`272`	`+ Attribute.IsDefined(pi[clrnargs-1], typeof(ParamArrayAttribute))) {`
	`273`	`+ // This is a spam(params object[] egg) style method`
`276`	`274`	`match = true;`
`277`	`275`	`arrayStart = clrnargs - 1;`
`278`	`276`	`}`