Skip to content

Commit b1bfc70

Browse files
dlang-botdlang-bot
authored
Merge pull request #2505 from MartinNowak/link_identifier_lex
link identifiers in grammar sections to lex#Identifier merged-on-behalf-of: Petar Kirov <ZombineDev@users.noreply.github.com>
2 parents adafffa + 2729039 commit b1bfc70

14 files changed

+84
-84
lines changed

‎spec/attribute.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,8 @@ $(H2 $(LNAME2 uda, User-Defined Attributes))
682682
$(GRAMMAR
683683
$(GNAME UserDefinedAttribute):
684684
$(D @ $(LPAREN)) $(GLINK2 expression, ArgumentList) $(D $(RPAREN))
685-
$(D @) $(I Identifier)
686-
$(D @) $(I Identifier) $(D $(LPAREN)) $(GLINK2 expression, ArgumentList)$(OPT) $(D $(RPAREN))
685+
$(D @) $(GLINK_LEX Identifier)
686+
$(D @) $(GLINK_LEX Identifier) $(D $(LPAREN)) $(GLINK2 expression, ArgumentList)$(OPT) $(D $(RPAREN))
687687
$(D @) $(GLINK2 template, TemplateInstance)
688688
$(D @) $(GLINK2 template, TemplateInstance) $(D $(LPAREN)) $(GLINK2 expression, ArgumentList)$(OPT) $(D $(RPAREN))
689689
)

‎spec/class.dd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ $(HEADERNAV_TOC)
2727

