shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle more binary ops

Browse Source
This commit is contained in:
ConnorSkees 2020-01-25 10:54:25 -05:00
parent 7fe9da3d2c
commit bd73b1ba3e
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/value.rs
View File

@ -88,6 +88,7 @@ pub(crate) enum Value {
Dimension(Dimension, Unit), Dimension(Dimension, Unit),
List(Vec<Value>, ListSeparator), List(Vec<Value>, ListSeparator),
Color(Color), Color(Color),
BinaryOp(Box<Value>, Op, Box<Value>),
Paren(Box<Value>), Paren(Box<Value>),
Ident(String, QuoteKind), Ident(String, QuoteKind),
} }
@ -107,6 +108,7 @@ impl Add for Value {
}, },
Self::List(..) => todo!(), Self::List(..) => todo!(),
Self::Color(..) => todo!(), Self::Color(..) => todo!(),
Self::BinaryOp(..) => todo!(),
Self::Paren(..) => todo!(), Self::Paren(..) => todo!(),
Self::Ident(..) => todo!(), Self::Ident(..) => todo!(),
} }
@ -127,6 +129,7 @@ impl Display for Value {
.join(sep.as_str()) .join(sep.as_str())
), ),
Self::Color(c) => write!(f, "{}", c), Self::Color(c) => write!(f, "{}", c),
Self::BinaryOp(lhs, op, rhs) => write!(f, "{}{}{}", lhs, op, rhs),
Self::Paren(val) => write!(f, "{}", val), Self::Paren(val) => write!(f, "{}", val),
Self::Ident(val, kind) => write!(f, "{}{}{}", kind.as_str(), val, kind.as_str()), Self::Ident(val, kind) => write!(f, "{}{}{}", kind.as_str(), val, kind.as_str()),
Self::True => write!(f, "true"), Self::True => write!(f, "true"),
@ -166,14 +169,26 @@ impl Value {
Some(Value::List(vec![left, right], ListSeparator::Comma)) Some(Value::List(vec![left, right], ListSeparator::Comma))
} }
TokenKind::Symbol(Symbol::CloseParen) => Some(left), TokenKind::Symbol(Symbol::CloseParen) => Some(left),
TokenKind::Symbol(Symbol::Plus) => { TokenKind::Symbol(Symbol::Plus)
| TokenKind::Symbol(Symbol::Minus)
| TokenKind::Symbol(Symbol::Mul)
| TokenKind::Symbol(Symbol::Div)
| TokenKind::Symbol(Symbol::Percent) => {
let op = match next.kind {
TokenKind::Symbol(Symbol::Plus) => Op::Plus,
TokenKind::Symbol(Symbol::Minus) => Op::Minus,
TokenKind::Symbol(Symbol::Mul) => Op::Mul,
TokenKind::Symbol(Symbol::Div) => Op::Div,
TokenKind::Symbol(Symbol::Percent) => Op::Rem,
_ => unsafe { std::hint::unreachable_unchecked() }
};
toks.next(); toks.next();
devour_whitespace_or_comment(toks); devour_whitespace_or_comment(toks);
let right = match Self::from_tokens(toks, scope) { let right = match Self::from_tokens(toks, scope) {
Some(x) => x, Some(x) => x,
None => return Some(left), None => return Some(left),
}; };
Some(left + right) Some(Value::BinaryOp(Box::new(left), op, Box::new(right)))
} }
_ if whitespace => { _ if whitespace => {
devour_whitespace_or_comment(toks); devour_whitespace_or_comment(toks);