new cast syntax and fix assignment to parameters

apache-hb · Aug 9, 2024 · 8802768 · 8802768
1 parent 39a8470
commit 8802768
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/data/examples/config/config.ct b/data/examples/config/config.ct
@@ -53,7 +53,7 @@ def isSpace(letter: char): bool = letter == ' ' || letter == '\t' || letter == '
 def readUntil(current: *char, terminator: char): StringView {
     var front = current;
     while *current != terminator && *current != '\0' {
-        current = current + 1;
+        current = &current[1];
     }
 
     return .{

diff --git a/src/cthulhu/check/src/tree.c b/src/cthulhu/check/src/tree.c
@@ -5,6 +5,7 @@
 
 #include "cthulhu/events/events.h"
 
+#include "cthulhu/tree/ops.h"
 #include "cthulhu/util/util.h"
 #include "cthulhu/util/types.h"
 
@@ -491,6 +492,7 @@ static void check_single_expr(check_t *check, const tree_t *expr)
     case eTreeExprField:
     case eTreeExprSizeOf:
     case eTreeExprAlignOf:
+    case eTreeExprAddressOf:
         break;
 
     case eTreeExprOffsetOf:

diff --git a/src/language/ctu/src/ctu.l b/src/language/ctu/src/ctu.l
@@ -107,6 +107,7 @@ SUFFIX ("u"|"ul"|"l"|"uz")?
 "out" { return OUT; }
 
 "as" { return AS; }
+"cast" { return CAST; }
 
 "__sizeof" { return SIZEOF; }
 "__alignof" { return ALIGNOF; }

diff --git a/src/language/ctu/src/ctu.y b/src/language/ctu/src/ctu.y
@@ -84,6 +84,7 @@ void ctuerror(where_t *where, void *state, scan_t *scan, const char *msg);
     OUT "`out`"
 
     AS "`as`"
+    CAST "`cast`"
 
     SIZEOF "`__sizeof`"
     ALIGNOF "`__alignof`"
@@ -473,6 +474,7 @@ primary_expr: LPAREN expr RPAREN { $$ = $2; }
     | STRING { $$ = ctu_expr_string(x, @$, $1.text, $1.length); }
     | CHARACTER { $$ = ctu_expr_char(x, @$, $1.text, $1.length); }
     | path { $$ = ctu_expr_name(x, @$, $1); }
+    | CAST LPAREN expr AS type RPAREN { $$ = ctu_expr_cast(x, @$, $3, $5); }
     | AS LT type GT LPAREN expr RPAREN { $$ = ctu_expr_cast(x, @$, $6, $3); }
     | init { $$ = $1; }
     | SIZEOF LPAREN type RPAREN { $$ = ctu_builtin_sizeof(x, @$, $3); }

diff --git a/src/language/ctu/src/sema/decl/function.c b/src/language/ctu/src/sema/decl/function.c
@@ -20,11 +20,11 @@ static void add_param(ctu_sema_t *sema, tree_t *param)
     const char *id = tree_get_name(param);
     const node_t *node = tree_get_node(param);
 
-    if (!tree_is(ty, eTreeTypeStruct))
-    {
-        ctu_add_decl(sema->sema, eCtuTagValues, id, param);
-        return;
-    }
+    // if (!tree_is(ty, eTreeTypeStruct))
+    // {
+    //     ctu_add_decl(sema->sema, eCtuTagValues, id, param);
+    //     return;
+    // }
 
     tree_t *ref = tree_type_reference(node, id, ty);