2828
$(GRAMMAR
2929
$(GNAME ClassDeclaration):
30-
$(D class) $(I Identifier) $(D ;)
31-
$(D class) $(I Identifier) $(GLINK BaseClassList)$(OPT) $(GLINK2 struct, AggregateBody)
30+
$(D class) $(GLINK_LEX Identifier) $(D ;)
31+
$(D class) $(GLINK_LEX Identifier) $(GLINK BaseClassList)$(OPT) $(GLINK2 struct, AggregateBody)
3232
$(GLINK2 template, ClassTemplateDeclaration)
3333

3434
$(GNAME BaseClassList):
@@ -1099,7 +1099,7 @@ $(H2 $(LEGACY_LNAME2 AliasThis, alias-this, Alias This))
10991099

11001100
$(GRAMMAR
11011101
$(GNAME AliasThis):
1102-
$(D alias) $(I Identifier) $(D this ;)
1102+
$(D alias) $(GLINK_LEX Identifier) $(D this ;)
11031103
)
11041104

11051105
$(P An $(I AliasThis) declaration names a member to subtype.
@@ -1448,8 +1448,8 @@ $(GNAME ClassArguments):
14481448
which is equivalent to:
14491449

14501450
$(GRAMMAR
1451-
$(D class) $(I Identifier) $(D :) $(I SuperClass) $(I Interfaces) $(I AggregateBody)
1452-
$(D new) $(D $(LPAREN))$(I ArgumentList)$(D $(RPAREN)) $(I Identifier) $(D $(LPAREN))$(I ArgumentList)$(D $(RPAREN));
1451+
$(D class) $(GLINK_LEX Identifier) $(D :) $(I SuperClass) $(I Interfaces) $(I AggregateBody)
1452+
$(D new) $(D $(LPAREN))$(I ArgumentList)$(D $(RPAREN)) $(GLINK_LEX Identifier) $(D $(LPAREN))$(I ArgumentList)$(D $(RPAREN));
14531453
)
14541454

14551455
where $(I Identifier) is the name generated for the anonymous nested class.

‎spec/declaration.dd

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,31 +41,31 @@ $(GNAME DeclaratorIdentifier):
4141
$(GLINK AltDeclaratorIdentifier)
4242

4343
$(GNAME VarDeclaratorIdentifier):
44-
$(I Identifier)
45-
$(I Identifier) $(GLINK2 template, TemplateParameters)$(OPT) $(D =) $(GLINK Initializer)
44+
$(GLINK_LEX Identifier)
45+
$(GLINK_LEX Identifier) $(GLINK2 template, TemplateParameters)$(OPT) $(D =) $(GLINK Initializer)
4646

4747
$(GNAME AltDeclaratorIdentifier):
48-
$(GLINK BasicType2) $(I Identifier) $(GLINK AltDeclaratorSuffixes)$(OPT)
49-
$(GLINK BasicType2) $(I Identifier) $(GLINK AltDeclaratorSuffixes)$(OPT) $(D =) $(GLINK Initializer)
50-
$(GLINK BasicType2)$(OPT) $(I Identifier) $(GLINK AltDeclaratorSuffixes)
51-
$(GLINK BasicType2)$(OPT) $(I Identifier) $(GLINK AltDeclaratorSuffixes) $(D =) $(GLINK Initializer)
48+
$(GLINK BasicType2) $(GLINK_LEX Identifier) $(GLINK AltDeclaratorSuffixes)$(OPT)
49+
$(GLINK BasicType2) $(GLINK_LEX Identifier) $(GLINK AltDeclaratorSuffixes)$(OPT) $(D =) $(GLINK Initializer)
50+
$(GLINK BasicType2)$(OPT) $(GLINK_LEX Identifier) $(GLINK AltDeclaratorSuffixes)
51+
$(GLINK BasicType2)$(OPT) $(GLINK_LEX Identifier) $(GLINK AltDeclaratorSuffixes) $(D =) $(GLINK Initializer)
5252

5353
$(GNAME Declarator):
5454
$(GLINK VarDeclarator)
5555
$(GLINK AltDeclarator)
5656

5757
$(GNAME VarDeclarator):
58-
$(GLINK BasicType2)$(OPT) $(I Identifier)
58+
$(GLINK BasicType2)$(OPT) $(GLINK_LEX Identifier)
5959

6060
$(GNAME AltDeclarator):
61-
$(GLINK BasicType2)$(OPT) $(I Identifier) $(GLINK AltDeclaratorSuffixes)
61+
$(GLINK BasicType2)$(OPT) $(GLINK_LEX Identifier) $(GLINK AltDeclaratorSuffixes)
6262
$(GLINK BasicType2)$(OPT) $(D $(LPAREN)) $(I AltDeclaratorX) $(D $(RPAREN))
6363
$(GLINK BasicType2)$(OPT) $(D $(LPAREN)) $(I AltDeclaratorX) $(D $(RPAREN)) $(GLINK AltFuncDeclaratorSuffix)
6464
$(GLINK BasicType2)$(OPT) $(D $(LPAREN)) $(I AltDeclaratorX) $(D $(RPAREN)) $(GLINK AltDeclaratorSuffixes)
6565

6666
$(GNAME AltDeclaratorX):
67-
$(GLINK BasicType2)$(OPT) $(I Identifier)
68-
$(GLINK BasicType2)$(OPT) $(I Identifier) $(GLINK AltFuncDeclaratorSuffix)
67+
$(GLINK BasicType2)$(OPT) $(GLINK_LEX Identifier)
68+
$(GLINK BasicType2)$(OPT) $(GLINK_LEX Identifier) $(GLINK AltFuncDeclaratorSuffix)
6969
$(GLINK AltDeclarator)
7070

7171
$(GNAME AltDeclaratorSuffixes):
@@ -144,11 +144,11 @@ $(GNAME BasicType2X):
144144
$(D function) $(GLINK2 function, Parameters) $(GLINK2 function, FunctionAttributes)$(OPT)
145145

146146
$(GNAME IdentifierList):
147-
$(I Identifier)
148-
$(I Identifier) $(D .) $(I IdentifierList)
147+
$(GLINK_LEX Identifier)
148+
$(GLINK_LEX Identifier) $(D .) $(I IdentifierList)
149149
$(GLINK2 template, TemplateInstance)
150150
$(GLINK2 template, TemplateInstance) $(D .) $(I IdentifierList)
151-
$(I Identifier) $(D [) $(GLINK2 expression, AssignExpression) $(D].) $(I IdentifierList)
151+
$(GLINK_LEX Identifier) $(D [) $(GLINK2 expression, AssignExpression) $(D].) $(I IdentifierList)
152152
)
153153

154154
$(GRAMMAR
@@ -215,7 +215,7 @@ $(GNAME StructMemberInitializers):
215215

216216
$(GNAME StructMemberInitializer):
217217
$(GLINK NonVoidInitializer)
218-
$(I Identifier) $(D :) $(GLINK NonVoidInitializer)
218+
$(GLINK_LEX Identifier) $(D :) $(GLINK NonVoidInitializer)
219219
)
220220

221221
$(H2 $(LNAME2 declaration_syntax, Declaration Syntax))
@@ -291,7 +291,7 @@ $(GNAME AutoDeclarationX):
291291
$(I AutoDeclarationX) $(D ,) $(GLINK AutoDeclarationY)
292292

293293
$(GNAME AutoDeclarationY):
294-
$(I Identifier) $(GLINK2 template, TemplateParameters)$(OPT) $(D =) $(GLINK Initializer)
294+
$(GLINK_LEX Identifier) $(GLINK2 template, TemplateParameters)$(OPT) $(D =) $(GLINK Initializer)
295295
)
296296

