diff options
| author | Laurenz <laurmaedje@gmail.com> | 2021-06-09 14:05:57 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2021-06-09 22:44:40 +0200 |
| commit | bce553a991f19b2b5bb9efef6b74bd12e15a10c6 (patch) | |
| tree | fa8ed4b3974927b30e6cffd0d71d4c3e980698de /src/parse | |
| parent | 29cfef0a6dfef5820bda339d327638e285aaf4d3 (diff) | |
Tidy up
Diffstat (limited to 'src/parse')
| -rw-r--r-- | src/parse/mod.rs | 6 | ||||
| -rw-r--r-- | src/parse/tokens.rs | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/parse/mod.rs b/src/parse/mod.rs index 1f14f36f..5ab5b2d8 100644 --- a/src/parse/mod.rs +++ b/src/parse/mod.rs @@ -314,11 +314,6 @@ fn primary(p: &mut Parser, atomic: bool) -> Option<Expr> { Some(Token::For) => expr_for(p), Some(Token::Import) => expr_import(p), Some(Token::Include) => expr_include(p), - Some(Token::Auto) => { - let start = p.next_start(); - p.assert(Token::Auto); - Some(Expr::Auto(p.span(start))) - } // Nothing. _ => { @@ -334,6 +329,7 @@ fn literal(p: &mut Parser) -> Option<Expr> { let expr = match p.peek()? { // Basic values. Token::None => Expr::None(span), + Token::Auto => Expr::Auto(span), Token::Bool(b) => Expr::Bool(span, b), Token::Int(i) => Expr::Int(span, i), Token::Float(f) => Expr::Float(span, f), diff --git a/src/parse/tokens.rs b/src/parse/tokens.rs index f82d0ae4..f3ca25d9 100644 --- a/src/parse/tokens.rs +++ b/src/parse/tokens.rs @@ -350,6 +350,7 @@ impl<'s> Tokens<'s> { "and" => Token::And, "or" => Token::Or, "none" => Token::None, + "auto" => Token::Auto, "true" => Token::Bool(true), "false" => Token::Bool(false), id => keyword(id).unwrap_or(Token::Ident(id)), @@ -474,7 +475,6 @@ fn keyword(id: &str) -> Option<Token<'static>> { "for" => Token::For, "in" => Token::In, "while" => Token::While, - "auto" => Token::Auto, "break" => Token::Break, "continue" => Token::Continue, "return" => Token::Return, @@ -759,12 +759,6 @@ mod tests { ("for", For), ("in", In), ("import", Import), - ("while", While), - ("break", Break), - ("continue", Continue), - ("using", Using), - ("auto", Auto), - ("return", Return), ]; for &(s, t) in &list { |