From 5cb0c98db14314304c71adb2311c6d5255618f54 Mon Sep 17 00:00:00 2001
From: Techatrix <19954306+Techatrix@users.noreply.github.com>
Date: Sat, 11 Feb 2023 00:04:08 +0100
Subject: [PATCH] fix function call resolution

---
 src/ComptimeInterpreter.zig                      |  8 +++++++-
 src/analyser/InternPool.zig                      |  1 +
 tests/language_features/comptime_interpreter.zig | 13 +++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/ComptimeInterpreter.zig b/src/ComptimeInterpreter.zig
index dd85a38..973d65b 100644
--- a/src/ComptimeInterpreter.zig
+++ b/src/ComptimeInterpreter.zig
@@ -285,6 +285,7 @@ pub fn interpret(
             const name = analysis.getDeclName(tree, node_idx).?;
             const decl_index = try interpreter.ip.createDecl(interpreter.allocator, .{
                 .name = name,
+                .node_idx = node_idx,
                 .ty = .none,
                 .val = .none,
                 .alignment = 0, // TODO
@@ -450,7 +451,7 @@ pub fn interpret(
                 if (decl.ty == .none) return InterpretResult{ .nothing = {} };
                 return InterpretResult{ .value = Value{
                     .interpreter = interpreter,
-                    .node_idx = node_idx,
+                    .node_idx = decl.node_idx,
                     .ty = decl.ty,
                     .val = decl.val,
                 } };
@@ -987,6 +988,7 @@ pub fn interpret(
 
                 const decl_index = try interpreter.ip.createDecl(interpreter.allocator, .{
                     .name = name,
+                    .node_idx = node_idx,
                     .ty = Index.type_type,
                     .val = function_type,
                     .alignment = 0, // TODO
@@ -1122,6 +1124,9 @@ pub fn call(
     // TODO: type check args
 
     const tree = interpreter.getHandle().tree;
+    const node_tags = tree.nodes.items(.tag);
+
+    if (node_tags[func_node_idx] != .fn_decl) return error.CriticalAstFailure;
 
     var buf: [1]Ast.Node.Index = undefined;
     var proto = tree.fullFnProto(&buf, func_node_idx) orelse return error.CriticalAstFailure;
@@ -1154,6 +1159,7 @@ pub fn call(
             const decls = &interpreter.namespaces.items(.decls)[@enumToInt(fn_namespace)];
             const decl_index = try interpreter.ip.createDecl(interpreter.allocator, .{
                 .name = name,
+                .node_idx = name_token,
                 .ty = tex.val,
                 .val = arguments[arg_index].val,
                 .alignment = 0, // TODO
diff --git a/src/analyser/InternPool.zig b/src/analyser/InternPool.zig
index 059a93e..50c20d2 100644
--- a/src/analyser/InternPool.zig
+++ b/src/analyser/InternPool.zig
@@ -152,6 +152,7 @@ pub const DeclIndex = enum(u32) { _ };
 
 pub const Decl = struct {
     name: []const u8,
+    node_idx: u32,
     ty: Index,
     val: Index,
     alignment: u16,
diff --git a/tests/language_features/comptime_interpreter.zig b/tests/language_features/comptime_interpreter.zig
index bdd24a6..4f7c9c4 100644
--- a/tests/language_features/comptime_interpreter.zig
+++ b/tests/language_features/comptime_interpreter.zig
@@ -261,6 +261,17 @@ test "ComptimeInterpreter - call comptime argument" {
     try std.testing.expectEqual(Key{ .int_type = .{ .signedness = .unsigned, .bits = 69 } }, result2.val.?);
 }
 
+test "ComptimeInterpreter - call inner function" {
+    try testCall(
+        \\pub fn Inner() type {
+        \\    return bool;
+        \\}
+        \\pub fn Foo() type {
+        \\    return Inner();
+        \\}
+    , &.{}, .{ .simple_type = .bool });
+}
+
 //
 // Helper functions
 //
@@ -299,6 +310,8 @@ const Context = struct {
 
         const handle = try document_store.openDocument(test_uri, source);
 
+        // TODO handle handle.tree.errors
+
         interpreter.* = .{
             .allocator = allocator,
             .ip = try InternPool.init(allocator),