Update inner struct symbol resolution

1 files changed, 17 insertions, 10 deletions

diff --git a/src/main.c b/src/main.c
index d3c171c..c8584e4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -598,7 +598,11 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
             Str symbol = node->value.str;
             // TODO: make sure it didn't exist before.
             EnumMap *e = enummap_insert(&scope->enums, symbol,
-                                        (Enum){.name = symbol}, a->storage);
+                                        (Enum){
+                                            .name = symbol,
+                                            .val = node->field_val,
+                                        },
+                                        a->storage);
             for (sz i = 0; i < array_size(node->struct_field); i++) {
                 Node *field = node->struct_field[i];
                 Str field_name = str_concat(symbol, cstr("."), a->storage);
@@ -867,18 +871,21 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
             StructMap *s = find_struct(scope, type->val);
             if (s && !str_eq(symbol, type->val)) {
                 if (node->next) {
-                    FieldMap *field =
-                        fieldmap_lookup(&s->val.fields, node->next->value.str);
+                    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 = find_struct(scope, chain);
                     if (!field) {
-                        eprintln(
-                            "%s:%d:%d: error: unknown struct field for symbol "
-                            "'%s'",
-                            a->file_name, node->line, node->col, symbol);
+                        eprintln("%s:%d:%d: error: unknown struct field '%s'",
+                                 a->file_name, node->line, node->col, chain);
                         return cstr("");
                     }
-                    node->next->type = field->val.type;
-                    node->type = type->val;
-                    return node->next->type;
+                    node->type = field->val.type;
+                    return node->type;
                 }
             }
             node->type = type->val;