Fix set typechecking

2 files changed, 14 insertions, 4 deletions

diff --git a/src/main.c b/src/main.c
index 9d8ace8..33d193b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,6 +11,7 @@
 // are assigning a struct literal, not just a symbol.
 // TODO: nested structs
 // TODO: unions
+// TODO: match deconstruct structs
 
 typedef enum ExecMode {
     RUN_NORMAL,
@@ -507,8 +508,17 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
             return node->type;
         } break;
         case NODE_SET: {
-            type_inference(a, node->var_name, scope);
-            type_inference(a, node->var_val, scope);
+            Type name = type_inference(a, node->var_name, scope);
+            Type val = type_inference(a, node->var_val, scope);
+            if (!str_eq(name, val)) {
+                eprintln(
+                    "%s:%d:%d: error: type mismatch, trying to assing "
+                    "%s"
+                    " to a variable of type %s",
+                    a->file_name, node->line, node->col,
+                    val, name);
+                return cstr("");
+            }
             node->type = cstr("nil");
             return node->type;
         } break;
@@ -816,7 +826,7 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                 }
                 node->next->type = cstr("int");
                 node->type = type->val;
-                return node->type;
+                return node->next->type;
             }
 
             StructMap *s = find_struct(scope, type->val);
diff --git a/tests/semantics.bad b/tests/semantics.bad
index a6810a9..95e827b 100644
--- a/tests/semantics.bad
+++ b/tests/semantics.bad
@@ -20,7 +20,7 @@ struct item {
 ; }
 ; let a: item = item ; this shouldn't work, or should it return the default val?
 let c: item
-set c.id = "hi"
+set c.id = 1
 let d = c.id
 ; set a.name = "hello"
 ; let b = a.id