Skip to content

Fix kwarg func resolution #1136

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 9 commits into from
Nov 18, 2020
Merged

Fix kwarg func resolution #1136

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9fb753a
Fix function resolution when calling overloads with keyword arguments
jmlidbetter Apr 28, 2020
fee4373
Updates CHANGELOG.md
jmlidbetter May 7, 2020
8581715
Switches Tuple for struct
jmlidbetter May 11, 2020
86d21f1
Use LINQ Min and Max methods; don't create second list for methods be…
jmlidbetter May 12, 2020
d453159
Removes all secondary lists
jmlidbetter May 12, 2020
a1b6c76
Updates CHANGELOG
jmlidbetter Jun 22, 2020
1d01c45
Merge branch 'master' into fix_kwarg_func_resolution
filmor Oct 13, 2020
980c231
Merge branch 'master' into fix_kwarg_func_resolution
jmlidbetter Oct 21, 2020
8d0fc2c
Merge branch 'master' into fix_kwarg_func_resolution
filmor Nov 18, 2020
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
Prev Previous commit
Next Next commit
Use LINQ Min and Max methods; don't create second list for methods be… 
…st matched on defaults
  • Loading branch information
@jmlidbetter
jmlidbetter committed Jun 22, 2020
commit 86d21f1696f79cf1f6b8eedd0a287ad1d7fdccbb
15 changes: 9 additions & 6 deletions src/runtime/methodbinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
{
// Order matched methods by number of kwargs matched and get the max possible number
// of kwargs matched
var bestKwargMatchCount = argMatchedMethods.OrderBy((x) => x.KwargsMatched).Reverse().ToArray()[0].KwargsMatched;
var bestKwargMatchCount = argMatchedMethods.Max(x => x.KwargsMatched);

List<MatchedMethod> bestKwargMatches = new List<MatchedMethod>(argMatchedMethods.Count());
foreach (MatchedMethod testMatch in argMatchedMethods)
Expand All @@ -375,18 +375,21 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
}

// Order by the number of defaults required and find the smallest
var fewestDefaultsRequired = bestKwargMatches.OrderBy((x) => x.DefaultsNeeded).ToArray()[0].DefaultsNeeded;
var fewestDefaultsRequired = bestKwargMatches.Min(x => x.DefaultsNeeded);
int bestCount = 0;
int bestMatchIndex = -1;

List<MatchedMethod> bestDefaultsMatches = new List<MatchedMethod>(bestKwargMatches.Count());
foreach (MatchedMethod testMatch in bestKwargMatches)
{
if (testMatch.DefaultsNeeded == fewestDefaultsRequired)
{
bestDefaultsMatches.Add(testMatch);
bestCount++;
if (bestMatchIndex == -1)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not having this check will cause tests to fail because a different overload is picked- e.g. MethodTest.TestOverloadedObjectTwo(5, 5) will get the (Object, Object) overload rather than the (Int, Int) overload

bestMatchIndex = bestKwargMatches.IndexOf(testMatch);
}
}

if (bestDefaultsMatches.Count() > 1 && fewestDefaultsRequired > 0)
if (bestCount > 1 && fewestDefaultsRequired > 0)
{
// Best effort for determining method to match on gives multiple possible
// matches and we need at least one default argument - bail from this point
Expand All @@ -400,7 +403,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
// in the case of (a) we're done by default. For (b) regardless of which
// method we choose, all arguments are specified _and_ can be converted
// from python to C# so picking any will suffice
MatchedMethod bestMatch = bestDefaultsMatches.ToArray()[0];
MatchedMethod bestMatch = bestKwargMatches.ElementAt(bestMatchIndex);
var margs = bestMatch.ManagedArgs;
var outs = bestMatch.Outs;
var mi = bestMatch.Method;
Expand Down