Parsing/Shunting-yard algorithm: Difference between revisions

Content deleted Content added

Inline

@@ Line 4,384: / Line 4,384: @@
             return None;
         }
-        self.get(self.len() - 1).map(|value| value.clone())
+        self.last().cloned()
     }
 }
 fn lex_token(input: char) -> Result<Token, char> {
-    match input {
+    let ret = match input {
-        '0'...'9' => Ok(Token::Digit(input.to_digit(10).unwrap() as Number)),
+        '0'...'9' => Token::Digit(input.to_digit(10).unwrap() as Number),
-        '+' => Ok(Operator::new_token('+', 1, true, |x, y| x + y)),
+        '+' => Operator::new_token('+', 1, true, |x, y| x + y),
-        '-' => Ok(Operator::new_token('-', 1, true, |x, y| x - y)),
+        '-' => Operator::new_token('-', 1, true, |x, y| x - y),
-        '*' => Ok(Operator::new_token('*', 2, true, |x, y| x * y)),
+        '*' => Operator::new_token('*', 2, true, |x, y| x * y),
-        '/' => Ok(Operator::new_token('/', 2, true, |x, y| x / y)),
+        '/' => Operator::new_token('/', 2, true, |x, y| x / y),
-        '^' => Ok(Operator::new_token('^', 3, false, |x, y| x.powf(y))),
+        '^' => Operator::new_token('^', 3, false, |x, y| x.powf(y)),
-        '(' => Ok(Token::LeftParen),
+        '(' => Token::LeftParen,
-        ')' => Ok(Token::RightParen),
+        ')' => Token::RightParen,
-        _ => Err(input),
+        _ => return Err(input),
-    }
+    };
+    Ok(ret)
 }