Skip to content

Commit 70eb87b

Browse files
gottesmmgottesmm
authored
Merge pull request swiftlang#1354 from gottesmm/pr-c75239cb2dcbb5f819802cd1f99342b286690e89
[reference-bindings] Change the parser to refer to 'VariableBindings' instead of 'letOrVar' in preparation for adding inout and borrow bindings.
2 parents 324166c + 3ad4eb6 commit 70eb87b

File tree

24 files changed

+117
-117
lines changed

24 files changed

+117
-117
lines changed

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ public let DECL_NODES: [Node] = [
12131213
kind: .collection(kind: "ModifierList", collectionElementName: "Modifier"),
12141214
nameForDiagnostics: "modifiers",
12151215
isOptional: true),
1216-
Child(name: "LetOrVarKeyword",
1216+
Child(name: "BindingKeyword",
12171217
kind: .token(choices: [.keyword(text: "let"), .keyword(text: "var")])),
12181218
Child(name: "Bindings",
12191219
kind: .collection(kind: "PatternBindingList", collectionElementName: "Binding"))

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/PatternNodes.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public let PATTERN_NODES: [Node] = [
9494
nameForDiagnostics: "value binding pattern",
9595
kind: "Pattern",
9696
children: [
97-
Child(name: "LetOrVarKeyword",
97+
Child(name: "BindingKeyword",
9898
kind: .token(choices: [.keyword(text: "let"), .keyword(text: "var")])),
9999
Child(name: "ValuePattern",
100100
kind: .node(kind: "Pattern"))

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/StmtNodes.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public let STMT_NODES: [Node] = [
262262
nameForDiagnostics: "optional binding",
263263
kind: "Syntax",
264264
children: [
265-
Child(name: "LetOrVarKeyword",
265+
Child(name: "BindingKeyword",
266266
kind: .token(choices: [.keyword(text: "let"), .keyword(text: "var")])),
267267
Child(name: "Pattern",
268268
kind: .node(kind: "Pattern")),

‎Sources/SwiftParser/Declarations.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ extension Parser {
242242
case (.subscriptKeyword, let handle)?:
243243
return RawDeclSyntax(self.parseSubscriptDeclaration(attrs, handle))
244244
case (.letKeyword, let handle)?, (.varKeyword, let handle)?:
245-
return RawDeclSyntax(self.parseLetOrVarDeclaration(attrs, handle, inMemberDeclList: inMemberDeclList))
245+
return RawDeclSyntax(self.parseBindingDeclaration(attrs, handle, inMemberDeclList: inMemberDeclList))
246246
case (.initKeyword, let handle)?:
247247
return RawDeclSyntax(self.parseInitializerDeclaration(attrs, handle))
248248
case (.deinitKeyword, let handle)?:
@@ -261,7 +261,7 @@ extension Parser {
261261
let isProbablyTupleDecl = self.at(.leftParen) && self.peek().rawTokenKind.is(.identifier, .wildcard)
262262

263263
if isProbablyVarDecl || isProbablyTupleDecl {
264-
return RawDeclSyntax(self.parseLetOrVarDeclaration(attrs, .missing(.keyword(.var))))
264+
return RawDeclSyntax(self.parseBindingDeclaration(attrs, .missing(.keyword(.var))))
265265
}
266266

267267
if self.currentToken.isEditorPlaceholder {
@@ -1471,7 +1471,7 @@ extension Parser {
14711471
/// }
14721472
/// ```
14731473
@_spi(RawSyntax)
1474-
public mutating func parseLetOrVarDeclaration(
1474+
public mutating func parseBindingDeclaration(
14751475
_ attrs: DeclAttributes,
14761476
_ handle: RecoveryConsumptionHandle,
14771477
inMemberDeclList: Bool = false
@@ -1571,7 +1571,7 @@ extension Parser {
15711571
attributes: attrs.attributes,
15721572
modifiers: attrs.modifiers,
15731573
unexpectedBeforeIntroducer,
1574-
letOrVarKeyword: introducer,
1574+
bindingKeyword: introducer,
15751575
bindings: RawPatternBindingListSyntax(elements: elements, arena: self.arena),
15761576
arena: self.arena
15771577
)

‎Sources/SwiftParser/Patterns.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ extension Parser {
125125
let value = self.parsePattern()
126126
return RawPatternSyntax(
127127
RawValueBindingPatternSyntax(
128-
letOrVarKeyword: letOrVar,
128+
bindingKeyword: letOrVar,
129129
valuePattern: value,
130130
arena: self.arena
131131
)
@@ -244,7 +244,7 @@ extension Parser {
244244
let value = self.parseMatchingPattern(context: .letOrVar)
245245
return RawPatternSyntax(
246246
RawValueBindingPatternSyntax(
247-
letOrVarKeyword: letOrVar,
247+
bindingKeyword: letOrVar,
248248
valuePattern: value,
249249
arena: self.arena
250250
)

‎Sources/SwiftParser/Statements.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ extension Parser {
288288
case let .optional(letOrVar, pattern):
289289
return .optionalBinding(
290290
RawOptionalBindingConditionSyntax(
291-
letOrVarKeyword: letOrVar,
291+
bindingKeyword: letOrVar,
292292
pattern: pattern,
293293
typeAnnotation: annotation,
294294
initializer: initializer,

‎Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
10951095
return $0.initializer?.value.as(TryExprSyntax.self)?.tryKeyword
10961096
})
10971097
exchangeTokens(
1098-
unexpected: node.unexpectedBetweenModifiersAndLetOrVarKeyword,
1098+
unexpected: node.unexpectedBetweenModifiersAndBindingKeyword,
10991099
unexpectedTokenCondition: { $0.tokenKind == .keyword(.try) },
11001100
correctTokens: missingTries,
11011101
message: { _ in .tryOnInitialValueExpression },

‎Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13718,9 +13718,9 @@ public struct RawOptionalBindingConditionSyntax: RawSyntaxNodeProtocol {
1371813718
}
1371913719

1372013720
public init(
13721-
_ unexpectedBeforeLetOrVarKeyword: RawUnexpectedNodesSyntax? = nil,
13722-
letOrVarKeyword: RawTokenSyntax,
13723-
_ unexpectedBetweenLetOrVarKeywordAndPattern: RawUnexpectedNodesSyntax? = nil,
13721+
_ unexpectedBeforeBindingKeyword: RawUnexpectedNodesSyntax? = nil,
13722+
bindingKeyword: RawTokenSyntax,
13723+
_ unexpectedBetweenBindingKeywordAndPattern: RawUnexpectedNodesSyntax? = nil,
1372413724
pattern: RawPatternSyntax,
1372513725
_ unexpectedBetweenPatternAndTypeAnnotation: RawUnexpectedNodesSyntax? = nil,
1372613726
typeAnnotation: RawTypeAnnotationSyntax?,
@@ -13732,9 +13732,9 @@ public struct RawOptionalBindingConditionSyntax: RawSyntaxNodeProtocol {
1373213732
let raw = RawSyntax.makeLayout(
1373313733
kind: .optionalBindingCondition, uninitializedCount: 9, arena: arena) { layout in
1373413734
layout.initialize(repeating: nil)
13735-
layout[0] = unexpectedBeforeLetOrVarKeyword?.raw
13736-
layout[1] = letOrVarKeyword.raw
13737-
layout[2] = unexpectedBetweenLetOrVarKeywordAndPattern?.raw
13735+
layout[0] = unexpectedBeforeBindingKeyword?.raw
13736+
layout[1] = bindingKeyword.raw
13737+
layout[2] = unexpectedBetweenBindingKeywordAndPattern?.raw
1373813738
layout[3] = pattern.raw
1373913739
layout[4] = unexpectedBetweenPatternAndTypeAnnotation?.raw
1374013740
layout[5] = typeAnnotation?.raw
@@ -13745,15 +13745,15 @@ public struct RawOptionalBindingConditionSyntax: RawSyntaxNodeProtocol {
1374513745
self.init(raw: raw)
1374613746
}
1374713747

13748-
public var unexpectedBeforeLetOrVarKeyword: RawUnexpectedNodesSyntax? {
13748+
public var unexpectedBeforeBindingKeyword: RawUnexpectedNodesSyntax? {
1374913749
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1375013750
}
1375113751

13752-
public var letOrVarKeyword: RawTokenSyntax {
13752+
public var bindingKeyword: RawTokenSyntax {
1375313753
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
1375413754
}
1375513755

13756-
public var unexpectedBetweenLetOrVarKeywordAndPattern: RawUnexpectedNodesSyntax? {
13756+
public var unexpectedBetweenBindingKeywordAndPattern: RawUnexpectedNodesSyntax? {
1375713757
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1375813758
}
1375913759

@@ -19827,34 +19827,34 @@ public struct RawValueBindingPatternSyntax: RawPatternSyntaxNodeProtocol {
1982719827
}
1982819828

1982919829
public init(
19830-
_ unexpectedBeforeLetOrVarKeyword: RawUnexpectedNodesSyntax? = nil,
19831-
letOrVarKeyword: RawTokenSyntax,
19832-
_ unexpectedBetweenLetOrVarKeywordAndValuePattern: RawUnexpectedNodesSyntax? = nil,
19830+
_ unexpectedBeforeBindingKeyword: RawUnexpectedNodesSyntax? = nil,
19831+
bindingKeyword: RawTokenSyntax,
19832+
_ unexpectedBetweenBindingKeywordAndValuePattern: RawUnexpectedNodesSyntax? = nil,
1983319833
valuePattern: RawPatternSyntax,
1983419834
_ unexpectedAfterValuePattern: RawUnexpectedNodesSyntax? = nil,
1983519835
arena: __shared SyntaxArena
1983619836
) {
1983719837
let raw = RawSyntax.makeLayout(
1983819838
kind: .valueBindingPattern, uninitializedCount: 5, arena: arena) { layout in
1983919839
layout.initialize(repeating: nil)
19840-
layout[0] = unexpectedBeforeLetOrVarKeyword?.raw
19841-
layout[1] = letOrVarKeyword.raw
19842-
layout[2] = unexpectedBetweenLetOrVarKeywordAndValuePattern?.raw
19840+
layout[0] = unexpectedBeforeBindingKeyword?.raw
19841+
layout[1] = bindingKeyword.raw
19842+
layout[2] = unexpectedBetweenBindingKeywordAndValuePattern?.raw
1984319843
layout[3] = valuePattern.raw
1984419844
layout[4] = unexpectedAfterValuePattern?.raw
1984519845
}
1984619846
self.init(raw: raw)
1984719847
}
1984819848

19849-
public var unexpectedBeforeLetOrVarKeyword: RawUnexpectedNodesSyntax? {
19849+
public var unexpectedBeforeBindingKeyword: RawUnexpectedNodesSyntax? {
1985019850
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1985119851
}
1985219852

19853-
public var letOrVarKeyword: RawTokenSyntax {
19853+
public var bindingKeyword: RawTokenSyntax {
1985419854
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
1985519855
}
1985619856

19857-
public var unexpectedBetweenLetOrVarKeywordAndValuePattern: RawUnexpectedNodesSyntax? {
19857+
public var unexpectedBetweenBindingKeywordAndValuePattern: RawUnexpectedNodesSyntax? {
1985819858
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1985919859
}
1986019860

@@ -19897,9 +19897,9 @@ public struct RawVariableDeclSyntax: RawDeclSyntaxNodeProtocol {
1989719897
attributes: RawAttributeListSyntax?,
1989819898
_ unexpectedBetweenAttributesAndModifiers: RawUnexpectedNodesSyntax? = nil,
1989919899
modifiers: RawModifierListSyntax?,
19900-
_ unexpectedBetweenModifiersAndLetOrVarKeyword: RawUnexpectedNodesSyntax? = nil,
19901-
letOrVarKeyword: RawTokenSyntax,
19902-
_ unexpectedBetweenLetOrVarKeywordAndBindings: RawUnexpectedNodesSyntax? = nil,
19900+
_ unexpectedBetweenModifiersAndBindingKeyword: RawUnexpectedNodesSyntax? = nil,
19901+
bindingKeyword: RawTokenSyntax,
19902+
_ unexpectedBetweenBindingKeywordAndBindings: RawUnexpectedNodesSyntax? = nil,
1990319903
bindings: RawPatternBindingListSyntax,
1990419904
_ unexpectedAfterBindings: RawUnexpectedNodesSyntax? = nil,
1990519905
arena: __shared SyntaxArena
@@ -19911,9 +19911,9 @@ public struct RawVariableDeclSyntax: RawDeclSyntaxNodeProtocol {
1991119911
layout[1] = attributes?.raw
1991219912
layout[2] = unexpectedBetweenAttributesAndModifiers?.raw
1991319913
layout[3] = modifiers?.raw
19914-
layout[4] = unexpectedBetweenModifiersAndLetOrVarKeyword?.raw
19915-
layout[5] = letOrVarKeyword.raw
19916-
layout[6] = unexpectedBetweenLetOrVarKeywordAndBindings?.raw
19914+
layout[4] = unexpectedBetweenModifiersAndBindingKeyword?.raw
19915+
layout[5] = bindingKeyword.raw
19916+
layout[6] = unexpectedBetweenBindingKeywordAndBindings?.raw
1991719917
layout[7] = bindings.raw
1991819918
layout[8] = unexpectedAfterBindings?.raw
1991919919
}
@@ -19936,15 +19936,15 @@ public struct RawVariableDeclSyntax: RawDeclSyntaxNodeProtocol {
1993619936
layoutView.children[3].map(RawModifierListSyntax.init(raw:))
1993719937
}
1993819938

19939-
public var unexpectedBetweenModifiersAndLetOrVarKeyword: RawUnexpectedNodesSyntax? {
19939+
public var unexpectedBetweenModifiersAndBindingKeyword: RawUnexpectedNodesSyntax? {
1994019940
layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
1994119941
}
1994219942

19943-
public var letOrVarKeyword: RawTokenSyntax {
19943+
public var bindingKeyword: RawTokenSyntax {
1994419944
layoutView.children[5].map(RawTokenSyntax.init(raw:))!
1994519945
}
1994619946

19947-
public var unexpectedBetweenLetOrVarKeywordAndBindings: RawUnexpectedNodesSyntax? {
19947+
public var unexpectedBetweenBindingKeywordAndBindings: RawUnexpectedNodesSyntax? {
1994819948
layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
1994919949
}
1995019950

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxDeclNodes.swift‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7303,9 +7303,9 @@ public struct VariableDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
73037303
attributes: AttributeListSyntax? = nil,
73047304
_ unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil,
73057305
modifiers: ModifierListSyntax? = nil,
7306-
_ unexpectedBetweenModifiersAndLetOrVarKeyword: UnexpectedNodesSyntax? = nil,
7307-
letOrVarKeyword: TokenSyntax,
7308-
_ unexpectedBetweenLetOrVarKeywordAndBindings: UnexpectedNodesSyntax? = nil,
7306+
_ unexpectedBetweenModifiersAndBindingKeyword: UnexpectedNodesSyntax? = nil,
7307+
bindingKeyword: TokenSyntax,
7308+
_ unexpectedBetweenBindingKeywordAndBindings: UnexpectedNodesSyntax? = nil,
73097309
bindings: PatternBindingListSyntax,
73107310
_ unexpectedAfterBindings: UnexpectedNodesSyntax? = nil,
73117311
trailingTrivia: Trivia? = nil
@@ -7318,9 +7318,9 @@ public struct VariableDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
73187318
attributes,
73197319
unexpectedBetweenAttributesAndModifiers,
73207320
modifiers,
7321-
unexpectedBetweenModifiersAndLetOrVarKeyword,
7322-
letOrVarKeyword,
7323-
unexpectedBetweenLetOrVarKeywordAndBindings,
7321+
unexpectedBetweenModifiersAndBindingKeyword,
7322+
bindingKeyword,
7323+
unexpectedBetweenBindingKeywordAndBindings,
73247324
bindings,
73257325
unexpectedAfterBindings
73267326
))) {(arena, _) in
@@ -7329,9 +7329,9 @@ public struct VariableDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
73297329
attributes?.raw,
73307330
unexpectedBetweenAttributesAndModifiers?.raw,
73317331
modifiers?.raw,
7332-
unexpectedBetweenModifiersAndLetOrVarKeyword?.raw,
7333-
letOrVarKeyword.raw,
7334-
unexpectedBetweenLetOrVarKeywordAndBindings?.raw,
7332+
unexpectedBetweenModifiersAndBindingKeyword?.raw,
7333+
bindingKeyword.raw,
7334+
unexpectedBetweenBindingKeywordAndBindings?.raw,
73357335
bindings.raw,
73367336
unexpectedAfterBindings?.raw
73377337
]
@@ -7421,7 +7421,7 @@ public struct VariableDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
74217421
return VariableDeclSyntax(newData)
74227422
}
74237423

7424-
public var unexpectedBetweenModifiersAndLetOrVarKeyword: UnexpectedNodesSyntax? {
7424+
public var unexpectedBetweenModifiersAndBindingKeyword: UnexpectedNodesSyntax? {
74257425
get {
74267426
return data.child(at: 4, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
74277427
}
@@ -7430,7 +7430,7 @@ public struct VariableDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
74307430
}
74317431
}
74327432

7433-
public var letOrVarKeyword: TokenSyntax {
7433+
public var bindingKeyword: TokenSyntax {
74347434
get {
74357435
return TokenSyntax(data.child(at: 5, parent: Syntax(self))!)
74367436
}
@@ -7439,7 +7439,7 @@ public struct VariableDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
74397439
}
74407440
}
74417441

7442-
public var unexpectedBetweenLetOrVarKeywordAndBindings: UnexpectedNodesSyntax? {
7442+
public var unexpectedBetweenBindingKeywordAndBindings: UnexpectedNodesSyntax? {
74437443
get {
74447444
return data.child(at: 6, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
74457445
}
@@ -7491,9 +7491,9 @@ public struct VariableDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
74917491
\Self.attributes,
74927492
\Self.unexpectedBetweenAttributesAndModifiers,
74937493
\Self.modifiers,
7494-
\Self.unexpectedBetweenModifiersAndLetOrVarKeyword,
7495-
\Self.letOrVarKeyword,
7496-
\Self.unexpectedBetweenLetOrVarKeywordAndBindings,
7494+
\Self.unexpectedBetweenModifiersAndBindingKeyword,
7495+
\Self.bindingKeyword,
7496+
\Self.unexpectedBetweenBindingKeywordAndBindings,
74977497
\Self.bindings,
74987498
\Self.unexpectedAfterBindings
74997499
])
@@ -7532,9 +7532,9 @@ extension VariableDeclSyntax: CustomReflectable {
75327532
"attributes": attributes.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
75337533
"unexpectedBetweenAttributesAndModifiers": unexpectedBetweenAttributesAndModifiers.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
75347534
"modifiers": modifiers.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
7535-
"unexpectedBetweenModifiersAndLetOrVarKeyword": unexpectedBetweenModifiersAndLetOrVarKeyword.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
7536-
"letOrVarKeyword": Syntax(letOrVarKeyword).asProtocol(SyntaxProtocol.self),
7537-
"unexpectedBetweenLetOrVarKeywordAndBindings": unexpectedBetweenLetOrVarKeywordAndBindings.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
7535+
"unexpectedBetweenModifiersAndBindingKeyword": unexpectedBetweenModifiersAndBindingKeyword.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
7536+
"bindingKeyword": Syntax(bindingKeyword).asProtocol(SyntaxProtocol.self),
7537+
"unexpectedBetweenBindingKeywordAndBindings": unexpectedBetweenBindingKeywordAndBindings.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any ,
75387538
"bindings": Syntax(bindings).asProtocol(SyntaxProtocol.self),
75397539
"unexpectedAfterBindings": unexpectedAfterBindings.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any
75407540
])

0 commit comments

Comments
 (0)