Fix for #87

2 files changed, 55 insertions, 4 deletions

diff --git a/src/ast/ast.c b/src/ast/ast.c
index 712f6e3..78d7efb 100644
--- a/src/ast/ast.c
+++ b/src/ast/ast.c
@@ -169,12 +169,31 @@ int type_eq(Type *a, Type *b)
     return 1;
 }
 
+static char *type_to_string_impl(Type *t);
+
 char *type_to_string(Type *t)
 {
     if (!t)
     {
         return xstrdup("void");
     }
+    char *res = type_to_string_impl(t);
+    if (t->is_const)
+    {
+        char *final = xmalloc(strlen(res) + 7);
+        sprintf(final, "const %s", res);
+        free(res);
+        return final;
+    }
+    return res;
+}
+
+static char *type_to_string_impl(Type *t)
+{
+    if (!t)
+    {
+        return xstrdup("void");
+    }
 
     switch (t->kind)
     {
@@ -293,12 +312,31 @@ char *type_to_string(Type *t)
 // C-compatible type stringifier.
 // Strictly uses 'struct T' for explicit structs to support external types.
 // Does NOT mangle pointers to 'Ptr'.
+static char *type_to_c_string_impl(Type *t);
+
 char *type_to_c_string(Type *t)
 {
     if (!t)
     {
         return xstrdup("void");
     }
+    char *res = type_to_c_string_impl(t);
+    if (t->is_const)
+    {
+        char *final = xmalloc(strlen(res) + 7);
+        sprintf(final, "const %s", res);
+        free(res);
+        return final;
+    }
+    return res;
+}
+
+static char *type_to_c_string_impl(Type *t)
+{
+    if (!t)
+    {
+        return xstrdup("void");
+    }
 
     switch (t->kind)
     {
diff --git a/src/parser/parser_type.c b/src/parser/parser_type.c
index b11bedb..24e9f69 100644
--- a/src/parser/parser_type.c
+++ b/src/parser/parser_type.c
@@ -713,11 +713,20 @@ Type *parse_type_base(ParserContext *ctx, Lexer *l)
 Type *parse_type_formal(ParserContext *ctx, Lexer *l)
 {
     int is_restrict = 0;
-    if (lexer_peek(l).type == TOK_IDENT && lexer_peek(l).len == 8 &&
-        strncmp(lexer_peek(l).start, "restrict", 8) == 0)
+    int is_const = 0;
+
+    if (lexer_peek(l).type == TOK_IDENT)
     {
-        lexer_next(l); // eat restrict
-        is_restrict = 1;
+        if (lexer_peek(l).len == 8 && strncmp(lexer_peek(l).start, "restrict", 8) == 0)
+        {
+            lexer_next(l); // eat restrict
+            is_restrict = 1;
+        }
+        else if (lexer_peek(l).len == 5 && strncmp(lexer_peek(l).start, "const", 5) == 0)
+        {
+            lexer_next(l); // eat const
+            is_const = 1;
+        }
     }
 
     // Example: fn(int, int) -> int
@@ -829,6 +838,10 @@ Type *parse_type_formal(ParserContext *ctx, Lexer *l)
     {
         t->is_restrict = 1;
     }
+    if (is_const)
+    {
+        t->is_const = 1;
+    }
     return t;
 }