Skip to content

Fix alternation order of lexical rules #2126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
traviscross merged 5 commits into from
Dec 22, 2025
+47 −47
Merged

Fix alternation order of lexical rules #2126

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bd0d5d
Fix PUNCTUATION alternation order
ehuss Dec 20, 2025
babb1ef
Fix LIFETIME_TOKEN alternation order
ehuss Dec 20, 2025
4c93673
Fix FLOAT_LITERAL alternation order
ehuss Dec 20, 2025
f10d6b1
Fix INTEGER_LITERAL alternation order
ehuss Dec 20, 2025
782cf07
Fix order of Token wrt integer and float
ehuss Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 47 additions & 47 deletions src/tokens.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Token ->
| RAW_BYTE_STRING_LITERAL
| C_STRING_LITERAL
| RAW_C_STRING_LITERAL
| INTEGER_LITERAL
| FLOAT_LITERAL
| INTEGER_LITERAL
| LIFETIME_TOKEN
| PUNCTUATION
| IDENTIFIER_OR_KEYWORD
Expand Down Expand Up @@ -441,7 +441,7 @@ r[lex.token.literal.int]
r[lex.token.literal.int.syntax]
```grammar,lexer
INTEGER_LITERAL ->
( DEC_LITERAL | BIN_LITERAL | OCT_LITERAL | HEX_LITERAL ) SUFFIX_NO_E?
( BIN_LITERAL | OCT_LITERAL | HEX_LITERAL | DEC_LITERAL ) SUFFIX_NO_E?

DEC_LITERAL -> DEC_DIGIT (DEC_DIGIT|`_`)*

Expand Down Expand Up @@ -556,9 +556,9 @@ r[lex.token.literal.float]
r[lex.token.literal.float.syntax]
```grammar,lexer
FLOAT_LITERAL ->
DEC_LITERAL `.` _not immediately followed by `.`, `_` or an XID_Start character_
DEC_LITERAL (`.` DEC_LITERAL)? FLOAT_EXPONENT SUFFIX?
| DEC_LITERAL `.` DEC_LITERAL SUFFIX_NO_E?
| DEC_LITERAL (`.` DEC_LITERAL)? FLOAT_EXPONENT SUFFIX?
| DEC_LITERAL `.` _not immediately followed by `.`, `_` or an XID_Start character_

FLOAT_EXPONENT ->
(`e`|`E`) (`+`|`-`)? (DEC_DIGIT|`_`)* DEC_DIGIT (DEC_DIGIT|`_`)*
Expand Down Expand Up @@ -655,12 +655,12 @@ r[lex.token.life]
r[lex.token.life.syntax]
```grammar,lexer
LIFETIME_TOKEN ->
`'` IDENTIFIER_OR_KEYWORD _not immediately followed by `'`_
| RAW_LIFETIME
RAW_LIFETIME
| `'` IDENTIFIER_OR_KEYWORD _not immediately followed by `'`_

LIFETIME_OR_LABEL ->
`'` NON_KEYWORD_IDENTIFIER _not immediately followed by `'`_
| RAW_LIFETIME
RAW_LIFETIME
| `'` NON_KEYWORD_IDENTIFIER _not immediately followed by `'`_

RAW_LIFETIME ->
`'r#` IDENTIFIER_OR_KEYWORD _not immediately followed by `'`_
Expand Down Expand Up @@ -693,58 +693,58 @@ Punctuation tokens are used as operators, separators, and other parts of the gra
r[lex.token.punct.syntax]
```grammar,lexer
PUNCTUATION ->
`=`
| `<`
| `<=`
| `==`
`...`
| `..=`
| `<<=`
| `>>=`
| `!=`
| `>=`
| `>`
| `%=`
| `&&`
| `||`
| `!`
| `~`
| `+`
| `-`
| `*`
| `/`
| `%`
| `^`
| `&`
| `|`
| `<<`
| `>>`
| `&=`
| `*=`
| `+=`
| `-=`
| `*=`
| `/=`
| `%=`
| `^=`
| `&=`
| `|=`
| `<<=`
| `>>=`
| `@`
| `.`
| `->`
| `..`
| `...`
| `..=`
| `,`
| `;`
| `:`
| `/=`
| `::`
| `->`
| `<-`
| `<<`
| `<=`
| `==`
| `=>`
| `>=`
| `>>`
| `>`
| `^=`
| `|=`
| `||`
| `!`
| `#`
| `$`
| `%`
| `&`
| `(`
| `)`
| `*`
| `+`
| `,`
| `-`
| `.`
| `/`
| `:`
| `;`
| `<`
| `=`
| `?`
| `{`
| `}`
| `@`
| `[`
| `]`
| `(`
| `)`
| `^`
| `{`
| `|`
| `}`
| `~`
```

> [!NOTE]
Expand Down