Commit4692e68

authored and

tom

committed

Fix forpythonnet#200 - check for params array args correctly

1 parentbc414e1 commit4692e68Copy full SHA for 4692e68

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 2 additions & 4 deletions

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`	`}elseif((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`	`}`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,14 @@ public static bool TestStringRefParams (string s, ref string s1) {`
`117`	`117`	`returntrue;`
`118`	`118`	`}`
`119`	`119`
	`120`	`+publicstaticboolTestNonParamsArrayInLastPlace(inti1,int[]i2){`
	`121`	`+returnfalse;`
	`122`	`+}`
	`123`	`+`
	`124`	`+publicstaticboolTestNonParamsArrayInLastPlace(inti1,inti2,inti3){`
	`125`	`+returntrue;`
	`126`	`+}`
	`127`	`+`
`120`	`128`	`publicstaticboolTestValueOutParams(strings,outinti1){`
`121`	`129`	`i1=42;`
`122`	`130`	`returntrue;`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,10 @@ def testValueParamsArgs(self):`
`304`	`304`	`self.assertTrue(result[1]==2)`
`305`	`305`	`self.assertTrue(result[2]==3)`
`306`	`306`
	`307`	`+deftestNonParamsArrayInLastPlace(self):`
	`308`	`+"""Test overload resolution with of non-"params" array as last parameter."""`
	`309`	`+result=MethodTest.TestNonParamsArrayInLastPlace(1,2,3)`
	`310`	`+self.assertTrue(result)`
`307`	`311`
`308`	`312`	`deftestStringOutParams(self):`
`309`	`313`	`"""Test use of string out-parameters."""`

Comments

(0)