Fix struct literal assignment

1 files changed, 29 insertions, 21 deletions

diff --git a/src/main.c b/src/main.c
index 0dd8288..3027a1b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,12 +7,9 @@
 #include "parser.c"
 #include "vm.c"
 
-// TODO: in a let/set expression if the type is a struct check that we
-// are assigning a struct literal, not just a symbol.
 // TODO: unions
 // TODO: match deconstruct structs
 // TODO: arrays and pointers
-// TODO: struct literals with compound types
 
 typedef enum ExecMode {
     RUN_NORMAL,
@@ -410,7 +407,7 @@ typecheck_field(Analyzer *a, Node *node, TypeScope *scope, Str symbol) {
         Str field_name = str_concat(symbol, cstr("."), a->storage);
         field_name = str_concat(field_name, node->value.str, a->storage);
         Str field_type = node->field_type->value.str;
-        if (!find_type(scope, field_type)) {
+        if (!typemap_lookup(&scope->types, field_type)) {
             eprintln("%s:%d:%d: error: unknown type '%s'", a->file_name,
                      node->field_type->line, node->field_type->col, field_type);
         }
@@ -909,24 +906,35 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
             }
 
             FindStructResult s = find_struct(scope, type->val);
-            if (s.map && !str_eq(symbol, type->val)) {
-                if (node->next) {
-                    Str chain = type->val;
-                    Node *next = node;
-                    while (next->next) {
-                        next = next->next;
-                        chain = str_concat(chain, cstr("."), a->storage);
-                        chain = str_concat(chain, next->value.str, a->storage);
-                    }
-                    StructMap *field =
-                        structmap_lookup(&s.scope->structs, chain);
-                    if (!field) {
-                        eprintln("%s:%d:%d: error: unknown struct field '%s'",
-                                 a->file_name, node->line, node->col, chain);
-                        return cstr("");
+            if (s.map) {
+                if (str_eq(symbol, type->val)) {
+                    eprintln(
+                        "%s:%d:%d: error: struct incomplete struct literal "
+                        "'%s', did you mean to use %s:{}?",
+                        a->file_name, node->line, node->col, type->val,
+                        type->val);
+                    return cstr("");
+                } else {
+                    if (node->next) {
+                        Str chain = type->val;
+                        Node *next = node;
+                        while (next->next) {
+                            next = next->next;
+                            chain = str_concat(chain, cstr("."), a->storage);
+                            chain =
+                                str_concat(chain, next->value.str, a->storage);
+                        }
+                        StructMap *field =
+                            structmap_lookup(&s.scope->structs, chain);
+                        if (!field) {
+                            eprintln(
+                                "%s:%d:%d: error: unknown struct field '%s'",
+                                a->file_name, node->line, node->col, chain);
+                            return cstr("");
+                        }
+                        node->type = field->val.type;
+                        return node->type;
                     }
-                    node->type = field->val.type;
-                    return node->type;
                 }
             }
             node->type = type->val;