diff options
| -rw-r--r-- | src/parse.rs | 6 | ||||
| -rw-r--r-- | src/run/mod.rs | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/parse.rs b/src/parse.rs index b1721be..809f76b 100644 --- a/src/parse.rs +++ b/src/parse.rs @@ -104,12 +104,6 @@ impl FunDecl<PreExpansion> { } #[derive(Debug, Clone)] -pub struct VarDecl<S: Stage> { - pub name: S::Str, - pub val: S::Str, -} - -#[derive(Debug, Clone)] pub struct VarAssign<S: Stage> { pub var: S::Str, pub val: S::Str, diff --git a/src/run/mod.rs b/src/run/mod.rs index 3803936..2d137c6 100644 --- a/src/run/mod.rs +++ b/src/run/mod.rs @@ -166,8 +166,16 @@ impl Executor { } else { let mut code = 0; for jh in threads { - // TODO do not ignore panics - let _ = jh.join(); + match jh.join() { + Ok(Ok(())) => (), + Ok(Err(e)) => { + match e { + BuiltinError::IO(_) => code = -1, + BuiltinError::Exit(c) => code = c, + } + } + Err(_) => code = 127, + } } for child in children.iter_mut() { match child.wait() { @@ -258,7 +266,7 @@ pub fn run(se: Arc<Mutex<Session>>, cmd: Vec<u8>) { } #[derive(Debug)] -enum BuiltinError { +pub enum BuiltinError { IO(std::io::Error), Exit(i32), } |