Merge #169

169: Unassigned instance variables should print 'nil'. r=vext01 a=ltratt Co-authored-by: Laurence Tratt <[email protected]>
softdevteam · Jul 8, 2020 · b6f238b · b6f238b
2 parents 05a5f46 + 628948f
commit b6f238b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lang_tests/unassigned_inst_var.som b/lang_tests/unassigned_inst_var.som
@@ -0,0 +1,12 @@
+"
+VM:
+  status: success
+  stdout: nil
+"
+
+unassigned_inst_var = (
+    | x |
+    run = (
+        x println.
+    )
+)
diff --git a/src/lib/vm/objects/instance.rs b/src/lib/vm/objects/instance.rs
@@ -59,7 +59,7 @@ impl Inst {
     pub fn new(vm: &mut VM, class: Val) -> Val {
         let cls: Gc<Class> = class.downcast(vm).unwrap();
         let mut inst_vars = Vec::with_capacity(cls.num_inst_vars);
-        inst_vars.resize(cls.num_inst_vars, Val::illegal());
+        inst_vars.resize(cls.num_inst_vars, vm.nil);
         let inst = Inst {
             class,
             inst_vars: UnsafeCell::new(inst_vars),