diff --git a/crsn/crsn-sexp/src/test.rs b/crsn/crsn-sexp/src/test.rs index b7e8a86..3f63a6c 100644 --- a/crsn/crsn-sexp/src/test.rs +++ b/crsn/crsn-sexp/src/test.rs @@ -1,5 +1,4 @@ use super::*; -use super::error::get_line_and_column; use super::position::get_line_and_column; #[test] @@ -84,7 +83,7 @@ fn line_and_col_test() { fn sexp_size() { // I just want to see when this changes, in the diff. use std::mem; - assert_eq!(mem::size_of::(), mem::size_of::() * 6); + assert_eq!(mem::size_of::(), mem::size_of::() * 7); } #[test] diff --git a/crsn/src/asm/parse/parse_instr.rs b/crsn/src/asm/parse/parse_instr.rs index f949ef3..7fd53cb 100644 --- a/crsn/src/asm/parse/parse_instr.rs +++ b/crsn/src/asm/parse/parse_instr.rs @@ -15,7 +15,7 @@ use super::parse_op::parse_op; use std::path::{PathBuf}; use std::convert::TryFrom; use crate::asm::read_source_file; -use crate::asm::instr::flatten::jumps_to_skips; + pub fn parse_instructions(items: impl Iterator, pos: &SourcePosition, pcx: &ParserContext) -> Result, CrsnError> { let mut parsed: Vec> = vec![]; diff --git a/crsn/src/builtin/parse.rs b/crsn/src/builtin/parse.rs index 20a4253..bba2dd3 100644 --- a/crsn/src/builtin/parse.rs +++ b/crsn/src/builtin/parse.rs @@ -590,7 +590,7 @@ mod test { let ti = Arc::new(ThreadInfo { id: ThreadToken(0), uniq: Default::default(), - program: Program::new(vec![], parsers.clone()).unwrap(), + program: Program::new(vec![], parsers.clone(), vec![]).unwrap(), cycle_time: Default::default(), scheduler_interval: Default::default(), extensions: parsers.clone(), @@ -617,7 +617,9 @@ mod test { }, const_eval_ti: ti.clone(), parsing_expr: false, - label_num: Default::default() + label_num: Default::default(), + files: vec![], + active_file: 0 }), };