Codegen: Don't allow changing types on variable assignment

2 files changed, 6 insertions, 6 deletions

diff --git a/src/bootstrap/tokenizer.src b/src/bootstrap/tokenizer.src
index ff2f5a7..6a88117 100644
--- a/src/bootstrap/tokenizer.src
+++ b/src/bootstrap/tokenizer.src
@@ -5,13 +5,13 @@ extern atoi = (*i8) => i64;
 
 import "!stdlib.src";
 
-let file_size = 0;
-let buf = 0;
+let offset = 0;
 
+let buf = null;
+let file_size = 0;
 
-let offset = 0;
 
-let tokens = 0;
+let tokens = null;
 let tokens_len = 0;
 
 let read_file = (filename: *i8) => *i8 {
diff --git a/src/codegen.zig b/src/codegen.zig
index 33ee3b5..c10c7ec 100644
--- a/src/codegen.zig
+++ b/src/codegen.zig
@@ -151,6 +151,7 @@ pub const CodeGen = struct {
             }
 
             var ptr: llvm.LLVMValueRef = undefined;
+            var typ = variable.node_type;
             if (assignment_statement.is_declaration) {
                 var x = try self.get_llvm_type(variable.node_type);
                 if (variable.node_type.TYPE == .FUNCTION_TYPE) {
@@ -159,11 +160,10 @@ pub const CodeGen = struct {
                 ptr = llvm.LLVMBuildAlloca(self.builder, x, try std.fmt.allocPrintZ(self.arena, "{s}", .{identifier.name}));
             } else {
                 ptr = self.environment.get_variable(identifier.name).?.value;
+                typ = self.environment.get_variable(identifier.name).?.node_type;
             }
 
-            var typ = variable.node_type;
             if (assignment_statement.is_dereference) {
-                typ = self.environment.get_variable(identifier.name).?.node_type;
                 ptr = llvm.LLVMBuildLoad2(self.builder, try self.get_llvm_type(typ), ptr, "");
             }