Dedupe PATH_FIRST in ATOM_EXPR_FIRST

This commit is contained in:
DJMcNab 2019-01-24 21:31:43 +00:00
parent 4899e7be76
commit f0e5a314b0

View File

@ -1,4 +1,5 @@
use super::*;
use crate::grammar::paths::PATH_FIRST;
// test expr_literals
// fn foo() {
@ -36,11 +37,10 @@ pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> {
}
// E.g. for after the break in `if break {}`, this should not match
pub(super) const ATOM_EXPR_FIRST: TokenSet = LITERAL_FIRST.union(token_set![
pub(super) const ATOM_EXPR_FIRST: TokenSet = LITERAL_FIRST.union(PATH_FIRST).union(token_set![
L_PAREN,
L_CURLY,
L_BRACK,
L_ANGLE, // Universal function call syntax
PIPE,
MOVE_KW,
IF_KW,
@ -48,11 +48,6 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = LITERAL_FIRST.union(token_set![
MATCH_KW,
UNSAFE_KW,
RETURN_KW,
IDENT,
SELF_KW,
SUPER_KW,
CRATE_KW,
COLONCOLON,
BREAK_KW,
CONTINUE_KW,
LIFETIME,