Add better ergonomics for nested struct literals

1 files changed, 32 insertions, 6 deletions

diff --git a/src/parser.c b/src/parser.c
index e38f2ca..67c7e8c 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -521,6 +521,36 @@ parse_struct_field(Parser *parser) {
 }
 
 void
+parse_struct_lit_field(Parser *parser) {
+    if (parser->panic) return;
+#if DEBUG == 1
+    print("parsing struct field ");
+    print_token(parser->previous);
+#endif
+    Node *field = node_alloc(parser, NODE_FIELD, parser->current);
+    if (!field) return;
+    parse_consume(parser, TOK_SYMBOL,
+                  cstr("expected symbol name on struct field"));
+    field->value.sym = parser->previous.val;
+    parse_consume(parser, TOK_ASSIGN,
+                  cstr("expected field value on struct literal"));
+    if (parse_match(parser, TOK_LCURLY)) {
+        Node *type = node_alloc(parser, NODE_COMPOUND_TYPE, parser->current);
+        if (!type) return;
+        while (!parse_match(parser, TOK_RCURLY) && !parser->panic) {
+            parse_struct_lit_field(parser);
+            Node *subfield = array_pop(parser->nodes);
+            array_push(type->elements, subfield, parser->storage);
+        }
+        field->field_type = type;
+    } else {
+        parse_expr(parser, PREC_LOW);
+        field->field_val = array_pop(parser->nodes);
+    }
+    array_push(parser->nodes, field, parser->storage);
+}
+
+void
 parse_keyword(Parser *parser) {
     if (parser->panic) return;
     Token prev = parser->previous;
@@ -940,12 +970,8 @@ parse_symbol(Parser *parser) {
         // Struct literal.
         node->kind = NODE_STRUCT_LIT;
         while (!parse_match(parser, TOK_RCURLY) && !parser->panic) {
-            Node *field = node_alloc(parser, NODE_FIELD, parser->current);
-            parse_consume(parser, TOK_SYMBOL, cstr("expected symbol name"));
-            field->value.sym = parser->previous.val;
-            parse_consume(parser, TOK_ASSIGN, cstr("expected assignment"));
-            parse_expr(parser, PREC_LOW);
-            field->field_val = array_pop(parser->nodes);
+            parse_struct_lit_field(parser);
+            Node *field = array_pop(parser->nodes);
             array_push(node->elements, field, parser->storage);
         }
     } else if (parse_match(parser, TOK_LSQUARE)) {