Print it properly

Akuli · Jan 5, 2025 · 670ddbe · 670ddbe
1 parent f0ea623
commit 670ddbe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/self_hosted/ast.jou b/self_hosted/ast.jou
@@ -677,7 +677,13 @@ class AstSignature:
         for i = 0; i < self->nargs; i++:
             if i != 0:
                 printf(", ")
-            if strcmp(self->args[i].name, "self") == 0:
+
+            if (
+                strcmp(self->args[i].name, "self") == 0
+                and self->args[i].type.kind == AstTypeKind::Named
+                and self->args[i].type.name[0] == '\0'
+            ):
+                # self with implicitly given type
                 printf("self")
             else:
                 self->args[i].print_with_tree_printer(NULL)

diff --git a/src/print.c b/src/print.c
@@ -172,9 +172,10 @@ static void print_ast_function_signature(const AstSignature *sig)
     printf("%s(", sig->name);
     for (const AstNameTypeValue *ntv = sig->args.ptr; ntv < End(sig->args); ntv++) {
         if (ntv > sig->args.ptr) printf(", ");
-        if (!strcmp(ntv->name, "self"))
+        if (!strcmp(ntv->name, "self") && ntv->type.kind == AST_TYPE_NAMED && ntv->type.data.name[0] == '\0') {
+            // self with implicitly given type
             printf("self");
-        else{
+        } else {
             printf("%s: ", ntv->name);
             print_ast_type(&ntv->type);
         }