Skip to content

Bad params object[] precedence #1213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2020
Merged

Bad params object[] precedence #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ project adheres to [Semantic Versioning][].

This document follows the conventions laid out in [Keep a CHANGELOG][].


## Unreleased

### Fixed
- Fix `object[]` parameters taking precedence when should not in overload resolution

## [2.5.1][] - 2020-06-18

Bugfix release.
Expand Down
20 changes: 10 additions & 10 deletions src/runtime/methodbinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,16 @@ internal static int ArgPrecedence(Type t)
return 3000;
}

if (t.IsArray)
{
Type e = t.GetElementType();
if (e == objectType)
{
return 2500;
}
return 100 + ArgPrecedence(e);
}

TypeCode tc = Type.GetTypeCode(t);
// TODO: Clean up
switch (tc)
Expand Down Expand Up @@ -250,16 +260,6 @@ internal static int ArgPrecedence(Type t)
return 40;
}

if (t.IsArray)
{
Type e = t.GetElementType();
if (e == objectType)
{
return 2500;
}
return 100 + ArgPrecedence(e);
}

return 2000;
}

Expand Down
3 changes: 2 additions & 1 deletion src/testing/methodtest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;

namespace Python.Test
Expand Down Expand Up @@ -84,7 +85,7 @@ public Type[] TestNullArrayConversion(Type[] v)

public static string[] TestStringParamsArg(params string[] args)
{
return args;
return args.Concat(new []{"tail"}).ToArray();
}

public static object[] TestObjectParamsArg(params object[] args)
Expand Down
9 changes: 6 additions & 3 deletions src/tests/test_method.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,17 +208,20 @@ def test_null_array_conversion():
def test_string_params_args():
"""Test use of string params."""
result = MethodTest.TestStringParamsArg('one', 'two', 'three')
assert result.Length == 3
assert len(result) == 3, result
assert result.Length == 4
assert len(result) == 4, result
assert result[0] == 'one'
assert result[1] == 'two'
assert result[2] == 'three'
# ensures params string[] overload takes precedence over params object[]
assert result[3] == 'tail'

result = MethodTest.TestStringParamsArg(['one', 'two', 'three'])
assert len(result) == 3
assert len(result) == 4
assert result[0] == 'one'
assert result[1] == 'two'
assert result[2] == 'three'
assert result[3] == 'tail'


def test_object_params_args():
Expand Down