Add semantic duplication check for enum fields

1 files changed, 16 insertions, 8 deletions

diff --git a/src/main.c b/src/main.c
index 8e177e1..2bcbf39 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,7 +42,7 @@ Str sym_kind_str[] = {
 typedef struct Symbol {
     SymbolKind kind;
     Str name;
-    struct Symbol *fields;
+    struct SymbolMap *fields;
 } Symbol;
 
 MAPDEF(SymbolMap, symmap, Str, Symbol, str_hash, str_eq)
@@ -173,10 +173,14 @@ analyzer_symbols(Analyzer *a, Node *node, Scope *scope) {
             for (sz i = 0; i < array_size(node->struct_field); i++) {
                 Node *field = node->struct_field[i];
                 Str field_name = field->field_name->value.str;
-                field_name = str_concat(cstr("."), field_name, a->storage);
-                field_name = str_concat(symbol, field_name, a->storage);
+                if (symmap_lookup(&map->val.fields, field_name) != NULL) {
+                    eprintln(
+                        "%s:%d:%d: error: enum field '%s.%s' already exists",
+                        a->file_name, field->line, field->col, symbol,
+                        field_name);
+                }
                 Symbol s = (Symbol){.kind = SYM_ENUM_FIELD, .name = field_name};
-                array_push(map->val.fields, s, a->storage);
+                symmap_insert(&map->val.fields, field_name, s, a->storage);
             }
         } break;
         case NODE_CASE: {
@@ -408,10 +412,14 @@ process_file(Str path) {
         while (sym) {
             println("%s: SCOPE: %d DEPTH: %d\t%s %s", path, scope->id,
                     scope->depth, sym_kind_str[sym->val.kind], sym->val.name);
-            for (sz i = 0; i < array_size(sym->val.fields); i++) {
-                Symbol field = sym->val.fields[i];
-                println("%s: SCOPE: %d DEPTH: %d\t%s %s", path, scope->id,
-                        scope->depth, sym_kind_str[field.kind], field.name);
+            SymbolMapIter field_iter =
+                symmap_iterator(sym->val.fields, &scratch);
+            SymbolMap *field = symmap_next(&field_iter, &scratch);
+            while (field) {
+                println("%s: SCOPE: %d DEPTH: %d\t%s %s.%s", path, scope->id,
+                        scope->depth, sym_kind_str[field->val.kind],
+                        sym->val.name, field->val.name);
+                field = symmap_next(&field_iter, &scratch);
             }
             sym = symmap_next(&iter, &lexer_arena);
         }