diff --git a/scie-grammar/src/grammar/grammar.rs b/scie-grammar/src/grammar/grammar.rs index 95efee936d5f58563b276880434f72caad8b8d98..e9c50aaacc1dfe7ab791ff6d743bd33e48b5e43b 100644 --- a/scie-grammar/src/grammar/grammar.rs +++ b/scie-grammar/src/grammar/grammar.rs @@ -749,8 +749,8 @@ hellomake: $(OBJ) #[test] fn should_resolve_make_file_error_issues() { - let code = "%.o: %.c $(DEPS)"; - let mut grammar = to_grammar_for_test("scie-grammar/test-cases/first-mate/fixtures/makefile.json"); + let _code = "%.o: %.c $(DEPS)"; + let mut grammar = to_grammar_for_test("test-cases/first-mate/fixtures/makefile.json"); let result = grammar.tokenize_line(String::from("%.o: %.c $(DEPS)"), &mut None); let tokens = result.tokens.clone(); assert_eq!(7, tokens.len()); diff --git a/scie-grammar/src/rule/compiled_rule.rs b/scie-grammar/src/rule/compiled_rule.rs index 2def28569f6f75f004f858009b246f97819aafd7..350abf3efd06ce39183ed99a3b165473f3b1ec58 100644 --- a/scie-grammar/src/rule/compiled_rule.rs +++ b/scie-grammar/src/rule/compiled_rule.rs @@ -9,7 +9,6 @@ pub struct CompiledRule { impl CompiledRule { pub fn new(debug_reg_exps: Vec, rules: Vec) -> Self { - // println!("{:?}", rules); let scanner = Scanner::new(debug_reg_exps.clone()); CompiledRule { debug_reg_exps, diff --git a/scie-scanner/src/scanner/scanner.rs b/scie-scanner/src/scanner/scanner.rs index f22df7367373ba5083bc5df796350e15b538a05d..ab2f836a2c1d383eb7544e6088ec5414c4ecf54a 100644 --- a/scie-scanner/src/scanner/scanner.rs +++ b/scie-scanner/src/scanner/scanner.rs @@ -38,10 +38,6 @@ impl Scanner { self.index = 0; return None; } - // - // if origin_str.clone().len() <= start_position.clone() as usize { - // return None; - // } let mut all_results: Vec = vec![]; for (index, pattern) in self.patterns.iter().enumerate() { @@ -99,6 +95,7 @@ impl Scanner { } } + println!("{:?}", all_results.clone()); if all_results.len() > 0 { let mut best_match = all_results[0].clone(); for i in 1..all_results.len().clone() { @@ -290,7 +287,7 @@ mod tests { ); let result2 = scanner.find_next_match_sync(String::from("X💻X"), 10000); - assert_eq!(format!("{:?}", result2), "None"); + assert!(result2.is_none()); } #[test]