From 1feb8e89d5768d45c8c9841e52e7456e4070081b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 18 Sep 2021 00:58:35 +0300 Subject: [PATCH] minor: cleanup const parsing --- crates/parser/src/grammar/items/consts.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/parser/src/grammar/items/consts.rs b/crates/parser/src/grammar/items/consts.rs index 1b317dd84a..52379411e4 100644 --- a/crates/parser/src/grammar/items/consts.rs +++ b/crates/parser/src/grammar/items/consts.rs @@ -1,20 +1,20 @@ use super::*; -pub(super) fn static_(p: &mut Parser, m: Marker) { - const_or_static(p, m, T![static], STATIC) -} - pub(super) fn konst(p: &mut Parser, m: Marker) { - const_or_static(p, m, T![const], CONST) + p.bump(T![const]); + const_or_static(p, m, true) } -fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) { - assert!(p.at(kw)); - p.bump(kw); +pub(super) fn static_(p: &mut Parser, m: Marker) { + p.bump(T![static]); + const_or_static(p, m, false) +} + +fn const_or_static(p: &mut Parser, m: Marker, is_const: bool) { p.eat(T![mut]); // Allow `_` in place of an identifier in a `const`. - let is_const_underscore = kw == T![const] && p.eat(T![_]); + let is_const_underscore = is_const && p.eat(T![_]); if !is_const_underscore { name(p); } @@ -30,5 +30,5 @@ fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) { expressions::expr(p); } p.expect(T![;]); - m.complete(p, def); + m.complete(p, if is_const { CONST } else { STATIC }); }