From 5ed7b2c6c867a47c970616594a756aedb59c448e Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Tue, 10 Nov 2026 13:04:40 +0100 Subject: [PATCH] New operators. --- src/lexer.rs | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/lexer.rs b/src/lexer.rs index 0b09dfd..c832d08 100644 --- a/src/lexer.rs +++ b/src/lexer.rs @@ -1,5 +1,6 @@ #[derive(Debug, PartialEq, Eq)] pub enum Token { + Asterisk, Colon, Comma, CurlyBracketL, @@ -16,6 +17,7 @@ pub enum Token { ParenR, Plus, Semicolon, + Slash, SquareBracketL, SquareBracketR, String, @@ -85,6 +87,7 @@ impl<'a> Iterator for Lexer<'a> { let c = self.peek_char()?; if let Some(token) = match c { + '*' => Some(Token::Asterisk), ':' => Some(Token::Colon), ',' => Some(Token::Comma), '{' => Some(Token::CurlyBracketL), @@ -97,6 +100,7 @@ impl<'a> Iterator for Lexer<'a> { ')' => Some(Token::ParenR), '+' => Some(Token::Plus), ';' => Some(Token::Semicolon), + '/' => Some(Token::Slash), '[' => Some(Token::SquareBracketL), ']' => Some(Token::SquareBracketR), _ => None, @@ -221,21 +225,23 @@ mod tests { #[test] fn operators() { - let input = "+ = - : ; ( ) [ ] { } < >"; + let input = "+ = - * / : ; ( ) [ ] { } < >"; let mut lexer = Lexer::new(input); assert_next_token(&mut lexer, Token::Plus, "+", 0); assert_next_token(&mut lexer, Token::Equals, "=", 2); assert_next_token(&mut lexer, Token::Hyphen, "-", 4); - assert_next_token(&mut lexer, Token::Colon, ":", 6); - assert_next_token(&mut lexer, Token::Semicolon, ";", 8); - assert_next_token(&mut lexer, Token::ParenL, "(", 10); - assert_next_token(&mut lexer, Token::ParenR, ")", 12); - assert_next_token(&mut lexer, Token::SquareBracketL, "[", 14); - assert_next_token(&mut lexer, Token::SquareBracketR, "]", 16); - assert_next_token(&mut lexer, Token::CurlyBracketL, "{", 18); - assert_next_token(&mut lexer, Token::CurlyBracketR, "}", 20); - assert_next_token(&mut lexer, Token::LessThan, "<", 22); - assert_next_token(&mut lexer, Token::GreaterThan, ">", 24); + assert_next_token(&mut lexer, Token::Asterisk, "*", 6); + assert_next_token(&mut lexer, Token::Slash, "/", 8); + assert_next_token(&mut lexer, Token::Colon, ":", 10); + assert_next_token(&mut lexer, Token::Semicolon, ";", 12); + assert_next_token(&mut lexer, Token::ParenL, "(", 14); + assert_next_token(&mut lexer, Token::ParenR, ")", 16); + assert_next_token(&mut lexer, Token::SquareBracketL, "[", 18); + assert_next_token(&mut lexer, Token::SquareBracketR, "]", 20); + assert_next_token(&mut lexer, Token::CurlyBracketL, "{", 22); + assert_next_token(&mut lexer, Token::CurlyBracketR, "}", 24); + assert_next_token(&mut lexer, Token::LessThan, "<", 26); + assert_next_token(&mut lexer, Token::GreaterThan, ">", 28); assert_eq!(lexer.next(), None); }