297297
$(P If a declaration starts with a $(I StorageClass) and has
@@ -338,8 +338,8 @@ $(GNAME AliasDeclarationX):
338338
$(I AliasDeclarationX) $(D ,) $(GLINK AliasDeclarationY)
339339

340340
$(GNAME AliasDeclarationY):
341-
$(I Identifier) $(GLINK2 template, TemplateParameters)$(OPT) $(D =) $(GLINK StorageClasses)$(OPT) $(GLINK Type)
342-
$(I Identifier) $(GLINK2 template, TemplateParameters)$(OPT) $(D =) $(GLINK2 expression, FunctionLiteral)
341+
$(GLINK_LEX Identifier) $(GLINK2 template, TemplateParameters)$(OPT) $(D =) $(GLINK StorageClasses)$(OPT) $(GLINK Type)
342+
$(GLINK_LEX Identifier) $(GLINK2 template, TemplateParameters)$(OPT) $(D =) $(GLINK2 expression, FunctionLiteral)
343343
)
344344

345345
$(P $(I AliasDeclaration)s create a symbol that is an alias for another type,

‎spec/enum.dd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ $(HEADERNAV_TOC)
66

77
$(GRAMMAR
88
$(GNAME EnumDeclaration):
9-
$(D enum) $(I Identifier) $(GLINK EnumBody)
10-
$(D enum) $(I Identifier) $(D :) $(GLINK EnumBaseType) $(GLINK EnumBody)
9+
$(D enum) $(GLINK_LEX Identifier) $(GLINK EnumBody)
10+
$(D enum) $(GLINK_LEX Identifier) $(D :) $(GLINK EnumBaseType) $(GLINK EnumBody)
1111
$(GLINK AnonymousEnumDeclaration)
1212

1313
$(GNAME EnumBaseType):
@@ -32,8 +32,8 @@ $(GNAME EnumMemberAttribute):
3232
$(D @)$(GLINK2 attribute, disable)
3333

3434
$(GNAME EnumMember):
35-
$(GLINK EnumMemberAttributes)$(OPT) $(I Identifier)
36-
$(GLINK EnumMemberAttributes)$(OPT) $(I Identifier) $(D =) $(ASSIGNEXPRESSION)
35+
$(GLINK EnumMemberAttributes)$(OPT) $(GLINK_LEX Identifier)
36+
$(GLINK EnumMemberAttributes)$(OPT) $(GLINK_LEX Identifier) $(D =) $(ASSIGNEXPRESSION)
3737

3838
$(GNAME AnonymousEnumDeclaration):
3939
$(D enum) $(D :) $(GLINK EnumBaseType) $(D {) $(GLINK EnumMembers) $(D })
@@ -47,7 +47,7 @@ $(GNAME AnonymousEnumMembers):
4747

4848
$(GNAME AnonymousEnumMember):
4949
$(GLINK EnumMember)
50-
$(GLINK2 declaration, Type) $(I Identifier) $(D =) $(ASSIGNEXPRESSION)
50+
$(GLINK2 declaration, Type) $(GLINK_LEX Identifier) $(D =) $(ASSIGNEXPRESSION)
5151
)
5252

5353
$(P Enum declarations are used to define a group of constants.

‎spec/function.dd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ $(GNAME FuncDeclaration):
1414
$(GLINK AutoFuncDeclaration)
1515

1616
$(GNAME AutoFuncDeclaration):
17-
$(GLINK2 declaration, StorageClasses) $(I Identifier) $(GLINK FuncDeclaratorSuffix) $(GLINK FunctionBody)
17+
$(GLINK2 declaration, StorageClasses) $(GLINK_LEX Identifier) $(GLINK FuncDeclaratorSuffix) $(GLINK FunctionBody)
1818

1919
$(GNAME FuncDeclarator):
20-
$(GLINK2 declaration, BasicType2)$(OPT) $(I Identifier) $(GLINK FuncDeclaratorSuffix)
20+
$(GLINK2 declaration, BasicType2)$(OPT) $(GLINK_LEX Identifier) $(GLINK FuncDeclaratorSuffix)
2121

2222
$(GNAME FuncDeclaratorSuffix):
2323
$(GLINK Parameters) $(GLINK MemberFunctionAttributes)$(OPT)
@@ -131,14 +131,14 @@ $(GNAME InContractExpression):
131131

132132
$(GNAME OutContractExpression):
133133
$(D out $(LPAREN) ;) $(GLINK2 expression, AssertArguments) $(D $(RPAREN))
134-
$(D out $(LPAREN)) $(I Identifier) $(D ;) $(GLINK2 expression, AssertArguments) $(D $(RPAREN))
134+
$(D out $(LPAREN)) $(GLINK_LEX Identifier) $(D ;) $(GLINK2 expression, AssertArguments) $(D $(RPAREN))
135135

136136
$(GNAME InStatement):
137137
$(D in) $(GLINK2 statement, BlockStatement)
138138

139139
$(GNAME OutStatement):
140140
$(D out) $(GLINK2 statement, BlockStatement)
141-
$(D out) $(D $(LPAREN)) $(I Identifier) $(D $(RPAREN)) $(GLINK2 statement, BlockStatement)
141+
$(D out) $(D $(LPAREN)) $(GLINK_LEX Identifier) $(D $(RPAREN)) $(GLINK2 statement, BlockStatement)
142142
)
143143

144144
$(H2 $(LNAME2 contracts, Contracts))

‎spec/iasm.dd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ $(H2 $(LNAME2 asminstruction, Asm instruction))
6262

6363
$(GRAMMAR
6464
$(GNAME AsmInstruction):
65-
$(I Identifier) $(D :) $(I AsmInstruction)
65+
$(GLINK_LEX Identifier) $(D :) $(I AsmInstruction)
6666
$(D align) $(GLINK IntegerExpression)
6767
$(D even)
6868
$(D naked)
@@ -110,7 +110,7 @@ $(H2 $(LNAME2 align, align $(I IntegerExpression)))
110110
$(GRAMMAR
111111
$(GNAME IntegerExpression):
112112
$(GLINK_LEX IntegerLiteral)
113-
$(I Identifier)
113+
$(GLINK_LEX Identifier)
114114
)
115115

116116
$(P Causes the assembler to emit NOP instructions to align the next
@@ -348,8 +348,8 @@ $(GNAME AsmPrimaryExp):
348348
$(D this)
349349

350350
$(GNAME DotIdentifier):
351-
$(I Identifier)
352-
$(I Identifier) $(D .) $(I DotIdentifier)
351+
$(GLINK_LEX Identifier)
352+
$(GLINK_LEX Identifier) $(D .) $(I DotIdentifier)
353353
)
354354

355355
$(P The operand syntax more or less follows the Intel CPU documentation

‎spec/interface.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ $(HEADERNAV_TOC)
66

77
$(GRAMMAR
88
$(GNAME InterfaceDeclaration):
9-
$(D interface) $(I Identifier) $(D ;)
10-
$(D interface) $(I Identifier) $(GLINK BaseInterfaceList)$(OPT) $(GLINK2 struct, AggregateBody)
9+
$(D interface) $(GLINK_LEX Identifier) $(D ;)
10+
$(D interface) $(GLINK_LEX Identifier) $(GLINK BaseInterfaceList)$(OPT) $(GLINK2 struct, AggregateBody)
1111
$(GLINK2 template, InterfaceTemplateDeclaration)
1212

1313
$(GNAME BaseInterfaceList):

‎spec/module.dd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ $(GNAME ModuleFullyQualifiedName):
103103
$(I Packages) $(D .) $(I ModuleName)
104104

105105
$(GNAME ModuleName):
106-
$(I Identifier)
106+
$(GLINK_LEX Identifier)
107107

108108
$(GNAME Packages):
109109
$(I PackageName)
110110
$(I Packages) $(D .) $(I PackageName)
111111

112112
$(GNAME PackageName):
113-
$(I Identifier)
113+
$(GLINK_LEX Identifier)
114114
)
115115

116116
$(P The $(I Identifier)s preceding the rightmost are the $(I Packages) that the
@@ -209,7 +209,7 @@ $(GNAME ImportBindList):
209209

210210
$(GNAME ImportBind):
211211
$(GLINK_LEX Identifier)
212-
$(GLINK_LEX Identifier) = $(I Identifier)
212+
$(GLINK_LEX Identifier) = $(GLINK_LEX Identifier)
213213

214214
$(GNAME ModuleAliasIdentifier):
215215
$(GLINK_LEX Identifier)

‎spec/pragma.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ $(HEADERNAV_TOC)
66

77
$(GRAMMAR
88
$(GNAME Pragma):
9-
$(D pragma) $(D $(LPAREN)) $(I Identifier) $(D $(RPAREN))
10-
$(D pragma) $(D $(LPAREN)) $(I Identifier) $(D ,) $(GLINK2 expression, ArgumentList) $(D $(RPAREN))
9+
$(D pragma) $(D $(LPAREN)) $(GLINK_LEX Identifier) $(D $(RPAREN))
10+
$(D pragma) $(D $(LPAREN)) $(GLINK_LEX Identifier) $(D ,) $(GLINK2 expression, ArgumentList) $(D $(RPAREN))
1111
)
1212

1313

‎spec/statement.dd

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ $(P Statements can be labeled. A label is an identifier that
141141

142142
$(GRAMMAR
143143
$(GNAME LabeledStatement):
144-
$(I Identifier) $(D :)
145-
$(I Identifier) $(D :) $(PSSEMI)
146-
$(I Identifier) $(D :) $(PSSEMI_PSCURLYSCOPE)
144+
$(GLINK_LEX Identifier) $(D :)
145+
$(GLINK_LEX Identifier) $(D :) $(PSSEMI)
146+
$(GLINK_LEX Identifier) $(D :) $(PSSEMI_PSCURLYSCOPE)
147147
)
148148

149149
$(P
@@ -240,8 +240,8 @@ $(GNAME IfStatement):
240240

241241
$(GNAME IfCondition):
242242
$(EXPRESSION)
243-
$(D auto) $(I Identifier) $(D =) $(EXPRESSION)
244-
$(GLINK2 declaration, TypeCtors) $(I Identifier) $(D =) $(EXPRESSION)
243+
$(D auto) $(GLINK_LEX Identifier) $(D =) $(EXPRESSION)
244+
$(GLINK2 declaration, TypeCtors) $(GLINK_LEX Identifier) $(D =) $(EXPRESSION)
245245
$(GLINK2 declaration, TypeCtors)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) $(D =) $(EXPRESSION)
246246

247247
$(GNAME ThenStatement):
@@ -446,8 +446,8 @@ $(GNAME ForeachTypeList):
446446

447447
$(GNAME ForeachType):
448448
$(GLINK ForeachTypeAttributes)$(OPT) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator)
449-
$(GLINK ForeachTypeAttributes)$(OPT) $(I Identifier)
450-
$(GLINK ForeachTypeAttributes)$(OPT) $(D alias) $(I Identifier)
449+
$(GLINK ForeachTypeAttributes)$(OPT) $(GLINK_LEX Identifier)
450+
$(GLINK ForeachTypeAttributes)$(OPT) $(D alias) $(GLINK_LEX Identifier)
451451

452452
$(GNAME ForeachTypeAttributes)
453453
$(GLINK ForeachTypeAttribute)
@@ -1196,7 +1196,7 @@ $(H2 $(LEGACY_LNAME2 ContinueStatement, continue-statement, Continue Statement))
11961196

11971197
$(GRAMMAR
11981198
$(GNAME ContinueStatement):
1199-
$(D continue) $(I Identifier)$(OPT) $(D ;)
1199+
$(D continue) $(GLINK_LEX Identifier)$(OPT) $(D ;)
12001200
)
12011201

12021202
$(P `continue` aborts the current iteration of its enclosing loop statement, and
@@ -1230,7 +1230,7 @@ $(H2 $(LEGACY_LNAME2 BreakStatement, break-statement, Break Statement))
12301230

12311231
$(GRAMMAR
12321232
$(GNAME BreakStatement):
1233-
$(D break) $(I Identifier)$(OPT) $(D ;)
1233+
$(D break) $(GLINK_LEX Identifier)$(OPT) $(D ;)
12341234
)
12351235

12361236
$(P `break` exits the innermost enclosing while, for, foreach, do, or switch
@@ -1307,7 +1307,7 @@ $(H2 $(LEGACY_LNAME2 GotoStatement, goto-statement, Goto Statement))
13071307

13081308
$(GRAMMAR
13091309
$(GNAME GotoStatement):
1310-
$(D goto) $(I Identifier) $(D ;)
1310+
$(D goto) $(GLINK_LEX Identifier) $(D ;)
13111311
$(D goto) $(D default) $(D ;)
13121312
$(D goto) $(D case) $(D ;)
13131313
$(D goto) $(D case) $(EXPRESSION) $(D ;)
@@ -1571,7 +1571,7 @@ $(GNAME Catch):
15711571
$(D catch $(LPAREN)) $(GLINK CatchParameter) $(D $(RPAREN)) $(PS0)
15721572

15731573
$(GNAME CatchParameter):
1574-
$(GLINK2 declaration, BasicType) $(I Identifier)
1574+
$(GLINK2 declaration, BasicType) $(GLINK_LEX Identifier)
15751575

15761576
$(GNAME FinallyStatement):
15771577
$(D finally) $(PS0)

0 commit comments

Comments
 (0)