Small improvements ♻

2 files changed, 25 insertions, 20 deletions

diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 00512c3f..9fe8e62e 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -380,42 +380,50 @@ fn stmt_let(p: &mut Parser) -> Option<Expr> {
     p.start_group(Group::Stmt, TokenMode::Code);
     p.eat_assert(Token::Let);
 
-    let pat = p.span_if(ident);
-    let mut rhs = None;
-
-    if pat.is_some() {
-        if p.eat_if(Token::Eq) {
-            rhs = p.span_if(expr);
+    let pat = match p.span_if(ident) {
+        Some(pat) => pat,
+        None => {
+            p.expected("identifier");
+            p.end_group();
+            return None;
         }
+    };
 
-        if !p.eof() {
-            p.expected_at("semicolon or line break", p.last_end());
-        }
-    } else {
-        p.expected("identifier");
+    let rhs = if p.eat_if(Token::Eq) { p.span_if(expr) } else { None };
+
+    if !p.eof() {
+        p.expected_at("semicolon or line break", p.last_end());
     }
 
     p.end_group();
 
-    Some(Expr::Let(ExprLet { pat: pat?, expr: rhs.map(Box::new) }))
+    Some(Expr::Let(ExprLet { pat, expr: rhs.map(Box::new) }))
 }
 
 /// Parse an if expresion.
 fn expr_if(p: &mut Parser) -> Option<Expr> {
     p.start_group(Group::Expr, TokenMode::Code);
     p.eat_assert(Token::If);
-    let condition = p.span_if(expr);
+
+    let condition = match p.span_if(expr) {
+        Some(condition) => Box::new(condition),
+        None => {
+            p.end_group();
+            return None;
+        }
+    };
+
     p.end_group();
 
-    let condition = Box::new(condition?);
     let if_body = Box::new(control_body(p)?);
-    let end = p.last_end();
+
+    let start = p.last_end();
     p.skip_white();
 
     let else_body = if p.eat_if(Token::Else) {
         control_body(p).map(Box::new)
     } else {
-        p.jump(end);
+        p.jump(start);
         None
     };
 
diff --git a/src/parse/tokens.rs b/src/parse/tokens.rs
index 312e941b..f5e5baaf 100644
--- a/src/parse/tokens.rs
+++ b/src/parse/tokens.rs
@@ -127,7 +127,6 @@ impl<'s> Iterator for Tokens<'s> {
                 '=' => Token::Eq,
                 '<' => Token::Lt,
                 '>' => Token::Gt,
-                '?' => Token::Question,
 
                 // Identifiers.
                 c if is_id_start(c) => self.ident(start),
@@ -206,7 +205,6 @@ impl<'s> Tokens<'s> {
                 "#if" => Token::If,
                 "#else" => Token::Else,
                 "#for" => Token::For,
-                "#in" => Token::In,
                 "#while" => Token::While,
                 "#break" => Token::Break,
                 "#continue" => Token::Continue,
@@ -612,7 +610,6 @@ mod tests {
         t!(Code: "-="       => HyphEq);
         t!(Code: "*="       => StarEq);
         t!(Code: "/="       => SlashEq);
-        t!(Code: "?"        => Question);
         t!(Code: ".."       => Dots);
         t!(Code: "=>"       => Arrow);
 
@@ -636,7 +633,6 @@ mod tests {
             ("if", If),
             ("else", Else),
             ("for", For),
-            ("in", In),
             ("while", While),
             ("break", Break),
             ("continue", Continue),
@@ -654,6 +650,7 @@ mod tests {
             ("not", Not),
             ("and", And),
             ("or", Or),
+            ("in", In),
             ("none", Token::None),
             ("false", Bool(false)),
             ("true", Bool(true)),