fix: allow reserved keywords in namespaces

src/parser/internal/arrays.rs

@@ -138,9 +138,10 @@ fn array_pair(state: &mut State) -> ParseResult<ArrayItem> {
  let mut current = state.stream.current();
  let ellipsis = if current.kind == TokenKind::Ellipsis {
  state.stream.next();
+ let span = current.span;
  current = state.stream.current();
 
- Some(current.span)
+ Some(span)
  } else {
  None
  };

src/parser/internal/identifiers.rs

@@ -213,19 +213,25 @@ pub fn name(state: &mut State) -> ParseResult<SimpleIdentifier> {
 pub fn optional_name(state: &mut State) -> Option<SimpleIdentifier> {
  let current = state.stream.current();
 
- let ident = match &current.kind {
- TokenKind::Identifier | TokenKind::QualifiedIdentifier => Some(SimpleIdentifier {
- span: current.span,
- value: current.value.clone(),
- }),
- _ => None,
- };
+ match &current.kind {
+ TokenKind::Identifier | TokenKind::QualifiedIdentifier => {
+ state.stream.next();
 
- if ident.is_some() {
- state.stream.next();
- }
+ Some(SimpleIdentifier {
+ span: current.span,
+ value: current.value.clone(),
+ })
+ }
+ t if is_reserved_identifier(t) => {
+ state.stream.next();
 
- ident
+ Some(SimpleIdentifier {
+ span: current.span,
+ value: current.value.clone(),
+ })
+ }
+ _ => None,
+ }
 }
 
 /// Expect an unqualified, qualified or fully qualified identifier such as Foo, Foo\Bar or \Foo\Bar.

tests/fixtures/0101/ast.txt

@@ -18,8 +18,8 @@
  SpreadValue {
  ellipsis: Span {
  line: 1,
- column: 11,
- position: 10,
+ column: 8,
+ position: 7,
  },
  value: ShortArray {
  start: Span {

tests/fixtures/0102/ast.txt

@@ -18,8 +18,8 @@
  SpreadValue {
  ellipsis: Span {
  line: 1,
- column: 11,
- position: 10,
+ column: 8,
+ position: 7,
  },
  value: ShortArray {
  start: Span {
@@ -56,8 +56,8 @@
  SpreadValue {
  ellipsis: Span {
  line: 1,
- column: 19,
- position: 18,
+ column: 16,
+ position: 15,
  },
  value: ShortArray {
  start: Span {