Improve numeric implicit conversion handling (#107)

Martin-Molinero · web-flow · commit d0feb901cfe0 · 2025-08-15T12:32:11.000-03:00
diff --git a/src/embed_tests/TestMethodBinder.cs b/src/embed_tests/TestMethodBinder.cs
@@ -1448,7 +1448,7 @@ public bool SomeMethod()
                 return true;
             }
 
-            public virtual string OnlyClass(TestImplicitConversion data)
+            public virtual string OnlyClass(TestImplicitConversion data, double anotherArgument = 0)
             {
                 return "OnlyClass impl";
             }
@@ -1458,12 +1458,12 @@ public virtual string OnlyString(string data)
                 return "OnlyString impl: " + data;
             }
 
-            public virtual string InvokeModel(string data)
+            public virtual string InvokeModel(string data, double anotherArgument = 0)
             {
                 return "string impl: " + data;
             }
 
-            public virtual string InvokeModel(TestImplicitConversion data)
+            public virtual string InvokeModel(TestImplicitConversion data, double anotherArgument = 0)
             {
                 return "TestImplicitConversion impl";
             }
diff --git a/src/runtime/MethodBinder.cs b/src/runtime/MethodBinder.cs
@@ -546,7 +546,7 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
                     var margs = new object[clrArgCount];
 
                     int paramsArrayIndex = paramsArray ? pi.Length - 1 : -1; // -1 indicates no paramsArray
-                    var usedImplicitConversion = false;
+                    int implicitConversions = 0;
                     var kwargsMatched = 0;
 
                     // Conversion loop for each parameter
@@ -658,18 +658,26 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
                                     else if (matches.Count == 0)
                                     {
                                         // accepts non-decimal numbers in decimal parameters
-                                        if (underlyingType == typeof(decimal))
+                                        if (underlyingType == typeof(decimal) || underlyingType == typeof(double))
                                         {
                                             clrtype = parameter.ParameterType;
-                                            usedImplicitConversion |= typematch = Converter.ToManaged(op, clrtype, out arg, false);
+                                            typematch = Converter.ToManaged(op, clrtype, out arg, false);
+                                            if (typematch)
+                                            {
+                                                implicitConversions++;
+                                            }
                                         }
                                         if (!typematch)
                                         {
                                             // this takes care of implicit conversions
                                             var opImplicit = parameter.ParameterType.GetMethod("op_Implicit", new[] { clrtype });
                                             if (opImplicit != null)
                                             {
-                                                usedImplicitConversion |= typematch = opImplicit.ReturnType == parameter.ParameterType;
+                                                typematch = opImplicit.ReturnType == parameter.ParameterType;
+                                                if (typematch)
+                                                {
+                                                    implicitConversions++;
+                                                }
                                                 clrtype = parameter.ParameterType;
                                             }
                                         }
@@ -739,13 +747,10 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
                         }
                     }
 
-                    var match = new MatchedMethod(kwargsMatched, margs, outs, methodInformation);
-                    if (usedImplicitConversion)
+                    var match = new MatchedMethod(kwargsMatched, margs, outs, methodInformation, implicitConversions);
+                    if (implicitConversions > 0)
                     {
-                        if (matchesUsingImplicitConversion == null)
-                        {
-                            matchesUsingImplicitConversion = new List<MatchedMethod>();
-                        }
+                        matchesUsingImplicitConversion ??= new List<MatchedMethod>();
                         matchesUsingImplicitConversion.Add(match);
                     }
                     else
@@ -767,11 +772,22 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
                 // we solve the ambiguity by taking the one with the highest precedence but only
                 // considering the actual arguments passed, ignoring the optional arguments for
                 // which the default values were used
-                var bestMatch = matchesTouse
-                    .GroupBy(x => x.KwargsMatched)
-                    .OrderByDescending(x => x.Key)
-                    .First()
-                    .MinBy(x => GetMatchedArgumentsPrecedence(x.MethodInformation, pyArgCount, kwArgDict?.Keys));
+                MatchedMethod bestMatch;
+                if (matchesTouse.Count == 1)
+                {
+                    bestMatch = matchesTouse[0];
+                }
+                else
+                {
+                    bestMatch = matchesTouse
+                        .GroupBy(x => x.KwargsMatched)
+                        .OrderByDescending(x => x.Key)
+                        .First()
+                        .GroupBy(x => x.ImplicitOperations)
+                        .OrderBy(x => x.Key)
+                        .First()
+                        .MinBy(x => GetMatchedArgumentsPrecedence(x.MethodInformation, pyArgCount, kwArgDict?.Keys));
+                }
 
                 var margs = bestMatch.ManagedArgs;
                 var outs = bestMatch.Outs;
@@ -1135,15 +1151,17 @@ private readonly struct MatchedMethod
             public int KwargsMatched { get; }
             public object?[] ManagedArgs { get; }
             public int Outs { get; }
+            public int ImplicitOperations { get; }
             public MethodInformation MethodInformation { get; }
             public MethodBase Method => MethodInformation.MethodBase;
 
-            public MatchedMethod(int kwargsMatched, object?[] margs, int outs, MethodInformation methodInformation)
+            public MatchedMethod(int kwargsMatched, object?[] margs, int outs, MethodInformation methodInformation, int implicitOperations)
             {
                 KwargsMatched = kwargsMatched;
                 ManagedArgs = margs;
                 Outs = outs;
                 MethodInformation = methodInformation;
+                ImplicitOperations = implicitOperations;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1448,7 +1448,7 @@ public bool SomeMethod()`
`1448`	`1448`	`return true;`
`1449`	`1449`	`}`
`1450`	`1450`
`1451`		`- public virtual string OnlyClass(TestImplicitConversion data)`
	`1451`	`+ public virtual string OnlyClass(TestImplicitConversion data, double anotherArgument = 0)`
`1452`	`1452`	`{`
`1453`	`1453`	`return "OnlyClass impl";`
`1454`	`1454`	`}`
`@@ -1458,12 +1458,12 @@ public virtual string OnlyString(string data)`
`1458`	`1458`	`return "OnlyString impl: " + data;`
`1459`	`1459`	`}`
`1460`	`1460`
`1461`		`- public virtual string InvokeModel(string data)`
	`1461`	`+ public virtual string InvokeModel(string data, double anotherArgument = 0)`
`1462`	`1462`	`{`
`1463`	`1463`	`return "string impl: " + data;`
`1464`	`1464`	`}`
`1465`	`1465`
`1466`		`- public virtual string InvokeModel(TestImplicitConversion data)`
	`1466`	`+ public virtual string InvokeModel(TestImplicitConversion data, double anotherArgument = 0)`
`1467`	`1467`	`{`
`1468`	`1468`	`return "TestImplicitConversion impl";`
`1469`	`1469`	`}`