Fix typechecking issues for bitops tests

2 files changed, 14 insertions, 8 deletions

diff --git a/src/main.c b/src/main.c
index 88d49ed..4cbce58 100644
--- a/src/main.c
+++ b/src/main.c
@@ -415,7 +415,9 @@ Type
 type_inference(Analyzer *a, Node *node, TypeScope *scope) {
     assert(a);
     assert(scope);
-    assert(node);
+    if (!node) {
+        return cstr("");
+    }
     // NOTE: For now we are not going to do implicit numeric conversions.
     switch (node->kind) {
         case NODE_LET: {
@@ -600,7 +602,16 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
             node->type = cstr("bool");
             return node->type;
         } break;
-        case NODE_BITNOT:
+        case NODE_BITNOT: {
+            Type left = type_inference(a, node->left, scope);
+            if (!strset_lookup(&a->integer_types, left)) {
+                emit_semantic_error(
+                    a, node, cstr("non integer type on bit twiddling expr"));
+                return cstr("");
+            }
+            node->type = left;
+            return node->type;
+        } break;
         case NODE_BITAND:
         case NODE_BITOR:
         case NODE_BITLSHIFT:
@@ -613,11 +624,6 @@ type_inference(Analyzer *a, Node *node, TypeScope *scope) {
                     a, node, cstr("non integer type on bit twiddling expr"));
                 return cstr("");
             }
-            if (!str_eq(left, right)) {
-                emit_semantic_error(
-                    a, node, cstr("mismatched types on binary expression"));
-                return cstr("");
-            }
             node->type = left;
             return node->type;
         } break;
diff --git a/tests/variables.bad b/tests/variables.bad
index bb449f6..61d1956 100644
--- a/tests/variables.bad
+++ b/tests/variables.bad
@@ -2,7 +2,7 @@
 ; inferred, but can also be manually specified.
 let a: str
 let b: f64
-let c:u64 = 20
+let c:int = 20
 
 ; No infix '=', instead we use `set` to bind values.
 set a = "hello"