refactor token names
This commit is contained in:
parent
a3d9723a36
commit
8d2582756d
3 changed files with 16 additions and 16 deletions
10
src/lexer.rs
10
src/lexer.rs
|
|
@ -54,11 +54,11 @@ impl Lexer {
|
||||||
Some(b'0' ..= b'9') => self.number(),
|
Some(b'0' ..= b'9') => self.number(),
|
||||||
Some(b'a' ..= b'z' | b'A' ..= b'Z') => self.ident(),
|
Some(b'a' ..= b'z' | b'A' ..= b'Z') => self.ident(),
|
||||||
|
|
||||||
Some(b'+') => {self.advance(); Some(Token::Add)},
|
Some(b'+') => {self.advance(); Some(Token::Plus)},
|
||||||
Some(b'-') => {self.advance(); Some(Token::Sub)},
|
Some(b'-') => {self.advance(); Some(Token::Minus)},
|
||||||
Some(b'*') => {self.advance(); Some(Token::Mul)},
|
Some(b'*') => {self.advance(); Some(Token::Asterisk)},
|
||||||
Some(b'/') => {self.advance(); Some(Token::Div)},
|
Some(b'/') => {self.advance(); Some(Token::Slash)},
|
||||||
Some(b'%') => {self.advance(); Some(Token::Mod)},
|
Some(b'%') => {self.advance(); Some(Token::Percent)},
|
||||||
|
|
||||||
Some(b'(') => {self.advance(); Some(Token::LParen)},
|
Some(b'(') => {self.advance(); Some(Token::LParen)},
|
||||||
Some(b')') => {self.advance(); Some(Token::RParen)},
|
Some(b')') => {self.advance(); Some(Token::RParen)},
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ impl Parser {
|
||||||
|
|
||||||
fn parse_prefix(&mut self) -> Expr {
|
fn parse_prefix(&mut self) -> Expr {
|
||||||
match self.peek() {
|
match self.peek() {
|
||||||
Some(Token::Sub) => {
|
Some(Token::Minus) => {
|
||||||
self.advance();
|
self.advance();
|
||||||
let op = UnaryOp::Neg;
|
let op = UnaryOp::Neg;
|
||||||
|
|
||||||
|
|
@ -64,11 +64,11 @@ impl Parser {
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let op = match self.peek() {
|
let op = match self.peek() {
|
||||||
Some(Token::Add) => BinaryOp::Add,
|
Some(Token::Plus) => BinaryOp::Add,
|
||||||
Some(Token::Sub) => BinaryOp::Sub,
|
Some(Token::Minus) => BinaryOp::Sub,
|
||||||
Some(Token::Mul) => BinaryOp::Mul,
|
Some(Token::Asterisk) => BinaryOp::Mul,
|
||||||
Some(Token::Div) => BinaryOp::Div,
|
Some(Token::Slash) => BinaryOp::Div,
|
||||||
Some(Token::Mod) => BinaryOp::Mod,
|
Some(Token::Percent) => BinaryOp::Mod,
|
||||||
_ => break
|
_ => break
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
10
src/token.rs
10
src/token.rs
|
|
@ -4,11 +4,11 @@ pub enum Token {
|
||||||
Ident(String),
|
Ident(String),
|
||||||
|
|
||||||
// Operators
|
// Operators
|
||||||
Add,
|
Plus,
|
||||||
Sub,
|
Minus,
|
||||||
Mul,
|
Asterisk,
|
||||||
Div,
|
Slash,
|
||||||
Mod,
|
Percent,
|
||||||
|
|
||||||
// Parentheses
|
// Parentheses
|
||||||
LParen,
|
LParen,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue