AbleScript/ablescript
4
4
Fork 1
Code Issues Pull requests Projects Releases 7 Wiki Activity

Binary operator boilerplate reduction

Browse source
This commit is contained in:
Erin 2021-06-07 09:17:18 +02:00 committed by ondra05
parent afee5fb82d
commit 927ad5e955
2 changed files with 37 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ast.rs
View file

@ -112,3 +112,24 @@ pub enum BinOpKind {
And,
Or,
}
impl BinOpKind {
pub fn from_token(t: crate::lexer::Token) -> Result<Self, crate::error::ErrorKind> {
use crate::lexer::Token;
use crate::error::*;
match t {
Token::Plus => Ok(Self::Add),
Token::Minus => Ok(Self::Subtract),
Token::Star => Ok(Self::Multiply),
Token::FwdSlash => Ok(Self::Divide),
Token::GreaterThan => Ok(Self::Greater),
Token::LessThan => Ok(Self::Less),
Token::EqualEqual => Ok(Self::Equal),
Token::NotEqual => Ok(Self::NotEqual),
Token::And => Ok(Self::And),
Token::Or => Ok(Self::Or),
t=> Err(ErrorKind::UnexpectedToken(t)),
}
}
}

55
src/parser.rs
View file

@ -111,44 +111,21 @@ impl<'source> Parser<'source> {
)),
// Operations
Token::Plus => Ok(Expr::new(
self.op_flow(BinOpKind::Add, buf)?,
start..self.lexer.span().end,
)),
Token::Minus => Ok(Expr::new(
self.op_flow(BinOpKind::Subtract, buf)?,
start..self.lexer.span().end,
)),
Token::Star => Ok(Expr::new(
self.op_flow(BinOpKind::Multiply, buf)?,
start..self.lexer.span().end,
)),
Token::FwdSlash => Ok(Expr::new(
self.op_flow(BinOpKind::Divide, buf)?,
start..self.lexer.span().end,
)),
Token::EqualEqual => Ok(Expr::new(
self.op_flow(BinOpKind::Equal, buf)?,
start..self.lexer.span().end,
)),
Token::NotEqual => Ok(Expr::new(
self.op_flow(BinOpKind::NotEqual, buf)?,
start..self.lexer.span().end,
)),
Token::And => Ok(Expr::new(
self.op_flow(BinOpKind::And, buf)?,
start..self.lexer.span().end,
)),
Token::Or => Ok(Expr::new(
self.op_flow(BinOpKind::Or, buf)?,
start..self.lexer.span().end,
)),
Token::LessThan => Ok(Expr::new(
self.op_flow(BinOpKind::Less, buf)?,
start..self.lexer.span().end,
)),
Token::GreaterThan => Ok(Expr::new(
self.op_flow(BinOpKind::Greater, buf)?,
Token::Plus
| Token::Minus
| Token::Star
| Token::FwdSlash
| Token::EqualEqual
| Token::NotEqual
| Token::LessThan
| Token::GreaterThan => Ok(Expr::new(
self.op_flow(
match BinOpKind::from_token(token) {
Ok(op) => op,
Err(e) => return Err(Error::new(e, self.lexer.span())),
},
buf,
)?,
start..self.lexer.span().end,
)),
@ -218,7 +195,7 @@ impl<'source> Parser<'source> {
self.require(Token::LeftParen)?;
let cond = self.expr_flow(Token::RightParen)?;
let body = self.parse_block()?;
Ok(StmtKind::If { cond, body })