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

properly bubble up parsing errors

Browse Source
This commit is contained in:
ConnorSkees 2020-03-20 23:34:23 -04:00
parent 1a481000b6
commit a64dcaf394
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils.rs
View File

@ -136,7 +136,7 @@ pub(crate) fn eat_variable_value<I: Iterator<Item = Token>>(
}
}
devour_whitespace(toks);
let val = Value::from_tokens(&mut raw.into_iter().peekable(), scope, super_selector).unwrap();
let val = Value::from_tokens(&mut raw.into_iter().peekable(), scope, super_selector)?;
Ok(VariableDecl::new(val, default, global))
}

16
src/value/parse.rs
View File

@ -88,10 +88,7 @@ impl Value {
TokenKind::Symbol(Symbol::Comma) => {
toks.next();
devour_whitespace_or_comment(toks);
let right = match Self::from_tokens(toks, scope, super_selector) {
Ok(x) => x,
Err(_) => return Ok(left),
};
let right = Self::from_tokens(toks, scope, super_selector)?;
if let Value::List(v, ListSeparator::Comma) = right {
let mut v2 = vec![left];
v2.extend(v);
@ -117,18 +114,12 @@ impl Value {
};
toks.next();
devour_whitespace_or_comment(toks);
let right = match Self::from_tokens(toks, scope, super_selector) {
Ok(x) => x,
Err(_) => return Ok(left),
};
let right = Self::from_tokens(toks, scope, super_selector)?;
Ok(Value::BinaryOp(Box::new(left), op, Box::new(right)))
}
_ => {
devour_whitespace_or_comment(toks);
let right = match Self::from_tokens(toks, scope, super_selector) {
Ok(x) => x,
Err(_) => return Ok(left),
};
let right = Self::from_tokens(toks, scope, super_selector)?;
if let Value::List(v, ListSeparator::Space) = right {
let mut v2 = vec![left];
v2.extend(v);
@ -302,6 +293,7 @@ impl Value {
TokenKind::Keyword(Keyword::Through(s)) => Ok(Value::Ident(s, QuoteKind::None)),
TokenKind::Keyword(Keyword::To(s)) => Ok(Value::Ident(s, QuoteKind::None)),
TokenKind::Unknown(c) => Ok(Value::Ident(c.to_string(), QuoteKind::None)),
TokenKind::AtRule(_) => return Err("expected \";\".".into()),
v => {
dbg!(v);
panic!("Unexpected token in value parsing")