Merge pull request #404 from ehuss/lifetime-raw

Havvy · web-flow · commit c04a1d93e411 · 2018-08-21T19:13:29.000-07:00
Fix lifetimes with raw identifiers.
diff --git a/src/identifiers.md b/src/identifiers.md
@@ -7,8 +7,10 @@
 >
 > RAW_IDENTIFIER : `r#` IDENTIFIER_OR_KEYWORD <sub>*Except `crate`, `extern`, `self`, `super`, `Self`*</sub>
 >
+> NON_KEYWORD_IDENTIFIER : IDENTIFIER_OR_KEYWORD <sub>*Except a [strict] or [reserved] keyword*</sub>
+>
 > IDENTIFIER :\
-> IDENTIFIER_OR_KEYWORD <sub>*Except a [strict] or [reserved] keyword*</sub> | RAW_IDENTIFIER
+> NON_KEYWORD_IDENTIFIER | RAW_IDENTIFIER
 
 An identifier is any nonempty ASCII string of the following form:
 
diff --git a/src/tokens.md b/src/tokens.md
@@ -502,7 +502,7 @@ The two values of the boolean type are written `true` and `false`.
 > &nbsp;&nbsp; | `'_`
 >
 > LIFETIME_OR_LABEL :\
-> &nbsp;&nbsp; &nbsp;&nbsp; `'` [IDENTIFIER][identifier]
+> &nbsp;&nbsp; &nbsp;&nbsp; `'` [NON_KEYWORD_IDENTIFIER][identifier]
 
 Lifetime parameters and [loop labels] use LIFETIME_OR_LABEL tokens. Any
 LIFETIME_TOKEN will be accepted by the lexer, and for example, can be used in

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,10 @@`
`7`	`7`	`>`
`8`	`8`	> RAW_IDENTIFIER : `r#` IDENTIFIER_OR_KEYWORD <sub>Except `crate`, `extern`, `self`, `super`, `Self`</sub>
`9`	`9`	`>`
	`10`	`+> NON_KEYWORD_IDENTIFIER : IDENTIFIER_OR_KEYWORD <sub>Except a [strict] or [reserved] keyword</sub>`
	`11`	`+>`
`10`	`12`	`> IDENTIFIER :\`
`11`		`-> IDENTIFIER_OR_KEYWORD <sub>Except a [strict] or [reserved] keyword</sub> \| RAW_IDENTIFIER`
	`13`	`+> NON_KEYWORD_IDENTIFIER \| RAW_IDENTIFIER`
`12`	`14`
`13`	`15`	`An identifier is any nonempty ASCII string of the following form:`
`14`	`16`
Original file line number	Diff line number	Diff line change
@@ -502,7 +502,7 @@ The two values of the boolean type are written `true` and `false`.
`502`	`502`	>    \| `'_`
`503`	`503`	`>`
`504`	`504`	`> LIFETIME_OR_LABEL :\`
`505`		->       `'` [IDENTIFIER][identifier]
	`505`	+>       `'` [NON_KEYWORD_IDENTIFIER][identifier]
`506`	`506`
`507`	`507`	`Lifetime parameters and [loop labels] use LIFETIME_OR_LABEL tokens. Any`
`508`	`508`	`LIFETIME_TOKEN will be accepted by the lexer, and for example, can be used in`