From 5f4b96e4e2153c50b0760d3ffe40046d077e4a00 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 7 Jan 2017 19:31:22 -0800 Subject: [PATCH] Misc tiny cleanup bits in the lexer --- src/lexer/mod.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lexer/mod.rs b/src/lexer/mod.rs index c181a72..c4231a7 100644 --- a/src/lexer/mod.rs +++ b/src/lexer/mod.rs @@ -526,7 +526,7 @@ impl Iterator for Lexer { } let mut token: Option = None; println!("Lexing '{}'", &self.input[self.begin ..]); - while token.is_none() { + loop { let c = match self.input.char_at(self.forward) { Some(c) => c, None => '\0', @@ -605,12 +605,9 @@ mod tests { } #[test] - fn finds_characters_newline() { + fn finds_named_characters() { check_single_token("#\\newline", Token::Character('\n')); - } - - #[test] - fn finds_characters_space() { + check_single_token("#\\null", Token::Character('\0')); check_single_token("#\\space", Token::Character(' ')); }