Cleanup

Author: jhonabreul

src/embed_tests/TestMethodBinder.cs

@@ -757,18 +757,30 @@ public string Method1(decimal namedArg1 = 1.2m, int namedArg2 = 123)
 
             // ----
 
-            public string Method2(string arg1, int arg2, float arg3, float kwarg1 = 1.1f, bool kwarg2 = false, string kwarg3 = "")
+            public string Method2(string arg1, int arg2, decimal arg3, decimal kwarg1 = 1.1m, bool kwarg2 = false, string kwarg3 = "")
             {
                 return "Method2 Overload 1";
             }
 
-            public string Method2(string arg1, int arg2, float kwarg1 = 1.1f, bool kwarg2 = false, string kwarg3 = "")
+            public string Method2(string arg1, int arg2, decimal kwarg1 = 1.1m, bool kwarg2 = false, string kwarg3 = "")
             {
                 return "Method2 Overload 2";
             }
 
             // ----
 
+            public string Method3(string arg1, int arg2, float arg3, float kwarg1 = 1.1f, bool kwarg2 = false, string kwarg3 = "")
+            {
+                return "Method3 Overload 1";
+            }
+
+            public string Method3(string arg1, int arg2, float kwarg1 = 1.1f, bool kwarg2 = false, string kwarg3 = "")
+            {
+                return "Method3 Overload 2";
+            }
+
+            // ----
+
             public string ImplicitConversionSameArgumentCount(string symbol, int quantity, float trailingAmount, bool trailingAsPercentage, string tag = "")
             {
                 return "ImplicitConversionSameArgumentCount 1";
@@ -795,8 +807,11 @@ public string ImplicitConversionSameArgumentCount2(string symbol, decimal quanti
             }
         }
 
-        [TestCase("Method1('abc', namedArg1=1.234, namedArg2=321)", "Method1 Overload 1")]
-        [TestCase("Method2(\"SPY\", 10, 123.4, kwarg1=0.0025, kwarg2=True)", "Method2 Overload 1")]
+        [TestCase("Method1('abc', namedArg1=10, namedArg2=321)", "Method1 Overload 1")]
+        [TestCase("Method1('abc', namedArg1=12.34, namedArg2=321)", "Method1 Overload 1")]
+        [TestCase("Method2(\"SPY\", 10, 123, kwarg1=1, kwarg2=True)", "Method2 Overload 1")]
+        [TestCase("Method2(\"SPY\", 10, 123.34, kwarg1=1.23, kwarg2=True)", "Method2 Overload 1")]
+        [TestCase("Method3(\"SPY\", 10, 123.34, kwarg1=1.23, kwarg2=True)", "Method3 Overload 1")]
         public void SelectsRightOverloadWithNamedParameters(string methodCallCode, string expectedResult)
         {
             using var _ = Py.GIL();

src/runtime/MethodBinder.cs

@@ -431,10 +431,6 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
 
         internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedReference kw, MethodBase info)
         {
-            // Relevant function variables used post conversion
-            Binding bindingUsingImplicitConversion = null;
-            Binding genericBinding = null;
-
             // If we have KWArgs create dictionary and collect them
             Dictionary<string, PyObject> kwArgDict = null;
             if (kw != null)
@@ -456,8 +452,8 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
             var methods = info == null ? GetMethods()
                 : new List<MethodInformation>(1) { new MethodInformation(info, true) };
 
-            var matches = new List<MatchedMethod>();
-            var matchesUsingImplicitConversion = new List<MatchedMethod>();
+            var matches = new List<MatchedMethod>(methods.Count);
+            List<MatchedMethod> matchesUsingImplicitConversion = null;
 
             for (var i = 0; i < methods.Count; i++)
             {
@@ -517,11 +513,11 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
                         var parameter = pi[paramIndex];     // Clr parameter we are targeting
                         object arg;                         // Python -> Clr argument
 
-                        var hasNamedParam = kwArgDict == null ? false : kwArgDict.TryGetValue(paramNames[paramIndex], out tempPyObject);
-
                         // Check positional arguments first and then check for named arguments and optional values
                         if (paramIndex >= pyArgCount)
                         {
+                            var hasNamedParam = kwArgDict == null ? false : kwArgDict.TryGetValue(paramNames[paramIndex], out tempPyObject);
+
                             // All positional arguments have been used:
                             // Check our KWargs for this parameter
                             if (hasNamedParam)
@@ -698,18 +694,26 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
                     }
 
                     var match = new MatchedMethod(kwargsMatched, margs, outs, mi);
-                    if (usedImplicitConversion)
+                    // Only add matches using implicit conversion if no other regular matches were found,
+                    // since we favor regular matches over matches using implicit conversion
+                    if (usedImplicitConversion && matches.Count == 0)
                     {
+                        if (matchesUsingImplicitConversion == null)
+                        {
+                            matchesUsingImplicitConversion = new List<MatchedMethod>();
+                        }
                         matchesUsingImplicitConversion.Add(match);
                     }
                     else
                     {
                         matches.Add(match);
+                        // We don't need the matches using implicit conversion anymore
+                        matchesUsingImplicitConversion = null;
                     }
                 }
             }
 
-            if (matches.Count > 0 || matchesUsingImplicitConversion.Count > 0)
+            if (matches.Count > 0 || (matchesUsingImplicitConversion != null && matchesUsingImplicitConversion.Count > 0))
             {
                 // We favor matches that do not use implicit conversion
                 var matchesTouse = matches.Count > 0 ? matches : matchesUsingImplicitConversion;