Merge pull request #448 from nickheyer/master

Adding halt interupt to env

duckscript/src/runner.rs

@@ -18,12 +18,14 @@ use crate::types::instruction::{
 use crate::types::runtime::{Context, Runtime, StateValue};
 use std::collections::HashMap;
 use std::io::stdin;
+use std::sync::atomic::Ordering;
 
 #[derive(Debug)]
 enum EndReason {
     ExitCalled,
     ReachedEnd,
     Crash(ScriptError),
+    Halted
 }
 
 /// Executes the provided script with the given context
@@ -135,6 +137,11 @@ fn run_instructions(
 
     let mut end_reason = EndReason::ReachedEnd;
     loop {
+        if runtime.env.halt.load(Ordering::SeqCst) {
+            end_reason = EndReason::Halted;
+            break;
+        }
+
         let (instruction, meta_info) = if instructions.len() > line {
             let instruction = instructions[line].clone();
             let meta_info = instruction.meta_info.clone();

duckscript/src/types/env.rs

@@ -8,13 +8,17 @@
 mod env_test;
 
 use std::io::{stderr, stdout, Write};
+use std::sync::Arc;
+use std::sync::atomic::AtomicBool;
 
 /// The runtime env
 pub struct Env {
     /// The output writer
     pub out: Box<dyn Write>,
     /// The error writer
     pub err: Box<dyn Write>,
+    /// The halt token - Set to true to exit after current instruction
+    pub halt: Arc<AtomicBool>,
 }
 
 impl Env {
@@ -23,20 +27,16 @@ impl Env {
         Env {
             out: Box::new(stdout()),
             err: Box::new(stderr()),
+            halt: Arc::new(AtomicBool::new(false)),
         }
     }
 
     /// Creates and returns a new instance.
-    pub fn new(out: Option<Box<dyn Write>>, err: Option<Box<dyn Write>>) -> Env {
+    pub fn new(out: Option<Box<dyn Write>>, err: Option<Box<dyn Write>>, halt: Option<Arc<AtomicBool>>) -> Env {
         Env {
-            out: match out {
-                Some(value) => value,
-                None => Box::new(stdout()),
-            },
-            err: match err {
-                Some(value) => value,
-                None => Box::new(stderr()),
-            },
+            out: out.unwrap_or_else(|| Box::new(stdout())),
+            err: err.unwrap_or_else(|| Box::new(stderr())),
+            halt: halt.unwrap_or_else(|| Arc::new(AtomicBool::new(false))),
         }
     }
 }

duckscript/src/types/env_test.rs

@@ -13,14 +13,14 @@ fn env_default() {
 
 #[test]
 fn env_new_none() {
-    let mut env = Env::new(None, None);
+    let mut env = Env::new(None, None, None);
 
     validate_env(&mut env);
 }
 
 #[test]
 fn env_new_with_values() {
-    let mut env = Env::new(Some(Box::new(stdout())), Some(Box::new(stdout())));
+    let mut env = Env::new(Some(Box::new(stdout())), Some(Box::new(stdout())), None);
 
     validate_env(&mut env);
 }