minor: cleanup const parsing
This commit is contained in:
parent
46326b8db7
commit
1feb8e89d5
@ -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 });
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user