run_until_halt

Author: aceinetx

zenlang-cli/src/main.rs

@@ -14,11 +14,8 @@ fn run_vm(vm: &mut vm::VM) {
     }
     //println!("{:?}", vm.modules);
 
-    loop {
-        if !vm.step() {
-            break;
-        }
-    }
+    vm.run_until_halt();
+
     if !vm.error.is_empty() {
         let mut pc = vm.pc;
         pc.sub_low(1);

zenlang/src/vm/vm.rs

@@ -167,6 +167,12 @@ impl VM {
         return None;
     }
 
+    pub fn run_until_halt(&mut self) {
+        while !self.halted {
+            self.step();
+        }
+    }
+
     pub fn step(&mut self) -> bool {
         if self.halted {
             return false;

zenlang/tests/vm_stdlib.rs

@@ -27,11 +27,7 @@ fn expect_to_return(code: String, value: Value) {
         assert_eq!(e, "");
     }
 
-    loop {
-        if !vm.step() {
-            break;
-        }
-    }
+    vm.run_until_halt();
 
     println!("vm.ret: {:?}", vm.ret);
     assert_eq!(vm.error, "");
@@ -56,11 +52,7 @@ fn expect_to_return_obj(code: String, object: Object) {
         assert_eq!(e, "");
     }
 
-    loop {
-        if !vm.step() {
-            break;
-        }
-    }
+    vm.run_until_halt();
 
     println!("vm.ret: {}", vm.ret);
     assert_eq!(vm.error, "");