Removes all secondary lists

jmlidbetter · jmlidbetter · commit 643f7bc07045 · 2020-05-12T14:24:42.000+01:00
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -361,31 +361,19 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
             }
             if (argMatchedMethods.Count() > 0)
             {
-                // Order matched methods by number of kwargs matched and get the max possible number
-                // of kwargs matched
                 var bestKwargMatchCount = argMatchedMethods.Max(x => x.KwargsMatched);
+                var fewestDefaultsRequired = argMatchedMethods.Where(x => x.KwargsMatched == bestKwargMatchCount).Min(x => x.DefaultsNeeded);
 
-                List<MatchedMethod> bestKwargMatches = new List<MatchedMethod>(argMatchedMethods.Count());
-                foreach (MatchedMethod testMatch in argMatchedMethods)
-                {
-                    if (testMatch.KwargsMatched == bestKwargMatchCount)
-                    {
-                        bestKwargMatches.Add(testMatch);
-                    }
-                }
-
-                // Order by the number of defaults required and find the smallest
-                var fewestDefaultsRequired  = bestKwargMatches.Min(x => x.DefaultsNeeded);
                 int bestCount = 0;
                 int bestMatchIndex = -1;
 
-                foreach (MatchedMethod testMatch in bestKwargMatches)
+                foreach (MatchedMethod testMatch in argMatchedMethods)
                 {
-                    if (testMatch.DefaultsNeeded == fewestDefaultsRequired)
+                    if (testMatch.DefaultsNeeded == fewestDefaultsRequired && testMatch.KwargsMatched == bestKwargMatchCount)
                     {
                         bestCount++;
                         if (bestMatchIndex == -1)
-                            bestMatchIndex = bestKwargMatches.IndexOf(testMatch);
+                            bestMatchIndex = argMatchedMethods.IndexOf(testMatch);
                     }
                 }
 
@@ -403,7 +391,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 = bestKwargMatches.ElementAt(bestMatchIndex);
+                MatchedMethod bestMatch = argMatchedMethods.ElementAt(bestMatchIndex);
                 var margs = bestMatch.ManagedArgs;
                 var outs = bestMatch.Outs;
                 var mi = bestMatch.Method;
