Skip to content

Commit ad237ff

Browse files
authored
Merge pull request #2179 from ahoppen/ahoppen/syntax-support-comments
Delete grammar comments in `CodeGeneration/SyntaxSupport` and translated all other comments to documentation
2 parents 8966ec7 + 79040ec commit ad237ff

19 files changed

+381
-370
lines changed

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public let ATTRIBUTE_NODES: [Node] = [
14-
// attribute-list -> attribute attribute-list?
1514
Node(
1615
kind: .attributeList,
1716
base: .syntaxCollection,
@@ -33,16 +32,6 @@ public let ATTRIBUTE_NODES: [Node] = [
3332
elementChoices: [.attribute, .ifConfigDecl]
3433
),
3534

36-
// attribute -> '@' identifier '('?
37-
// ( identifier
38-
// | string-literal
39-
// | integer-literal
40-
// | availability-spec-list
41-
// | specialize-attr-spec-list
42-
// | implements-attr-arguments
43-
// | named-attribute-string-argument
44-
// | back-deploy-attr-spec-list
45-
// )? ')'?
4635
Node(
4736
kind: .attribute,
4837
base: .syntax,
@@ -200,7 +189,6 @@ public let ATTRIBUTE_NODES: [Node] = [
200189
]
201190
),
202191

203-
// back-deploy-version-entry -> availability-version-restriction ','?
204192
Node(
205193
kind: .platformVersionItem,
206194
base: .syntax,
@@ -222,17 +210,13 @@ public let ATTRIBUTE_NODES: [Node] = [
222210
]
223211
),
224212

225-
// back-deploy-version-list ->
226-
// back-deploy-version-entry back-deploy-version-list?
227213
Node(
228214
kind: .platformVersionItemList,
229215
base: .syntaxCollection,
230216
nameForDiagnostics: "version list",
231217
elementChoices: [.platformVersionItem]
232218
),
233219

234-
// The arguments of '@backDeployed(...)'
235-
// back-deployed-attr-spec-list -> 'before' ':' back-deployed-version-list
236220
Node(
237221
kind: .backDeployedAttributeArguments,
238222
base: .syntax,
@@ -258,7 +242,6 @@ public let ATTRIBUTE_NODES: [Node] = [
258242
]
259243
),
260244

261-
// convention-attribute-arguments -> token ',' 'cType'? ':' string-literal
262245
Node(
263246
kind: .conventionAttributeArguments,
264247
base: .syntax,
@@ -293,7 +276,6 @@ public let ATTRIBUTE_NODES: [Node] = [
293276
]
294277
),
295278

296-
// convention-attribute-arguments -> 'witness_method' ':' identifier
297279
Node(
298280
kind: .conventionWitnessMethodAttributeArguments,
299281
base: .syntax,
@@ -315,12 +297,6 @@ public let ATTRIBUTE_NODES: [Node] = [
315297
]
316298
),
317299

318-
// The argument of the derivative registration attribute
319-
// '@derivative(of: ...)' and the transpose registration attribute
320-
// '@transpose(of: ...)'.
321-
//
322-
// derivative-registration-attr-arguments ->
323-
// 'of' ':' func-decl-name ','? differentiability-params-clause?
324300
Node(
325301
kind: .derivativeAttributeArguments,
326302
base: .syntax,
@@ -370,16 +346,13 @@ public let ATTRIBUTE_NODES: [Node] = [
370346
]
371347
),
372348

373-
// differentiability-param-list ->
374-
// differentiability-param differentiability-param-list?
375349
Node(
376350
kind: .differentiabilityArgumentList,
377351
base: .syntaxCollection,
378352
nameForDiagnostics: "differentiability parameters",
379353
elementChoices: [.differentiabilityArgument]
380354
),
381355

382-
// differentiability-param -> ('self' | identifier | integer-literal) ','?
383356
Node(
384357
kind: .differentiabilityArgument,
385358
base: .syntax,
@@ -402,8 +375,6 @@ public let ATTRIBUTE_NODES: [Node] = [
402375
]
403376
),
404377

405-
// differentiability-params-clause ->
406-
// 'wrt' ':' (differentiability-param | differentiability-params)
407378
Node(
408379
kind: .differentiabilityWithRespectToArgument,
409380
base: .syntax,
@@ -440,7 +411,6 @@ public let ATTRIBUTE_NODES: [Node] = [
440411
]
441412
),
442413

443-
// differentiability-params -> '(' differentiability-param-list ')'
444414
Node(
445415
kind: .differentiabilityArguments,
446416
base: .syntax,
@@ -464,10 +434,6 @@ public let ATTRIBUTE_NODES: [Node] = [
464434
]
465435
),
466436

467-
// The argument of '@differentiable(...)'.
468-
// differentiable-attr-arguments ->
469-
// differentiability-kind? '.'? differentiability-params-clause? ','?
470-
// generic-where-clause?
471437
Node(
472438
kind: .differentiableAttributeArguments,
473439
base: .syntax,
@@ -541,7 +507,7 @@ public let ATTRIBUTE_NODES: [Node] = [
541507
.keyword(.public),
542508
.keyword(.open),
543509
])
544-
), // Keywords can be: public, internal, private, fileprivate, open
510+
),
545511
Child(
546512
name: "string",
547513
kind: .node(kind: .stringLiteralExpr)
@@ -618,9 +584,6 @@ public let ATTRIBUTE_NODES: [Node] = [
618584
]
619585
),
620586

