diff --git a/src/lexer.rs b/src/lexer.rs index 0a2bc74..a4045c3 100644 --- a/src/lexer.rs +++ b/src/lexer.rs @@ -54,11 +54,11 @@ impl Lexer { Some(b'0' ..= b'9') => self.number(), Some(b'a' ..= b'z' | b'A' ..= b'Z') => self.ident(), - Some(b'+') => {self.advance(); Some(Token::Add)}, - Some(b'-') => {self.advance(); Some(Token::Sub)}, - Some(b'*') => {self.advance(); Some(Token::Mul)}, - Some(b'/') => {self.advance(); Some(Token::Div)}, - Some(b'%') => {self.advance(); Some(Token::Mod)}, + Some(b'+') => {self.advance(); Some(Token::Plus)}, + Some(b'-') => {self.advance(); Some(Token::Minus)}, + Some(b'*') => {self.advance(); Some(Token::Asterisk)}, + Some(b'/') => {self.advance(); Some(Token::Slash)}, + Some(b'%') => {self.advance(); Some(Token::Percent)}, Some(b'(') => {self.advance(); Some(Token::LParen)}, Some(b')') => {self.advance(); Some(Token::RParen)}, diff --git a/src/parser.rs b/src/parser.rs index 75b6749..1e70723 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -46,7 +46,7 @@ impl Parser { fn parse_prefix(&mut self) -> Expr { match self.peek() { - Some(Token::Sub) => { + Some(Token::Minus) => { self.advance(); let op = UnaryOp::Neg; @@ -64,11 +64,11 @@ impl Parser { loop { let op = match self.peek() { - Some(Token::Add) => BinaryOp::Add, - Some(Token::Sub) => BinaryOp::Sub, - Some(Token::Mul) => BinaryOp::Mul, - Some(Token::Div) => BinaryOp::Div, - Some(Token::Mod) => BinaryOp::Mod, + Some(Token::Plus) => BinaryOp::Add, + Some(Token::Minus) => BinaryOp::Sub, + Some(Token::Asterisk) => BinaryOp::Mul, + Some(Token::Slash) => BinaryOp::Div, + Some(Token::Percent) => BinaryOp::Mod, _ => break }; diff --git a/src/token.rs b/src/token.rs index 778263c..e5759e8 100644 --- a/src/token.rs +++ b/src/token.rs @@ -4,11 +4,11 @@ pub enum Token { Ident(String), // Operators - Add, - Sub, - Mul, - Div, - Mod, + Plus, + Minus, + Asterisk, + Slash, + Percent, // Parentheses LParen,