Skip to content

Commit c70320b

Browse files
CyberShadowGeod24
authored andcommitted
spec/lex.dd: Describe TokenString within the grammar
Use the same approach as NestingBlockComment. NB: Tokens and Token are not used anywhere in the grammar any more, and are therefore only illustrative.
1 parent 3f09ed6 commit c70320b

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

spec/lex.dd

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,11 @@ $(GNAME Tokens):
186186
$(GLINK Token) $(GSELF Tokens)
187187

188188
$(GNAME Token):
189+
$(D {)
190+
$(D })
191+
$(GLINK TokenNoBraces)
192+
193+
$(GNAME TokenNoBraces):
189194
$(MULTICOLS 4, $(GLINK Identifier)
190195
$(GLINK StringLiteral)
191196
$(GLINK CharacterLiteral)
@@ -225,8 +230,6 @@ $(MULTICOLS 4, $(GLINK Identifier)
225230
$(D $(RPAREN))
226231
$(D [)
227232
$(D ])
228-
$(D {)
229-
$(D })
230233
$(D ?)
231234
$(D ,)
232235
$(D ;)
@@ -362,7 +365,15 @@ $(GNAME DelimitedString):
362365
)
363366
$(GRAMMAR
364367
$(GNAME TokenString):
365-
$(D q{) $(GLINK Tokens)$(OPT) $(D })
368+
$(D q{) $(GLINK TokenStringTokens)$(OPT) $(D })
369+
370+
$(GNAME TokenStringTokens):
371+
$(GLINK TokenStringToken)
372+
$(GLINK TokenStringToken) $(GSELF TokenStringTokens)
373+
374+
$(GNAME TokenStringToken):
375+
$(GLINK TokenNoBraces)
376+
$(D {) $(GLINK TokenStringTokens)$(OPT) $(D })
366377
)
367378

368379
$(P

0 commit comments

Comments
 (0)