621-
// The argument of '@_implements(...)'
622-
// implements-attr-arguments -> simple-type-identifier ','
623-
// (identifier | operator) decl-name-arguments
624587
Node(
625588
kind: .implementsAttributeArguments,
626589
base: .syntax,
@@ -648,8 +611,6 @@ public let ATTRIBUTE_NODES: [Node] = [
648611
]
649612
),
650613

651-
// Representation of e.g. 'exported: true,'
652-
// labeled-specialize-entry -> identifier ':' token ','?
653614
Node(
654615
kind: .labeledSpecializeArgument,
655616
base: .syntax,
@@ -693,7 +654,6 @@ public let ATTRIBUTE_NODES: [Node] = [
693654
]
694655
),
695656

696-
// objc-selector-piece -> identifier? ':'?
697657
Node(
698658
kind: .objCSelectorPiece,
699659
base: .syntax,
@@ -715,15 +675,13 @@ public let ATTRIBUTE_NODES: [Node] = [
715675
]
716676
),
717677

718-
// objc-selector -> objc-selector-piece objc-selector?
719678
Node(
720679
kind: .objCSelectorPieceList,
721680
base: .syntaxCollection,
722681
nameForDiagnostics: "Objective-C selector",
723682
elementChoices: [.objCSelectorPiece]
724683
),
725684

726-
// opaque-return-type-of-arguments -> string-literal ',' integer-literal
727685
Node(
728686
kind: .opaqueReturnTypeOfAttributeArguments,
729687
base: .syntax,
@@ -776,11 +734,6 @@ public let ATTRIBUTE_NODES: [Node] = [
776734
]
777735
),
778736

