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

remove more unwraps

Browse Source
This commit is contained in:
ConnorSkees 2020-05-23 14:07:57 -04:00
parent 34f9436163
commit ff2962b124
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/value/parse.rs
View File

@ -866,7 +866,7 @@ impl Value {
} }
'!' => { '!' => {
let mut span = toks.next().unwrap().pos(); let mut span = toks.next().unwrap().pos();
if toks.peek().is_some() && toks.peek().unwrap().kind == '=' { if let Some(Token { kind: '=', .. }) = toks.peek() {
span = span.merge(toks.next().unwrap().pos()); span = span.merge(toks.next().unwrap().pos());
return Some(Ok(IntermediateValue::Op(Op::NotEqual).span(span))); return Some(Ok(IntermediateValue::Op(Op::NotEqual).span(span)));
} }
@ -884,22 +884,22 @@ impl Value {
} }
'/' => { '/' => {
let span = toks.next().unwrap().pos(); let span = toks.next().unwrap().pos();
if toks.peek().is_none() { match toks.peek() {
return Some(Err(("Expected expression.", span).into())); Some(Token { kind: '/', .. }) => {
read_until_newline(toks);
devour_whitespace(toks);
IntermediateValue::Whitespace.span(span)
} }
if '*' == toks.peek().unwrap().kind { Some(Token { kind: '*', .. }) => {
toks.next(); toks.next();
match eat_comment(toks, &Scope::new(), &Selector::new()) { match eat_comment(toks, &Scope::new(), &Selector::new()) {
Ok(..) => {} Ok(..) => {}
Err(e) => return Some(Err(e)), Err(e) => return Some(Err(e)),
} }
IntermediateValue::Whitespace.span(span) IntermediateValue::Whitespace.span(span)
} else if '/' == toks.peek().unwrap().kind { }
read_until_newline(toks); Some(..) => IntermediateValue::Op(Op::Div).span(span),
devour_whitespace(toks); None => return Some(Err(("Expected expression.", span).into()))
IntermediateValue::Whitespace.span(span)
} else {
IntermediateValue::Op(Op::Div).span(span)
} }
} }
';' | '}' | '{' => return None, ';' | '}' | '{' => return None,