Skip to content

Commit ecda622

Browse files
ahoppenahoppen
committed
Rename TupleExprElement -> LabeledExpr
1 parent 8c8111d commit ecda622

File tree

62 files changed

+986
-967
lines changed

Some content is hidden

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

62 files changed

+986
-967
lines changed

‎CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public let ATTRIBUTE_NODES: [Node] = [
6060
kind: .nodeChoices(choices: [
6161
Child(
6262
name: "ArgumentList",
63-
kind: .node(kind: .tupleExprElementList)
63+
kind: .node(kind: .labeledExprList)
6464
),
6565
Child(
6666
name: "Token",

‎CodeGeneration/Sources/SyntaxSupport/BuilderInitializableTypes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public let BUILDER_INITIALIZABLE_TYPES: [SyntaxNodeKind: SyntaxNodeKind?] = [
2525
.genericParameterList: nil,
2626
.genericRequirementList: nil,
2727
.inheritedTypeList: nil,
28+
.labeledExprList: nil,
2829
.memberBlock: .memberBlockItemList,
2930
.memberBlockItemList: nil,
3031
.patternBindingList: nil,
3132
.switchCaseItemList: nil,
3233
.switchCaseList: nil,
33-
.tupleExprElementList: nil,
3434
.tuplePatternElementList: nil,
3535
]

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public let DECL_NODES: [Node] = [
8181
Child(
8282
name: "Properties",
8383
deprecatedName: "PropertyList",
84-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Property"),
84+
kind: .collection(kind: .labeledExprList, collectionElementName: "Property"),
8585
nameForDiagnostics: "properties"
8686
),
8787
Child(
@@ -107,7 +107,7 @@ public let DECL_NODES: [Node] = [
107107
Child(
108108
name: "Properties",
109109
deprecatedName: "PropertyList",
110-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Property"),
110+
kind: .collection(kind: .labeledExprList, collectionElementName: "Property"),
111111
nameForDiagnostics: "properties"
112112
),
113113
Child(
@@ -1487,7 +1487,7 @@ public let DECL_NODES: [Node] = [
14871487
Child(
14881488
name: "Arguments",
14891489
deprecatedName: "ArgumentList",
1490-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument")
1490+
kind: .collection(kind: .labeledExprList, collectionElementName: "Argument")
14911491
),
14921492
Child(
14931493
name: "RightParen",

‎CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ public let EXPR_NODES: [Node] = [
749749
),
750750
Child(
751751
name: "Expressions",
752-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Expression")
752+
kind: .collection(kind: .labeledExprList, collectionElementName: "Expression")
753753
),
754754
Child(
755755
name: "RightParen",
@@ -812,7 +812,7 @@ public let EXPR_NODES: [Node] = [
812812
Child(
813813
name: "Arguments",
814814
deprecatedName: "ArgumentList",
815-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument"),
815+
kind: .collection(kind: .labeledExprList, collectionElementName: "Argument"),
816816
nameForDiagnostics: "arguments"
817817
),
818818
Child(
@@ -1128,7 +1128,7 @@ public let EXPR_NODES: [Node] = [
11281128
Child(
11291129
name: "Arguments",
11301130
deprecatedName: "ArgumentList",
1131-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument"),
1131+
kind: .collection(kind: .labeledExprList, collectionElementName: "Argument"),
11321132
nameForDiagnostics: "arguments"
11331133
),
11341134
Child(
@@ -1173,7 +1173,7 @@ public let EXPR_NODES: [Node] = [
11731173
Child(
11741174
name: "Arguments",
11751175
deprecatedName: "ArgumentList",
1176-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument")
1176+
kind: .collection(kind: .labeledExprList, collectionElementName: "Argument")
11771177
),
11781178
Child(
11791179
name: "RightParen",
@@ -1549,7 +1549,7 @@ public let EXPR_NODES: [Node] = [
15491549
Child(
15501550
name: "Arguments",
15511551
deprecatedName: "ArgumentList",
1552-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument"),
1552+
kind: .collection(kind: .labeledExprList, collectionElementName: "Argument"),
15531553
nameForDiagnostics: "arguments"
15541554
),
15551555
Child(
@@ -1770,15 +1770,15 @@ public let EXPR_NODES: [Node] = [
17701770
),
17711771

17721772
Node(
1773-
kind: .tupleExprElementList,
1773+
kind: .labeledExprList,
17741774
base: .syntaxCollection,
17751775
nameForDiagnostics: nil,
1776-
elementChoices: [.tupleExprElement]
1776+
elementChoices: [.labeledExpr]
17771777
),
17781778

17791779
// An element inside a tuple element list
17801780
Node(
1781-
kind: .tupleExprElement,
1781+
kind: .labeledExpr,
17821782
base: .syntax,
17831783
nameForDiagnostics: nil,
17841784
traits: [
@@ -1824,7 +1824,7 @@ public let EXPR_NODES: [Node] = [
18241824
Child(
18251825
name: "Elements",
18261826
deprecatedName: "ElementList",
1827-
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Element")
1827+
kind: .collection(kind: .labeledExprList, collectionElementName: "Element")
18281828
),
18291829
Child(
18301830
name: "RightParen",

‎CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ public enum SyntaxNodeKind: String, CaseIterable {
180180
case keyPathOptionalComponent
181181
case keyPathPropertyComponent
182182
case keyPathSubscriptComponent
183+
case labeledExpr
184+
case labeledExprList
183185
case labeledSpecializeArgument
184186
case labeledStmt
185187
case layoutRequirement
@@ -271,8 +273,6 @@ public enum SyntaxNodeKind: String, CaseIterable {
271273
case throwStmt
272274
case tryExpr
273275
case tupleExpr
274-
case tupleExprElement
275-
case tupleExprElementList
276276
case tuplePattern
277277
case tuplePatternElement
278278
case tuplePatternElementList
@@ -407,6 +407,8 @@ public enum SyntaxNodeKind: String, CaseIterable {
407407
case .importPathComponent: return "accessPathComponent"
408408
case .importPathComponentList: return "accessPath"
409409
case .inheritanceClause: return "typeInheritanceClause"
410+
case .labeledExpr: return "tupleExprElement"
411+
case .labeledExprList: return "tupleExprElementList"
410412
case .labeledSpecializeArgument: return "labeledSpecializeEntry"
411413
case .memberBlock: return "memberDeclBlock"
412414
case .memberBlockItem: return "memberDeclListItem"

‎CodeGeneration/Sources/SyntaxSupport/Traits.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public let TRAITS: [Trait] = [
6666
Child(name: "Macro", kind: .token(choices: [.token(tokenKind: "IdentifierToken")])),
6767
Child(name: "GenericArgumentClause", kind: .node(kind: .genericArgumentClause), isOptional: true),
6868
Child(name: "LeftParen", kind: .token(choices: [.token(tokenKind: "LeftParenToken")]), isOptional: true),
69-
Child(name: "ArgumentList", kind: .node(kind: .tupleExprElementList)),
69+
Child(name: "ArgumentList", kind: .node(kind: .labeledExprList)),
7070
Child(name: "RightParen", kind: .token(choices: [.token(tokenKind: "RightParenToken")]), isOptional: true),
7171
Child(name: "TrailingClosure", kind: .node(kind: .closureExpr), isOptional: true),
7272
Child(name: "AdditionalTrailingClosures", kind: .node(kind: .multipleTrailingClosureElementList), isOptional: true),

‎Sources/SwiftParser/Attributes.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ extension Parser {
319319
case .attached:
320320
return parseAttribute(argumentMode: .customAttribute) { parser in
321321
let arguments = parser.parseAttachedArguments()
322-
return .argumentList(RawTupleExprElementListSyntax(elements: arguments, arena: parser.arena))
322+
return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))
323323
}
324324
case .rethrows:
325325
let (unexpectedBeforeAtSign, atSign) = self.expect(.atSign)
@@ -339,17 +339,17 @@ extension Parser {
339339
case nil:
340340
return parseAttribute(argumentMode: .customAttribute) { parser in
341341
let arguments = parser.parseArgumentListElements(pattern: .none)
342-
return .argumentList(RawTupleExprElementListSyntax(elements: arguments, arena: parser.arena))
342+
return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))
343343
}
344344
}
345345
}
346346
}
347347

348348
extension Parser {
349-
mutating func parseAttachedArguments() -> [RawTupleExprElementSyntax] {
349+
mutating func parseAttachedArguments() -> [RawLabeledExprSyntax] {
350350
let (unexpectedBeforeRole, role) = self.expect(.identifier, TokenSpec(.extension, remapping: .identifier), default: .identifier)
351351
let roleTrailingComma = self.consume(if: .comma)
352-
let roleElement = RawTupleExprElementSyntax(
352+
let roleElement = RawLabeledExprSyntax(
353353
label: nil,
354354
colon: nil,
355355
expression: RawExprSyntax(

‎Sources/SwiftParser/Declarations.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,7 @@ extension Parser {
19151915

19161916
// Parse the optional parenthesized argument list.
19171917
let leftParen = self.consume(if: TokenSpec(.leftParen, allowAtStartOfLine: false))
1918-
let args: [RawTupleExprElementSyntax]
1918+
let args: [RawLabeledExprSyntax]
19191919
let unexpectedBeforeRightParen: RawUnexpectedNodesSyntax?
19201920
let rightParen: RawTokenSyntax?
19211921
if leftParen != nil {
@@ -1949,7 +1949,7 @@ extension Parser {
19491949
macroName: macro,
19501950
genericArgumentClause: generics,
19511951
leftParen: leftParen,
1952-
arguments: RawTupleExprElementListSyntax(
1952+
arguments: RawLabeledExprListSyntax(
19531953
elements: args,
19541954
arena: self.arena
19551955
),

‎Sources/SwiftParser/Expressions.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ extension Parser {
744744
RawFunctionCallExprSyntax(
745745
calledExpression: leadingExpr,
746746
leftParen: lparen,
747-
arguments: RawTupleExprElementListSyntax(elements: args, arena: self.arena),
747+
arguments: RawLabeledExprListSyntax(elements: args, arena: self.arena),
748748
unexpectedBeforeRParen,
749749
rightParen: rparen,
750750
trailingClosure: trailingClosure,
@@ -758,7 +758,7 @@ extension Parser {
758758
// Check for a [expr] suffix.
759759
// Note that this cannot be the start of a new line.
760760
if let lsquare = self.consume(if: TokenSpec(.leftSquare, allowAtStartOfLine: false)) {
761-
let args: [RawTupleExprElementSyntax]
761+
let args: [RawLabeledExprSyntax]
762762
if self.at(.rightSquare) {
763763
args = []
764764
} else {
@@ -780,7 +780,7 @@ extension Parser {
780780
RawSubscriptCallExprSyntax(
781781
calledExpression: leadingExpr,
782782
leftSquare: lsquare,
783-
arguments: RawTupleExprElementListSyntax(elements: args, arena: self.arena),
783+
arguments: RawLabeledExprListSyntax(elements: args, arena: self.arena),
784784
unexpectedBeforeRSquare,
785785
rightSquare: rsquare,
786786
trailingClosure: trailingClosure,
@@ -795,7 +795,7 @@ extension Parser {
795795
if self.at(.leftBrace) && self.withLookahead({ $0.isValidTrailingClosure(flavor) }) {
796796
// FIXME: if Result has a trailing closure, break out.
797797
// Add dummy blank argument list to the call expression syntax.
798-
let list = RawTupleExprElementListSyntax(elements: [], arena: self.arena)
798+
let list = RawLabeledExprListSyntax(elements: [], arena: self.arena)
799799
let (first, rest) = self.parseTrailingClosures(flavor)
800800

801801
leadingExpr = RawExprSyntax(
@@ -990,7 +990,7 @@ extension Parser {
990990

991991
precondition(self.at(.leftSquare))
992992
let lsquare = self.consumeAnyToken()
993-
let args: [RawTupleExprElementSyntax]
993+
let args: [RawLabeledExprSyntax]
994994
if self.at(.rightSquare) {
995995
args = []
996996
} else {
@@ -1004,7 +1004,7 @@ extension Parser {
10041004
component: .subscript(
10051005
RawKeyPathSubscriptComponentSyntax(
10061006
leftSquare: lsquare,
1007-
arguments: RawTupleExprElementListSyntax(
1007+
arguments: RawLabeledExprListSyntax(
10081008
elements: args,
10091009
arena: self.arena
10101010
),
@@ -1318,7 +1318,7 @@ extension Parser {
13181318

13191319
// Parse the optional parenthesized argument list.
13201320
let leftParen = self.consume(if: TokenSpec(.leftParen, allowAtStartOfLine: false))
1321-
let args: [RawTupleExprElementSyntax]
1321+
let args: [RawLabeledExprSyntax]
13221322
let unexpectedBeforeRightParen: RawUnexpectedNodesSyntax?
13231323
let rightParen: RawTokenSyntax?
13241324
if leftParen != nil {
@@ -1347,7 +1347,7 @@ extension Parser {
13471347
macroName: macroName,
13481348
genericArgumentClause: generics,
13491349
leftParen: leftParen,
1350-
arguments: RawTupleExprElementListSyntax(
1350+
arguments: RawLabeledExprListSyntax(
13511351
elements: args,
13521352
arena: self.arena
13531353
),
@@ -1438,7 +1438,7 @@ extension Parser {
14381438
return RawTupleExprSyntax(
14391439
unexpectedBeforeLParen,
14401440
leftParen: lparen,
1441-
elements: RawTupleExprElementListSyntax(elements: elements, arena: self.arena),
1441+
elements: RawLabeledExprListSyntax(elements: elements, arena: self.arena),
14421442
unexpectedBeforeRParen,
14431443
rightParen: rparen,
14441444
arena: self.arena
@@ -1859,10 +1859,10 @@ extension Parser {
18591859
///
18601860
/// This is currently the same as parsing a tuple expression. In the future,
18611861
/// this will be a dedicated argument list type.
1862-
mutating func parseArgumentListElements(pattern: PatternContext) -> [RawTupleExprElementSyntax] {
1862+
mutating func parseArgumentListElements(pattern: PatternContext) -> [RawLabeledExprSyntax] {
18631863
if let remainingTokens = remainingTokensIfMaximumNestingLevelReached() {
18641864
return [
1865-
RawTupleExprElementSyntax(
1865+
RawLabeledExprSyntax(
18661866
remainingTokens,
18671867
label: nil,
18681868
colon: nil,
@@ -1877,7 +1877,7 @@ extension Parser {
18771877
return []
18781878
}
18791879

1880-
var result = [RawTupleExprElementSyntax]()
1880+
var result = [RawLabeledExprSyntax]()
18811881
var keepGoing: RawTokenSyntax? = nil
18821882
var loopProgress = LoopProgressCondition()
18831883
repeat {
@@ -1911,7 +1911,7 @@ extension Parser {
19111911
}
19121912
keepGoing = self.consume(if: .comma)
19131913
result.append(
1914-
RawTupleExprElementSyntax(
1914+
RawLabeledExprSyntax(
19151915
unexpectedBeforeLabel,
19161916
label: label,
19171917
colon: colon,

‎Sources/SwiftParser/Specifiers.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ extension Parser {
783783
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
784784

785785
let args = parseArgumentListElements(pattern: .none)
786-
let argumentList = RawTupleExprElementListSyntax(
786+
let argumentList = RawLabeledExprListSyntax(
787787
elements: args,
788788
arena: self.arena
789789
)
@@ -809,7 +809,7 @@ extension Parser {
809809
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
810810

811811
let args = parseArgumentListElements(pattern: .none)
812-
let argumentList = RawTupleExprElementListSyntax(
812+
let argumentList = RawLabeledExprListSyntax(
813813
elements: args,
814814
arena: self.arena
815815
)

‎Sources/SwiftParser/StringLiterals.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ extension Parser {
497497
} else if let backslash = self.consume(if: .backslash) {
498498
let (unexpectedBeforeDelimiter, delimiter) = self.parsePoundDelimiter(.rawStringPoundDelimiter, matching: openingPounds)
499499
let leftParen = self.expectWithoutRecoveryOrLeadingTrivia(.leftParen)
500-
let expressions = RawTupleExprElementListSyntax(elements: self.parseArgumentListElements(pattern: .none), arena: self.arena)
500+
let expressions = RawLabeledExprListSyntax(elements: self.parseArgumentListElements(pattern: .none), arena: self.arena)
501501

502502
// For recovery, eat anything up to the next token that either starts a new string segment or terminates the string.
503503
// This allows us to skip over extraneous identifiers etc. in an unterminated string interpolation.

‎Sources/SwiftParser/Types.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ extension Parser {
925925
case nil: // Custom attribute
926926
return parseAttribute(argumentMode: .customAttribute) { parser in
927927
let arguments = parser.parseArgumentListElements(pattern: .none)
928-
return .argumentList(RawTupleExprElementListSyntax(elements: arguments, arena: parser.arena))
928+
return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))
929929
}
930930

931931
}

0 commit comments

Comments
 (0)