779-
// The argument of '@_specialize(...)'
780-
// specialize-attr-spec-list -> labeled-specialize-entry
781-
// specialize-spec-attr-list?
782-
// | generic-where-clause
783-
// specialize-spec-attr-list?
784737
Node(
785738
kind: .specializeAttributeArgumentList,
786739
base: .syntaxCollection,
@@ -789,8 +742,6 @@ public let ATTRIBUTE_NODES: [Node] = [
789742
elementChoices: [.labeledSpecializeArgument, .specializeAvailabilityArgument, .specializeTargetFunctionArgument, .genericWhereClause]
790743
),
791744

792-
// Representation of e.g. 'exported: true,'
793-
// labeled-specialize-entry -> identifier ':' token ','?
794745
Node(
795746
kind: .specializeTargetFunctionArgument,
796747
base: .syntax,

CodeGeneration/Sources/SyntaxSupport/AvailabilityNodes.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public let AVAILABILITY_NODES: [Node] = [
14-
// Wrapper for all the different entries that may occur inside @available
15-
// availability-entry -> '*' ','?
16-
// | identifier ','?
17-
// | availability-version-restriction ','?
18-
// | availability-versioned-argument ','?
1914
Node(
2015
kind: .availabilityArgument,
2116
base: .syntax,
@@ -55,8 +50,6 @@ public let AVAILABILITY_NODES: [Node] = [
5550
]
5651
),
5752

58-
// Representation of 'deprecated: 2.3', 'message: "Hello world"' etc.
59-
// availability-versioned-argument -> identifier ':' version-tuple
6053
Node(
6154
kind: .availabilityLabeledArgument,
6255
base: .syntax,
@@ -98,16 +91,13 @@ public let AVAILABILITY_NODES: [Node] = [
9891
]
9992
),
10093

101-
// availability-spec-list -> availability-entry availability-spec-list?
10294
Node(
10395
kind: .availabilityArgumentList,
10496
base: .syntaxCollection,
10597
nameForDiagnostics: "'@availability' arguments",
10698
elementChoices: [.availabilityArgument]
10799
),
108100

109-
// Representation for 'iOS 10', 'swift 3.4' etc.
110-
// availability-version-restriction -> identifier version-tuple
111101
Node(
112102
kind: .platformVersion,
113103
base: .syntax,
@@ -137,7 +127,6 @@ public let AVAILABILITY_NODES: [Node] = [
137127
]
138128
),
139129

140-
// version-tuple-element -> '.' integer-literal
141130
Node(
142131
kind: .versionComponent,
143132
base: .syntax,
@@ -157,15 +146,13 @@ public let AVAILABILITY_NODES: [Node] = [
157146
]
158147
),
159148

160-
// version-list -> version-tuple-element version-list?
161149
Node(
162150
kind: .versionComponentList,
163151
base: .syntaxCollection,
164152
nameForDiagnostics: nil,
165153
elementChoices: [.versionComponent]
166154
),
167155

168-
// version-tuple -> integer-literal version-list?
169156
Node(
170157
kind: .versionTuple,
171158
base: .syntax,

CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
public let COMMON_NODES: [Node] = [
14-
// code-block-item-list -> code-block-item code-block-item-list?
1514
Node(
1615
kind: .codeBlockItemList,
1716
base: .syntaxCollection,
1817
nameForDiagnostics: nil,
1918
elementChoices: [.codeBlockItem]
2019
),
2120

22-
// code-block-item = (decl | stmt | expr) ';'?
2321
Node(
2422
kind: .codeBlockItem,
2523
base: .syntax,
@@ -54,7 +52,6 @@ public let COMMON_NODES: [Node] = [
5452
]
5553
),
5654

57-
// code-block -> '{' stmt-list '}'
5855
Node(
5956
kind: .codeBlock,
6057
base: .syntax,
@@ -80,7 +77,6 @@ public let COMMON_NODES: [Node] = [
8077
]
8178
),
8279

83-
// accessor-effect-specifiers -> (async)? (throws)?
8480
Node(
8581
kind: .accessorEffectSpecifiers,
8682
base: .syntax,
@@ -102,7 +98,6 @@ public let COMMON_NODES: [Node] = [
10298
]
10399
),
104100

105-
// funtion-effect-specifiers -> (async | reasync)? (throws | rethrows)?
106101
Node(
107102
kind: .functionEffectSpecifiers,
108103
base: .syntax,
@@ -124,7 +119,6 @@ public let COMMON_NODES: [Node] = [
124119
]
125120
),
126121

127-
// deinit-effect-specifiers -> async?
128122
Node(
129123
kind: .deinitializerEffectSpecifiers,
130124
base: .syntax,
@@ -305,7 +299,6 @@ public let COMMON_NODES: [Node] = [
305299
parserFunction: "parseStatement"
306300
),
307301

308-
// type-effect-specifiers -> async? throws?
309302
Node(
310303
kind: .typeEffectSpecifiers,
311304
base: .syntax,

0 commit comments

Comments
 (0)