Skip to content

Commit 16ad3b0

Browse files
mininnymininny
committed
Merge branch 'main' into 1837-rename-eof-to-endOfFile
2 parents 3924ae8 + 2a9810b commit 16ad3b0

File tree

78 files changed

+4888
-2068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+4888
-2068
lines changed

‎CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public let ATTRIBUTE_NODES: [Node] = [
3737
parserFunction: "parseAttribute",
3838
children: [
3939
Child(
40-
name: "AtSignToken",
40+
name: "AtSign",
41+
deprecatedName: "AtSignToken",
4142
kind: .token(choices: [.token(tokenKind: "AtSignToken")]),
4243
documentation: "The `@` sign."
4344
),
@@ -157,7 +158,8 @@ public let ATTRIBUTE_NODES: [Node] = [
157158
documentation: "The availability argument for the _specialize attribute",
158159
children: [
159160
Child(
160-
name: "Label",
161+
name: "AvailabilityLabel",
162+
deprecatedName: "Label",
161163
kind: .token(choices: [.keyword(text: "availability")]),
162164
nameForDiagnostics: "label",
163165
documentation: "The label of the argument"
@@ -789,7 +791,8 @@ public let ATTRIBUTE_NODES: [Node] = [
789791
isOptional: true
790792
),
791793
Child(
792-
name: "Dot",
794+
name: "Period",
795+
deprecatedName: "Dot",
793796
kind: .token(choices: [.token(tokenKind: "PeriodToken")]),
794797
isOptional: true
795798
),
@@ -840,7 +843,8 @@ public let ATTRIBUTE_NODES: [Node] = [
840843
],
841844
children: [
842845
Child(
843-
name: "Label",
846+
name: "TargetLabel",
847+
deprecatedName: "Label",
844848
kind: .token(choices: [.keyword(text: "target")]),
845849
nameForDiagnostics: "label",
846850
documentation: "The label of the argument"

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public let DECL_NODES: [Node] = [
2727
nameForDiagnostics: "name"
2828
),
2929
Child(
30-
name: "TrailingDot",
30+
name: "TrailingPeriod",
31+
deprecatedName: "TrailingDot",
3132
kind: .token(choices: [.token(tokenKind: "PeriodToken")]),
3233
isOptional: true
3334
),
@@ -1436,7 +1437,8 @@ public let DECL_NODES: [Node] = [
14361437
isOptional: true
14371438
),
14381439
Child(
1439-
name: "PoundToken",
1440+
name: "Pound",
1441+
deprecatedName: "PoundToken",
14401442
kind: .token(choices: [.token(tokenKind: "PoundToken")]),
14411443
documentation: "The `#` sign."
14421444
),
@@ -1700,11 +1702,13 @@ public let DECL_NODES: [Node] = [
17001702
nameForDiagnostics: "'#sourceLocation' arguments",
17011703
children: [
17021704
Child(
1703-
name: "FileArgLabel",
1705+
name: "FileLabel",
1706+
deprecatedName: "FileArgLabel",
17041707
kind: .token(choices: [.keyword(text: "file")])
17051708
),
17061709
Child(
1707-
name: "FileArgColon",
1710+
name: "FileColon",
1711+
deprecatedName: "FileArgColon",
17081712
kind: .token(choices: [.token(tokenKind: "ColonToken")])
17091713
),
17101714
Child(
@@ -1717,11 +1721,13 @@ public let DECL_NODES: [Node] = [
17171721
kind: .token(choices: [.token(tokenKind: "CommaToken")])
17181722
),
17191723
Child(
1720-
name: "LineArgLabel",
1724+
name: "LineLabel",
1725+
deprecatedName: "LineArgLabel",
17211726
kind: .token(choices: [.keyword(text: "line")])
17221727
),
17231728
Child(
1724-
name: "LineArgColon",
1729+
name: "LineColon",
1730+
deprecatedName: "LineArgColon",
17251731
kind: .token(choices: [.token(tokenKind: "ColonToken")])
17261732
),
17271733
Child(
@@ -1770,7 +1776,8 @@ public let DECL_NODES: [Node] = [
17701776
documentation: "Specifies the precedence of an operator when used in an operation that includes optional chaining.",
17711777
children: [
17721778
Child(
1773-
name: "AssignmentKeyword",
1779+
name: "AssignmentLabel",
1780+
deprecatedName: "AssignmentKeyword",
17741781
kind: .token(choices: [.keyword(text: "assignment")])
17751782
),
17761783
Child(
@@ -1795,7 +1802,8 @@ public let DECL_NODES: [Node] = [
17951802
documentation: "Specifies how a sequence of operators with the same precedence level are grouped together in the absence of grouping parentheses.",
17961803
children: [
17971804
Child(
1798-
name: "AssociativityKeyword",
1805+
name: "AssociativityLabel",
1806+
deprecatedName: "AssociativityKeyword",
17991807
kind: .token(choices: [.keyword(text: "associativity")]),
18001808
classification: "Keyword"
18011809
),

‎CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift‎

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public let EXPR_NODES: [Node] = [
7777
isOptional: true
7878
),
7979
Child(
80-
name: "ArrowToken",
80+
name: "Arrow",
81+
deprecatedName: "ArrowToken",
8182
kind: .token(choices: [.token(tokenKind: "ArrowToken")])
8283
),
8384
]
@@ -97,7 +98,8 @@ public let EXPR_NODES: [Node] = [
9798
kind: .node(kind: .expr)
9899
),
99100
Child(
100-
name: "AsTok",
101+
name: "AsKeyword",
102+
deprecatedName: "AsTok",
101103
kind: .token(choices: [.keyword(text: "as")])
102104
),
103105
Child(
@@ -119,7 +121,8 @@ public let EXPR_NODES: [Node] = [
119121
nameForDiagnostics: nil,
120122
children: [
121123
Child(
122-
name: "AssignToken",
124+
name: "Equal",
125+
deprecatedName: "AssignToken",
123126
kind: .token(choices: [.token(tokenKind: "EqualToken")])
124127
)
125128
]
@@ -151,7 +154,8 @@ public let EXPR_NODES: [Node] = [
151154
nameForDiagnostics: "operator",
152155
children: [
153156
Child(
154-
name: "OperatorToken",
157+
name: "Operator",
158+
deprecatedName: "OperatorToken",
155159
kind: .token(choices: [.token(tokenKind: "BinaryOperatorToken")])
156160
)
157161
]
@@ -320,7 +324,8 @@ public let EXPR_NODES: [Node] = [
320324
isOptional: true
321325
),
322326
Child(
323-
name: "AssignToken",
327+
name: "Equal",
328+
deprecatedName: "AssignToken",
324329
kind: .token(choices: [.token(tokenKind: "EqualToken")]),
325330
isOptional: true
326331
),
@@ -554,7 +559,8 @@ public let EXPR_NODES: [Node] = [
554559
isOptional: true
555560
),
556561
Child(
557-
name: "InTok",
562+
name: "InKeyword",
563+
deprecatedName: "InTok",
558564
kind: .token(choices: [.keyword(text: "in")])
559565
),
560566
]
@@ -727,7 +733,8 @@ public let EXPR_NODES: [Node] = [
727733
kind: .token(choices: [.token(tokenKind: "BackslashToken")])
728734
),
729735
Child(
730-
name: "Delimiter",
736+
name: "RawStringDelimiter",
737+
deprecatedName: "Delimiter",
731738
kind: .token(choices: [.token(tokenKind: "RawStringDelimiterToken")]),
732739
isOptional: true
733740
),
@@ -760,7 +767,8 @@ public let EXPR_NODES: [Node] = [
760767
nameForDiagnostics: "floating literal",
761768
children: [
762769
Child(
763-
name: "FloatingDigits",
770+
name: "Digits",
771+
deprecatedName: "FloatingDigits",
764772
kind: .token(choices: [.token(tokenKind: "FloatingLiteralToken")])
765773
)
766774
]
@@ -982,7 +990,8 @@ public let EXPR_NODES: [Node] = [
982990
documentation: "The expression which will be checked to determine whether it can be cast to a specific type."
983991
),
984992
Child(
985-
name: "IsTok",
993+
name: "IsKeyword",
994+
deprecatedName: "IsTok",
986995
kind: .token(choices: [.keyword(text: "is")]),
987996
documentation: "The `is` keyword for this expression."
988997
),
@@ -1107,7 +1116,8 @@ public let EXPR_NODES: [Node] = [
11071116
nameForDiagnostics: "key path subscript component",
11081117
children: [
11091118
Child(
1110-
name: "LeftBracket",
1119+
name: "LeftSquare",
1120+
deprecatedName: "LeftBracket",
11111121
kind: .token(choices: [.token(tokenKind: "LeftSquareToken")])
11121122
),
11131123
Child(
@@ -1116,7 +1126,8 @@ public let EXPR_NODES: [Node] = [
11161126
nameForDiagnostics: "arguments"
11171127
),
11181128
Child(
1119-
name: "RightBracket",
1129+
name: "RightSquare",
1130+
deprecatedName: "RightBracket",
11201131
kind: .token(choices: [.token(tokenKind: "RightSquareToken")])
11211132
),
11221133
]
@@ -1132,7 +1143,8 @@ public let EXPR_NODES: [Node] = [
11321143
],
11331144
children: [
11341145
Child(
1135-
name: "PoundToken",
1146+
name: "Pound",
1147+
deprecatedName: "PoundToken",
11361148
kind: .token(choices: [.token(tokenKind: "PoundToken")]),
11371149
documentation: "The `#` sign."
11381150
),
@@ -1185,7 +1197,8 @@ public let EXPR_NODES: [Node] = [
11851197
isOptional: true
11861198
),
11871199
Child(
1188-
name: "Dot",
1200+
name: "Period",
1201+
deprecatedName: "Dot",
11891202
kind: .token(choices: [.token(tokenKind: "PeriodToken")])
11901203
),
11911204
Child(
@@ -1356,7 +1369,8 @@ public let EXPR_NODES: [Node] = [
13561369
kind: .node(kind: .expr)
13571370
),
13581371
Child(
1359-
name: "OperatorToken",
1372+
name: "Operator",
1373+
deprecatedName: "OperatorToken",
13601374
kind: .token(choices: [.token(tokenKind: "PostfixOperatorToken")])
13611375
),
13621376
]
@@ -1371,7 +1385,8 @@ public let EXPR_NODES: [Node] = [
13711385
nameForDiagnostics: "operator",
13721386
children: [
13731387
Child(
1374-
name: "OperatorToken",
1388+
name: "Operator",
1389+
deprecatedName: "OperatorToken",
13751390
kind: .token(choices: [.token(tokenKind: "PrefixOperatorToken")]),
13761391
isOptional: true
13771392
),
@@ -1507,7 +1522,8 @@ public let EXPR_NODES: [Node] = [
15071522
nameForDiagnostics: "called expression"
15081523
),
15091524
Child(
1510-
name: "LeftBracket",
1525+
name: "LeftSquare",
1526+
deprecatedName: "LeftBracket",
15111527
kind: .token(choices: [.token(tokenKind: "LeftSquareToken")])
15121528
),
15131529
Child(
@@ -1516,7 +1532,8 @@ public let EXPR_NODES: [Node] = [
15161532
nameForDiagnostics: "arguments"
15171533
),
15181534
Child(
1519-
name: "RightBracket",
1535+
name: "RightSquare",
1536+
deprecatedName: "RightBracket",
15201537
kind: .token(choices: [.token(tokenKind: "RightSquareToken")])
15211538
),
15221539
Child(
@@ -1689,7 +1706,8 @@ public let EXPR_NODES: [Node] = [
16891706
nameForDiagnostics: "first choice"
16901707
),
16911708
Child(
1692-
name: "ColonMark",
1709+
name: "Colon",
1710+
deprecatedName: "ColonMark",
16931711
kind: .token(choices: [.token(tokenKind: "ColonToken")])
16941712
),
16951713
Child(
@@ -1812,7 +1830,8 @@ public let EXPR_NODES: [Node] = [
18121830
nameForDiagnostics: "'as'",
18131831
children: [
18141832
Child(
1815-
name: "AsTok",
1833+
name: "AsKeyword",
1834+
deprecatedName: "AsTok",
18161835
kind: .token(choices: [.keyword(text: "as")])
18171836
),
18181837
Child(
@@ -1832,7 +1851,8 @@ public let EXPR_NODES: [Node] = [
18321851
nameForDiagnostics: "'is'",
18331852
children: [
18341853
Child(
1835-
name: "IsTok",
1854+
name: "IsKeyword",
1855+
deprecatedName: "IsTok",
18361856
kind: .token(choices: [.keyword(text: "is")])
18371857
)
18381858
]
@@ -1867,7 +1887,8 @@ public let EXPR_NODES: [Node] = [
18671887
kind: .node(kind: .expr)
18681888
),
18691889
Child(
1870-
name: "ColonMark",
1890+
name: "Colon",
1891+
deprecatedName: "ColonMark",
18711892
kind: .token(choices: [.token(tokenKind: "ColonToken")])
18721893
),
18731894
]

‎CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public let GENERIC_NODES: [Node] = [
4040
parserFunction: "parseGenericParameters",
4141
children: [
4242
Child(
43-
name: "LeftAngleBracket",
43+
name: "LeftAngle",
44+
deprecatedName: "LeftAngleBracket",
4445
kind: .token(choices: [.token(tokenKind: "LeftAngleToken")])
4546
),
4647
Child(
@@ -54,7 +55,8 @@ public let GENERIC_NODES: [Node] = [
5455
isOptional: true
5556
),
5657
Child(
57-
name: "RightAngleBracket",
58+
name: "RightAngle",
59+
deprecatedName: "RightAngleBracket",
5860
kind: .token(choices: [.token(tokenKind: "RightAngleToken")])
5961
),
6062
]
@@ -85,7 +87,8 @@ public let GENERIC_NODES: [Node] = [
8587
isOptional: true
8688
),
8789
Child(
88-
name: "Each",
90+
name: "EachKeyword",
91+
deprecatedName: "Each",
8992
kind: .token(choices: [.keyword(text: "each")]),
9093
nameForDiagnostics: "parameter pack specifier",
9194
isOptional: true
@@ -238,15 +241,17 @@ public let GENERIC_NODES: [Node] = [
238241
nameForDiagnostics: "primary associated type clause",
239242
children: [
240243
Child(
241-
name: "LeftAngleBracket",
244+
name: "LeftAngle",
245+
deprecatedName: "LeftAngleBracket",
242246
kind: .token(choices: [.token(tokenKind: "LeftAngleToken")])
243247
),
244248
Child(
245249
name: "PrimaryAssociatedTypeList",
246250
kind: .collection(kind: .primaryAssociatedTypeList, collectionElementName: "PrimaryAssociatedType")
247251
),
248252
Child(
249-
name: "RightAngleBracket",
253+
name: "RightAngle",
254+
deprecatedName: "RightAngleBracket",
250255
kind: .token(choices: [.token(tokenKind: "RightAngleToken")])
251256
),
252257
]

‎CodeGeneration/Sources/SyntaxSupport/PatternNodes.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,15 @@ public let PATTERN_NODES: [Node] = [
7272
],
7373
children: [
7474
Child(
75-
name: "LabelName",
75+
name: "Label",
76+
deprecatedName: "LabelName",
7677
kind: .token(choices: [.token(tokenKind: "IdentifierToken")]),
7778
nameForDiagnostics: "label",
7879
isOptional: true
7980
),
8081
Child(
81-
name: "LabelColon",
82+
name: "Colon",
83+
deprecatedName: "LabelColon",
8284
kind: .token(choices: [.token(tokenKind: "ColonToken")]),
8385
isOptional: true
8486
),

0 commit comments

Comments
 (0)