aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/lib.rs b/src/lib.rs
index ce8ee51..693fb6c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,10 +21,15 @@ pub fn run_string(s: &str, print: bool) -> Result<(), Vec<Error>> {
pub fn run(tokens: TokenStream, path: &Path, print: bool) -> Result<(), Vec<Error>> {
match compiler::compile("main", path, tokens) {
- Ok(block) =>
- vm::VM::new().print_blocks(print)
- .print_ops(print)
- .run(Rc::new(block)).or_else(|e| Err(vec![e])),
+ Ok(blocks) => {
+ let mut vm = vm::VM::new().print_blocks(print).print_ops(print);
+ vm.typecheck(&blocks)?;
+ if let Err(e) = vm.run(Rc::clone(&blocks[0])) {
+ Err(vec![e])
+ } else {
+ Ok(())
+ }
+ }
Err(errors) => Err(errors),
}
}