overload resolution using named arguments + test

peachpiecompiler · Jun 19, 2024 · 68a5b6b · 68a5b6b
1 parent e26c914
commit 68a5b6b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/Peachpie.CodeAnalysis/Symbols/OverloadsList.cs b/src/Peachpie.CodeAnalysis/Symbols/OverloadsList.cs
@@ -110,6 +110,22 @@ public OverloadsList(List<MethodSymbol> methods)
             // only visible methods:
             RemoveInaccessible(result, scope);
 
+            // remove functions with no specified named parameters:
+            for (int i = result.Count - 1; i >= 0; i--)
+            {
+                foreach (var arg in args)
+                {
+                    if (arg.ParameterName != null && result[i].Parameters.All(p => p.Name != arg.ParameterName))
+                    {
+                        // the named parameter does not exist in the method,
+                        // it's not the matching overload
+                        result.RemoveAt(i);
+                        break;
+                    }
+                }
+            }
+
+            //
             if (result.Count == 0)
             {
                 return new InaccessibleMethodSymbol(_methods.AsImmutable());

diff --git a/src/Tests/Peachpie.App.Tests/CompiledILTest.cs b/src/Tests/Peachpie.App.Tests/CompiledILTest.cs
@@ -68,14 +68,36 @@ static bool DecompileFunction(IScript script, string fnname, out IMethod method,
             return true;
         }
 
+        public static void OverloadFoo(int i) { }
+        public static void OverloadFoo(double d) { }
+        public static void OverloadFoo(string s) { }
+
+        [TestMethod]
+        public void TestOverloadByNamedParameter()
+        {
+            var script = Compile($@"<?php
+
+function test($value) {{
+    {typeof(CompiledILTest).FullName.Replace('.', '\\')}::{nameof(OverloadFoo)}( s: $value );
+}}
+");
+            DecompileFunction(script, "test", out var method, out var ast);
+            var bodyCode = ast.LastChild.LastChild.Descendants.ElementAt(1).ToString().Trim();
+
+            Assert.IsTrue(
+                // method body
+                $"{nameof(CompiledILTest)}.{nameof(OverloadFoo)}" == bodyCode
+            );
+        }
+
         [TestMethod]
         public void TestSimpleFunction()
         {
             var script = Compile(@"<?php
 
 function test() { return 1; }
 ");
-            var testAst = DecompileFunction(script, "test", out var method, out var ast);
+            DecompileFunction(script, "test", out var method, out var ast);
 
             Assert.IsTrue(method.ReturnType.FullName == typeof(long).FullName);