1 files changed, 23 insertions, 18 deletions

diff --git a/src/parse/functions.c b/src/parse/functions.c
index 37505ac5..ceb0a8bc 100644
--- a/src/parse/functions.c
+++ b/src/parse/functions.c
@@ -26,37 +26,42 @@ arg_ast_t *parse_args(parse_ctx_t *ctx, const char **pos) {
         type_ast_t *type = NULL;
 
         typedef struct name_list_s {
+            const char *start, *end;
             const char *name, *alias;
             struct name_list_s *next;
         } name_list_t;
 
         name_list_t *names = NULL;
         for (;;) {
-            whitespace(pos);
+            whitespace(ctx, pos);
             const char *name = get_id(pos);
             if (!name) break;
-            whitespace(pos);
+            const char *name_start = *pos;
+            whitespace(ctx, pos);
 
             const char *alias = NULL;
             if (match(pos, "|")) {
-                whitespace(pos);
+                whitespace(ctx, pos);
                 alias = get_id(pos);
                 if (!alias) parser_err(ctx, *pos, *pos, "I expected an argument alias after `|`");
             }
 
             if (match(pos, ":")) {
                 type = expect(ctx, *pos - 1, pos, parse_type, "I expected a type here");
-                names = new (name_list_t, .name = name, .alias = alias, .next = names);
-                whitespace(pos);
+                whitespace(ctx, pos);
                 if (match(pos, "="))
                     default_val = expect(ctx, *pos - 1, pos, parse_term, "I expected a value after this '='");
+                names =
+                    new (name_list_t, .start = name_start, .end = *pos, .name = name, .alias = alias, .next = names);
                 break;
             } else if (strncmp(*pos, "==", 2) != 0 && match(pos, "=")) {
                 default_val = expect(ctx, *pos - 1, pos, parse_term, "I expected a value after this '='");
-                names = new (name_list_t, .name = name, .alias = alias, .next = names);
+                names =
+                    new (name_list_t, .start = name_start, .end = *pos, .name = name, .alias = alias, .next = names);
                 break;
             } else if (name) {
-                names = new (name_list_t, .name = name, .alias = alias, .next = names);
+                names =
+                    new (name_list_t, .start = name_start, .end = *pos, .name = name, .alias = alias, .next = names);
                 spaces(pos);
                 if (!match(pos, ",")) break;
             } else {
@@ -71,10 +76,10 @@ arg_ast_t *parse_args(parse_ctx_t *ctx, const char **pos) {
 
         REVERSE_LIST(names);
         for (; names; names = names->next)
-            args = new (arg_ast_t, .name = names->name, .alias = names->alias, .type = type, .value = default_val,
-                        .next = args);
+            args = new (arg_ast_t, .start = names->start, .end = names->end, .name = names->name, .alias = names->alias,
+                        .type = type, .value = default_val, .next = args);
 
-        if (!match_separator(pos)) break;
+        if (!match_separator(ctx, pos)) break;
     }
 
     REVERSE_LIST(args);
@@ -95,19 +100,19 @@ ast_t *parse_func_def(parse_ctx_t *ctx, const char *pos) {
     arg_ast_t *args = parse_args(ctx, &pos);
     spaces(&pos);
     type_ast_t *ret_type = match(&pos, "->") ? optional(ctx, &pos, parse_type) : NULL;
-    whitespace(&pos);
+    whitespace(ctx, &pos);
     bool is_inline = false;
     ast_t *cache_ast = NULL;
-    for (bool specials = match(&pos, ";"); specials; specials = match_separator(&pos)) {
+    for (bool specials = match(&pos, ";"); specials; specials = match_separator(ctx, &pos)) {
         const char *flag_start = pos;
         if (match_word(&pos, "inline")) {
             is_inline = true;
         } else if (match_word(&pos, "cached")) {
             if (!cache_ast) cache_ast = NewAST(ctx->file, pos, pos, Int, .str = "-1");
         } else if (match_word(&pos, "cache_size")) {
-            whitespace(&pos);
+            whitespace(ctx, &pos);
             if (!match(&pos, "=")) parser_err(ctx, flag_start, pos, "I expected a value for 'cache_size'");
-            whitespace(&pos);
+            whitespace(ctx, &pos);
             cache_ast = expect(ctx, start, &pos, parse_expr, "I expected a maximum size for the cache");
         }
     }
@@ -129,19 +134,19 @@ ast_t *parse_convert_def(parse_ctx_t *ctx, const char *pos) {
     arg_ast_t *args = parse_args(ctx, &pos);
     spaces(&pos);
     type_ast_t *ret_type = match(&pos, "->") ? optional(ctx, &pos, parse_type) : NULL;
-    whitespace(&pos);
+    whitespace(ctx, &pos);
     bool is_inline = false;
     ast_t *cache_ast = NULL;
-    for (bool specials = match(&pos, ";"); specials; specials = match_separator(&pos)) {
+    for (bool specials = match(&pos, ";"); specials; specials = match_separator(ctx, &pos)) {
         const char *flag_start = pos;
         if (match_word(&pos, "inline")) {
             is_inline = true;
         } else if (match_word(&pos, "cached")) {
             if (!cache_ast) cache_ast = NewAST(ctx->file, pos, pos, Int, .str = "-1");
         } else if (match_word(&pos, "cache_size")) {
-            whitespace(&pos);
+            whitespace(ctx, &pos);
             if (!match(&pos, "=")) parser_err(ctx, flag_start, pos, "I expected a value for 'cache_size'");
-            whitespace(&pos);
+            whitespace(ctx, &pos);
             cache_ast = expect(ctx, start, &pos, parse_expr, "I expected a maximum size for the cache");
         }
     }