Commiteaed5c2

committed

fixobject[] parameters taking precedence when should not in overload resolution

1 parent61d1b7c commiteaed5c2Copy full SHA for eaed5c2

File tree

+19

-14

lines changed

+19

-14

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ details about the cause of the failure`
`19`	`19`
`20`	`20`	- Fix incorrect dereference of wrapper object in`tp_repr`, which may result in a program crash
`21`	`21`	`- Fix incorrect dereference in params array handling`
	`22`	+- Fix`object[]` parameters taking precedence when should not in overload resolution
`22`	`23`
`23`	`24`	`##[2.5.0][] - 2020-06-14`
`24`	`25`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,16 @@ internal static int ArgPrecedence(Type t)`
`203`	`203`	`return3000;`
`204`	`204`	`}`
`205`	`205`
	`206`	`+if(t.IsArray)`
	`207`	`+{`
	`208`	`+Typee=t.GetElementType();`
	`209`	`+if(e==objectType)`
	`210`	`+{`
	`211`	`+return2500;`
	`212`	`+}`
	`213`	`+return100+ArgPrecedence(e);`
	`214`	`+}`
	`215`	`+`
`206`	`216`	`TypeCodetc=Type.GetTypeCode(t);`
`207`	`217`	`// TODO: Clean up`
`208`	`218`	`switch(tc)`
`@@ -250,16 +260,6 @@ internal static int ArgPrecedence(Type t)`
`250`	`260`	`return40;`
`251`	`261`	`}`
`252`	`262`
`253`		`-if(t.IsArray)`
`254`		`-{`
`255`		`-Typee=t.GetElementType();`
`256`		`-if(e==objectType)`
`257`		`-{`
`258`		`-return2500;`
`259`		`-}`
`260`		`-return100+ArgPrecedence(e);`
`261`		`-}`
`262`		`-`
`263`	`263`	`return2000;`
`264`	`264`	`}`
`265`	`265`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`usingSystem;`
`2`	`2`	`usingSystem.IO;`
	`3`	`+usingSystem.Linq;`
`3`	`4`	`usingSystem.Runtime.InteropServices;`
`4`	`5`
`5`	`6`	`namespacePython.Test`
`@@ -84,7 +85,7 @@ public Type[] TestNullArrayConversion(Type[] v)`
`84`	`85`
`85`	`86`	`publicstaticstring[]TestStringParamsArg(paramsstring[]args)`
`86`	`87`	`{`
`87`		`-returnargs;`
	`88`	`+returnargs.Concat(new[]{"tail"}).ToArray();`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`publicstaticobject[]TestObjectParamsArg(paramsobject[]args)`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,17 +206,20 @@ def test_null_array_conversion():`
`206`	`206`	`deftest_string_params_args():`
`207`	`207`	`"""Test use of string params."""`
`208`	`208`	`result=MethodTest.TestStringParamsArg('one','two','three')`
`209`		`-assertresult.Length==3`
`210`		`-assertlen(result)==3,result`
	`209`	`+assertresult.Length==4`
	`210`	`+assertlen(result)==4,result`
`211`	`211`	`assertresult[0]=='one'`
`212`	`212`	`assertresult[1]=='two'`
`213`	`213`	`assertresult[2]=='three'`
	`214`	`+# ensures params string[] overload takes precedence over params object[]`
	`215`	`+assertresult[3]=='tail'`
`214`	`216`
`215`	`217`	`result=MethodTest.TestStringParamsArg(['one','two','three'])`
`216`		`-assertlen(result)==3`
	`218`	`+assertlen(result)==4`
`217`	`219`	`assertresult[0]=='one'`
`218`	`220`	`assertresult[1]=='two'`
`219`	`221`	`assertresult[2]=='three'`
	`222`	`+assertresult[3]=='tail'`
`220`	`223`
`221`	`224`
`222`	`225`	`deftest_object_params_args():`

Comments

(0)