From fea93f44ebe4d73c6a2c6a1e1ab87ee7e21fbdb4 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Fri, 24 Aug 2018 17:12:54 -0700 Subject: [PATCH] [parser] Clean up the prints --- parser/src/lib.rs | 19 +++++++++++-------- parser/src/main.rs | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/parser/src/lib.rs b/parser/src/lib.rs index ae4b15b..c751ec3 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -52,22 +52,22 @@ impl Parser where T: Iterator { fn pop_parser(&mut self) { let popped = self.parsers.pop(); - print!("popped parser stack, {} parser{} remain --> {:?}\n", - self.parsers.len(), - if self.parsers.len() == 1 { " " } else { "s" }, - popped); + println!("popped parser stack, {} parser{} remain --> {:?}", + self.parsers.len(), + if self.parsers.len() == 1 { " " } else { "s" }, + popped); } fn push_parser(&mut self, next: Box) { self.parsers.push(next); - print!("pushed onto parser stack, {} now -> {:?}\n", - self.parsers.len(), - self.parsers.last()); + println!("pushed onto parser stack, {} now -> {:?}", + self.parsers.len(), + self.parsers.last()); } fn next_lex(&mut self) -> Option { let next = self.input.next(); - print!("next lex: {:?}\n", next); + println!("next lex: {:?}", next); next } } @@ -87,12 +87,15 @@ impl Iterator for Parser where T: Iterator { self.pop_parser(); if self.parsers.len() == 0 && input_lex.is_none() { // We are done. + println!("we are done"); out = Some(Ok(obj)); break; } self.next_lex() }, Some(NodeParseResult::Push{ next }) => { + // Push the next parser on and give it a shot at the current + // token. self.push_parser(next); input_lex }, diff --git a/parser/src/main.rs b/parser/src/main.rs index 588f552..a1c160a 100644 --- a/parser/src/main.rs +++ b/parser/src/main.rs @@ -12,6 +12,6 @@ fn main() { let lexer = Lexer::new("(ab)".chars()); let parser = Parser::new(lexer); for thing in parser { - println!("{:?}", thing); + println!("main: token -> {:?}", thing); } }