Fix bug in struct/enum field matching

1 files changed, 35 insertions, 23 deletions

diff --git a/src/main.c b/src/main.c
index 6d25b2d..b2e8d7f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,8 +13,6 @@
 // TODO: match deconstruct structs
 // TODO: arrays and pointers
 // TODO: struct literals with compound types
-// FIXME: there may be an issue with shadowed structs sharing fields... we may
-// want to consider moving the fields to separate maps again...
 
 typedef enum ExecMode {
     RUN_NORMAL,
@@ -170,28 +168,38 @@ find_fun(TypeScope *scope, Str type) {
     return NULL;
 }
 
-EnumMap *
+typedef struct FindEnumResult {
+    EnumMap *map;
+    TypeScope *scope;
+} FindEnumResult;
+
+FindEnumResult
 find_enum(TypeScope *scope, Str type) {
     while (scope != NULL) {
         EnumMap *val = enummap_lookup(&scope->enums, type);
         if (val != NULL) {
-            return val;
+            return (FindEnumResult){.map = val, .scope = scope};
         }
         scope = scope->parent;
     }
-    return NULL;
+    return (FindEnumResult){0};
 }
 
-StructMap *
+typedef struct FindStructResult {
+    StructMap *map;
+    TypeScope *scope;
+} FindStructResult;
+
+FindStructResult
 find_struct(TypeScope *scope, Str type) {
     while (scope != NULL) {
         StructMap *val = structmap_lookup(&scope->structs, type);
         if (val != NULL) {
-            return val;
+            return (FindStructResult){.map = val, .scope = scope};
         }
         scope = scope->parent;
     }
-    return NULL;
+    return (FindStructResult){0};
 }
 
 void
@@ -539,8 +547,8 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                     // TODO: Consider compatible types.
                     if (!str_eq(type, type_name)) {
                         // Special case, enums can be treated as ints.
-                        EnumMap *e = find_enum(scope, type_name);
-                        if (!(e && str_eq(type, cstr("int")))) {
+                        FindEnumResult res = find_enum(scope, type_name);
+                        if (!(res.map && str_eq(type, cstr("int")))) {
                             eprintln(
                                 "%s:%d:%d: error: type mismatch, trying to "
                                 "assing "
@@ -841,8 +849,8 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                 return cstr("");
             }
 
-            EnumMap *e = find_enum(scope, type->val);
-            if (e && str_eq(symbol, type->val)) {
+            FindEnumResult e = find_enum(scope, type->val);
+            if (e.map && str_eq(symbol, type->val)) {
                 if (!node->next) {
                     eprintln(
                         "%s:%d:%d: error: unspecified enum field for symbol "
@@ -853,7 +861,7 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                 // Check if there is a next and it matches the enum field.
                 Str field = str_concat(type->val, cstr("."), a->storage);
                 field = str_concat(field, node->next->value.str, a->storage);
-                if (!find_enum(scope, field)) {
+                if (!enummap_lookup(&e.scope->enums, field)) {
                     eprintln(
                         "%s:%d:%d: error: unknown enum field for "
                         "'%s': %s",
@@ -866,8 +874,8 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                 return node->next->type;
             }
 
-            StructMap *s = find_struct(scope, type->val);
-            if (s && !str_eq(symbol, type->val)) {
+            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;
@@ -876,7 +884,8 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                         chain = str_concat(chain, cstr("."), a->storage);
                         chain = str_concat(chain, next->value.str, a->storage);
                     }
-                    StructMap *field = find_struct(scope, chain);
+                    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);
@@ -891,8 +900,8 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
         } break;
         case NODE_STRUCT_LIT: {
             Str name = node->value.str;
-            StructMap *s = find_struct(scope, name);
-            if (!s) {
+            FindStructResult s = find_struct(scope, name);
+            if (!s.map) {
                 eprintln("%s:%d:%d: error: unknown struct type '%s'",
                          a->file_name, node->line, node->col, name);
                 return cstr("");
@@ -914,7 +923,8 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                     strset_insert(&set, field_name, a->storage);
                 }
 
-                StructMap *field = find_struct(scope, field_name);
+                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);
@@ -1474,7 +1484,8 @@ process_file(Str path) {
         EnumMapIter iter = enummap_iterator(scope->enums, &scratch);
         EnumMap *m = enummap_next(&iter, &scratch);
         while (m) {
-            println("%s: enum: %s", path, m->val.name);
+            println("scope: %x{2} -- %s: enum: %s", scope->id, path,
+                    m->val.name);
             m = enummap_next(&iter, &scratch);
         }
     }
@@ -1485,7 +1496,8 @@ process_file(Str path) {
         StructMapIter iter = structmap_iterator(scope->structs, &scratch);
         StructMap *m = structmap_next(&iter, &scratch);
         while (m) {
-            println("%s: struct: %s", path, m->val.name);
+            println("scope: %x{2} -- %s: struct: %s", scope->id, path,
+                    m->val.name);
             m = structmap_next(&iter, &scratch);
         }
     }
@@ -1496,8 +1508,8 @@ process_file(Str path) {
         FunMapIter iter = funmap_iterator(scope->funcs, &scratch);
         FunMap *m = funmap_next(&iter, &scratch);
         while (m) {
-            println("%s: func: %s(%s): (%s)", path, m->val.name,
-                    m->val.param_type, m->val.return_type);
+            println("scope: %x{2} -- %s: func: %s(%s): (%s)", scope->id, path,
+                    m->val.name, m->val.param_type, m->val.return_type);
             m = funmap_next(&iter, &scratch);
         }
     }