Fix typechecking for nested struct literals

1 files changed, 35 insertions, 18 deletions

diff --git a/src/main.c b/src/main.c
index b2e8d7f..0dd8288 100644
--- a/src/main.c
+++ b/src/main.c
@@ -441,6 +441,40 @@ typecheck_field(Analyzer *a, Node *node, TypeScope *scope, Str symbol) {
 }
 
 void
+typecheck_lit_field(Analyzer *a, Node *node, TypeScope *scope, Str symbol) {
+    if (node->field_val->kind == NODE_COMPOUND_TYPE) {
+        Str type = cstr("\\{ ");
+        for (sz i = 0; i < array_size(node->field_val->elements); i++) {
+            Node *field = node->field_val->elements[i];
+            Str field_name = str_concat(symbol, cstr("."), a->storage);
+            field_name = str_concat(field_name, field->value.str, a->storage);
+            typecheck_lit_field(a, field, scope, field_name);
+            type = str_concat(type, field->type, a->storage);
+            type = str_concat(type, cstr(" "), a->storage);
+        }
+        type = str_concat(type, cstr("\\}"), a->storage);
+        node->type = type;
+    } else {
+        StructMap *s = structmap_lookup(&scope->structs, symbol);
+        if (!s) {
+            eprintln("%s:%d:%d: error: unknown struct field '%s'", a->file_name,
+                     node->line, node->col, symbol);
+            return;
+        }
+        Str field_type = s->val.type;
+        Type type = type_inference(a, node->field_val, scope);
+        if (!str_eq(type, field_type)) {
+            eprintln(
+                "%s:%d:%d: error: mismatched types in struct "
+                "value "
+                "for '%s': %s expected %s",
+                a->file_name, node->line, node->col, symbol, type, field_type);
+        }
+        node->type = field_type;
+    }
+}
+
+void
 typecheck_returns(Analyzer *a, Node *node, Str expected) {
     if (!node) {
         return;
@@ -922,24 +956,7 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                 } else {
                     strset_insert(&set, field_name, a->storage);
                 }
-
-                StructMap *field =
-                    structmap_lookup(&s.scope->structs, field_name);
-                if (!field) {
-                    eprintln("%s:%d:%d: error: unknown struct field '%s'",
-                             a->file_name, next->line, next->col, field_name);
-                } else {
-                    Type type = type_inference(a, next->field_val, scope);
-                    if (!str_eq(type, field->val.type)) {
-                        eprintln(
-                            "%s:%d:%d: error: mismatched types in struct "
-                            "literal for '%s': %s expected %s ",
-                            a->file_name, next->line, next->col, field_name,
-                            type, field->val.type);
-                    }
-                    next->type = type;
-                }
-                // TODO: nested fields.
+                typecheck_lit_field(a, next, s.scope, field_name);
             }
             node->type = name;
             return node->type;