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
lostmsu 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
Switches Tuple for struct
  • Loading branch information
@jmlidbetter
jmlidbetter committed Jun 22, 2020
commit 8581715173766f3f1d9a5396665c430d45f8eef9
56 changes: 34 additions & 22 deletions src/runtime/methodbinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,23 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info)
return Bind(inst, args, kw, info, null);
}

private readonly struct MatchedMethod {
public MatchedMethod(int kwargsMatched, int defaultsNeeded, object[] margs, int outs, MethodBase mb)
{
KwargsMatched = kwargsMatched;
DefaultsNeeded = defaultsNeeded;
ManagedArgs = margs;
Outs = outs;
Method = mb;
}

public int KwargsMatched { get; }
public int DefaultsNeeded { get; }
public object[] ManagedArgs { get; }
public int Outs { get; }
public MethodBase Method { get; }
}

internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, MethodInfo[] methodinfo)
{
// loop to find match, return invoker w/ or /wo error
Expand Down Expand Up @@ -310,10 +327,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
_methods = GetMethods();
}

// List of tuples containing methods that have matched based on arguments.
// Format of tuple is: Number of kwargs matched, defaults needed, margs, outs, method base for matched method
List<Tuple<int, int, object[], int, MethodBase>> argMatchedMethods =
new List<Tuple<int, int, object[], int, MethodBase>>(_methods.Length);
List<MatchedMethod> argMatchedMethods = new List<MatchedMethod>(_methods.Length);
Comment thread
lostmsu marked this conversation as resolved.
Outdated

// TODO: Clean up
foreach (MethodBase mi in _methods)
Expand Down Expand Up @@ -342,35 +356,33 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
continue;
}

var matchedMethodTuple = Tuple.Create(kwargsMatched, defaultsNeeded, margs, outs, mi);
argMatchedMethods.Add(matchedMethodTuple);
var matchedMethod = new MatchedMethod(kwargsMatched, defaultsNeeded, margs, outs, mi);
argMatchedMethods.Add(matchedMethod);
}
if (argMatchedMethods.Count() > 0)
Copy link
Copy Markdown
Member

@lostmsu lostmsu May 12, 2020

Choose a reason for hiding this comment

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

Please use Count property. Count() method might require a run through the entire collection.

{
// Order matched methods by number of kwargs matched and get the max possible number
// of kwargs matched
var bestKwargMatchCount = argMatchedMethods.OrderBy((x) => x.Item1).Reverse().ToArray()[0].Item1;
var bestKwargMatchCount = argMatchedMethods.OrderBy((x) => x.KwargsMatched).Reverse().ToArray()[0].KwargsMatched;
Comment thread
lostmsu marked this conversation as resolved.
Outdated

List<Tuple<int, int, object[], int, MethodBase>> bestKwargMatches =
new List<Tuple<int, int, object[], int, MethodBase>>(argMatchedMethods.Count());
foreach (Tuple<int, int, object[], int, MethodBase> argMatchedTuple in argMatchedMethods)
List<MatchedMethod> bestKwargMatches = new List<MatchedMethod>(argMatchedMethods.Count());
foreach (MatchedMethod testMatch in argMatchedMethods)
{
if (argMatchedTuple.Item1 == bestKwargMatchCount)
if (testMatch.KwargsMatched == bestKwargMatchCount)
{
bestKwargMatches.Add(argMatchedTuple);
bestKwargMatches.Add(testMatch);
}
}

// Order by the number of defaults required and find the smallest
var fewestDefaultsRequired = bestKwargMatches.OrderBy((x) => x.Item2).ToArray()[0].Item2;
var fewestDefaultsRequired = bestKwargMatches.OrderBy((x) => x.DefaultsNeeded).ToArray()[0].DefaultsNeeded;
Comment thread
lostmsu marked this conversation as resolved.
Outdated

List<Tuple<int, int, object[], int, MethodBase>> bestDefaultsMatches =
new List<Tuple<int, int, object[], int, MethodBase>>(bestKwargMatches.Count());
foreach (Tuple<int, int, object[], int, MethodBase> testTuple in bestKwargMatches)
List<MatchedMethod> bestDefaultsMatches = new List<MatchedMethod>(bestKwargMatches.Count());
foreach (MatchedMethod testMatch in bestKwargMatches)
{
if (testTuple.Item2 == fewestDefaultsRequired)
if (testMatch.DefaultsNeeded == fewestDefaultsRequired)
{
bestDefaultsMatches.Add(testTuple);
bestDefaultsMatches.Add(testMatch);
}
}

Expand All @@ -388,10 +400,10 @@ 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
Tuple<int, int, object[], int, MethodBase> bestMatch = bestDefaultsMatches.ToArray()[0];
var margs = bestMatch.Item3;
var outs = bestMatch.Item4;
var mi = bestMatch.Item5;
MatchedMethod bestMatch = bestDefaultsMatches.ToArray()[0];
Comment thread
lostmsu marked this conversation as resolved.
Outdated
var margs = bestMatch.ManagedArgs;
var outs = bestMatch.Outs;
var mi = bestMatch.Method;

object target = null;
if (!mi.IsStatic && inst != IntPtr.Zero)
Expand Down