feat: Add calling functions from the same type

Socordia-Org · Dec 26, 2024 · d337b34 · d337b34
1 parent a517013
commit d337b34
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 22 deletions.
diff --git a/NewSource/SocordiaC/Compilation/Body/CallExpressionListener.cs b/NewSource/SocordiaC/Compilation/Body/CallExpressionListener.cs
@@ -1,4 +1,5 @@
 using DistIL.AsmIO;
+using DistIL.IR;
 using MrKWatkins.Ast.Listening;
 using Socordia.CodeAnalysis.AST;
 using Socordia.CodeAnalysis.AST.Expressions;
@@ -12,6 +13,47 @@ protected override void ListenToNode(BodyCompilation context, CallExpression nod
     {
         var args = node.Arguments.Select(Utils.CreateValue);
 
+        if (CreateStaticExternalCall(context, node, args)) return;
+        if (CreateStaticContainingTypeCalls(context, node, args)) return;
+        if (CreatePrintCalls(context, node, args)) return;
+
+        node.AddError("Function not found");
+    }
+
+    private static bool CreateStaticContainingTypeCalls(BodyCompilation context, CallExpression node, IEnumerable<Value> args)
+    {
+        var candidates = GetStaticMethodCandidates(node, args, context.Builder.Method.Definition.DeclaringType);
+        if (candidates.Length == 0)
+        {
+            return false;
+        }
+
+        var method = candidates[0];
+        context.Builder.CreateCall(method, [.. args]);
+        return true;
+    }
+
+    private static bool CreatePrintCalls(BodyCompilation context, CallExpression node, IEnumerable<Value> args)
+    {
+        if (node.Callee.Name == "print")
+        {
+            var method = context.Driver.Compilation.Module.Resolver.FindMethod("System.Console::Write", [.. args]);
+            context.Builder.CreateCall(method, [.. args]);
+            return true;
+        }
+
+        if (node.Callee.Name == "println")
+        {
+            var method = context.Driver.Compilation.Module.Resolver.FindMethod("System.Console::WriteLine", [.. args]);
+            context.Builder.CreateCall(method, [.. args]);
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool CreateStaticExternalCall(BodyCompilation context, CallExpression node, IEnumerable<Value> args)
+    {
         if (node.Parent is BinaryOperator { Operator: "'::", Left: BinaryOperator typeNode })
         {
             var typename = new QualifiedTypeName(typeNode);
@@ -20,15 +62,10 @@ protected override void ListenToNode(BodyCompilation context, CallExpression nod
             if (type == null)
             {
                 typename.AddError("Type not found");
-                return;
+                return true;
             }
 
-            var candidates = type.Methods
-                .Where(m => m.Name == node.Callee.Name)
-                .Where(m => m.ParamSig.Count == node.Arguments.Count())
-                .Where(m => m.ParamSig.Zip(
-                    args,
-                    (p, a) => p.Type.IsAssignableTo(a.ResultType)).All(x => x)).ToArray();
+            var candidates = GetStaticMethodCandidates(node, args, type);
 
             if (candidates.Length == 0)
             {
@@ -37,23 +74,19 @@ protected override void ListenToNode(BodyCompilation context, CallExpression nod
 
             var method = candidates[0];
             context.Builder.CreateCall(method, [.. args]);
-            return;
-        }
-
-        if (node.Callee.Name == "print")
-        {
-            var method = context.Driver.Compilation.Module.Resolver.FindMethod("System.Console::Write", [.. args]);
-            context.Builder.CreateCall(method, [.. args]);
-            return;
+            return true;
         }
 
-        if (node.Callee.Name == "println")
-        {
-            var method = context.Driver.Compilation.Module.Resolver.FindMethod("System.Console::WriteLine", [.. args]);
-            context.Builder.CreateCall(method, [.. args]);
-            return;
-        }
+        return false;
+    }
 
-        node.AddError("Function not found");
+    private static MethodDesc[] GetStaticMethodCandidates(CallExpression node, IEnumerable<Value> args, TypeDesc type)
+    {
+        return type.Methods
+            .Where(m => m.Name == node.Callee.Name && m.IsStatic)
+            .Where(m => m.ParamSig.Count == node.Arguments.Count())
+            .Where(m => m.ParamSig.Zip(
+                args,
+                (p, a) => p.Type.IsAssignableTo(a.ResultType)).All(x => x)).ToArray();
     }
 }
diff --git a/NewSource/SocordiaC/compilation.sc b/NewSource/SocordiaC/compilation.sc
@@ -6,6 +6,7 @@ func main() -> none  {
     print("hello");
     println("world");
     System.Console::WriteLine("Hello World!");
+    test(42, true);
 }
 
 private func test(hello: i32, flag: bool) -> i32