[reference-bindings] Change the parser to refer to 'VariableBindings'…

… instead of 'letOrVar' in preparation for adding inout and borrow bindings.

CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift

@@ -791,7 +791,7 @@ public let DECL_NODES: [Node] = [
          Child(name: "Modifiers",
                kind: .collection(kind: "ModifierList", collectionElementName: "Modifier"),
                isOptional: true),
-         Child(name: "LetOrVarKeyword",
+         Child(name: "VariableBindingKeyword",
                kind: .token(choices: [.keyword(text: "let"), .keyword(text: "var")])),
          Child(name: "Bindings",
                kind: .collection(kind: "PatternBindingList", collectionElementName: "Binding"))

CodeGeneration/Sources/SyntaxSupport/gyb_generated/PatternNodes.swift

@@ -104,7 +104,7 @@ public let PATTERN_NODES: [Node] = [
        nameForDiagnostics: "value binding pattern",
        kind: "Pattern",
        children: [
-         Child(name: "LetOrVarKeyword",
+         Child(name: "VariableBindingKeyword",
                kind: .token(choices: [.keyword(text: "let"), .keyword(text: "var")])),
          Child(name: "ValuePattern",
                kind: .node(kind: "Pattern"))

CodeGeneration/Sources/SyntaxSupport/gyb_generated/StmtNodes.swift

@@ -295,7 +295,7 @@ public let STMT_NODES: [Node] = [
        nameForDiagnostics: "optional binding",
        kind: "Syntax",
        children: [
-         Child(name: "LetOrVarKeyword",
+         Child(name: "VariableBindingKeyword",
                kind: .token(choices: [.keyword(text: "let"), .keyword(text: "var")])),
          Child(name: "Pattern",
                kind: .node(kind: "Pattern")),

Sources/SwiftParser/Declarations.swift

@@ -242,7 +242,7 @@ extension Parser {
     case (.subscriptKeyword, let handle)?:
       return RawDeclSyntax(self.parseSubscriptDeclaration(attrs, handle))
     case (.letKeyword, let handle)?, (.varKeyword, let handle)?:
-      return RawDeclSyntax(self.parseLetOrVarDeclaration(attrs, handle, inMemberDeclList: inMemberDeclList))
+      return RawDeclSyntax(self.parseVariableBindingDeclaration(attrs, handle, inMemberDeclList: inMemberDeclList))
     case (.initKeyword, let handle)?:
       return RawDeclSyntax(self.parseInitializerDeclaration(attrs, handle))
     case (.deinitKeyword, let handle)?:
@@ -261,7 +261,7 @@ extension Parser {
         let isProbablyTupleDecl = self.at(.leftParen) && self.peek().rawTokenKind.is(any: [.identifier, .wildcard])
 
         if isProbablyVarDecl || isProbablyTupleDecl {
-          return RawDeclSyntax(self.parseLetOrVarDeclaration(attrs, .missing(.keyword(.var))))
+          return RawDeclSyntax(self.parseVariableBindingDeclaration(attrs, .missing(.keyword(.var))))
         }
 
         if self.currentToken.isEditorPlaceholder {
@@ -1433,7 +1433,7 @@ extension Parser {
   /// }
   /// ```
   @_spi(RawSyntax)
-  public mutating func parseLetOrVarDeclaration(
+  public mutating func parseVariableBindingDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle,
     inMemberDeclList: Bool = false
@@ -1533,7 +1533,7 @@ extension Parser {
       attributes: attrs.attributes,
       modifiers: attrs.modifiers,
       unexpectedBeforeIntroducer,
-      letOrVarKeyword: introducer,
+      variableBindingKeyword: introducer,
       bindings: RawPatternBindingListSyntax(elements: elements, arena: self.arena),
       arena: self.arena
     )

Sources/SwiftParser/Expressions.swift

@@ -80,11 +80,11 @@ extension Parser {
     /// ```
     /// case let x.y <- 'x' must refer to the base of some member access, y must refer to some pattern-compatible identfier
     /// ```
-    case letOrVar
+    case variableBinding
 
     var admitsBinding: Bool {
       switch self {
-      case .letOrVar:
+      case .variableBinding:
         return true
       case .none, .matching:
         return false
@@ -328,7 +328,7 @@ extension Parser {
 
     case (.equal, let handle)?:
       switch pattern {
-      case .matching, .letOrVar:
+      case .matching, .variableBinding:
         return nil
       case .none:
         let eq = self.eat(handle)

Sources/SwiftParser/Patterns.swift

@@ -121,11 +121,12 @@ extension Parser {
       )
     case (.letKeyword, let handle)?,
       (.varKeyword, let handle)?:
-      let letOrVar = self.eat(handle)
+      // 'let' or 'var'
+      let bindingKeyword = self.eat(handle)
       let value = self.parsePattern()
       return RawPatternSyntax(
         RawValueBindingPatternSyntax(
-          letOrVarKeyword: letOrVar,
+          variableBindingKeyword: bindingKeyword,
           valuePattern: value,
           arena: self.arena
         )
@@ -240,11 +241,12 @@ extension Parser {
     switch self.at(anyIn: MatchingPatternStart.self) {
     case (.varKeyword, let handle)?,
       (.letKeyword, let handle)?:
-      let letOrVar = self.eat(handle)
-      let value = self.parseMatchingPattern(context: .letOrVar)
+      // 'let' or 'var'
+      let bindingKeyword = self.eat(handle)
+      let value = self.parseMatchingPattern(context: .variableBinding)
       return RawPatternSyntax(
         RawValueBindingPatternSyntax(
-          letOrVarKeyword: letOrVar,
+          variableBindingKeyword: bindingKeyword,
           valuePattern: value,
           arena: self.arena
         )

Sources/SwiftParser/Statements.swift

@@ -251,9 +251,10 @@ extension Parser {
       let pattern = self.parseMatchingPattern(context: .matching)
       kind = .pattern(caseKeyword, pattern)
     } else {
-      let letOrVar = self.consumeAnyToken()
-      let pattern = self.parseMatchingPattern(context: .letOrVar)
-      kind = .optional(letOrVar, pattern)
+      // A 'let' or 'var'
+      let variableBinding = self.consumeAnyToken()
+      let pattern = self.parseMatchingPattern(context: .variableBinding)
+      kind = .optional(variableBinding, pattern)
     }
 
     // Now parse an optional type annotation.
@@ -285,10 +286,10 @@ extension Parser {
     }
 
     switch kind {
-    case let .optional(letOrVar, pattern):
+    case let .optional(variableBindingKeyword, pattern):
       return .optionalBinding(
         RawOptionalBindingConditionSyntax(
-          letOrVarKeyword: letOrVar,
+          variableBindingKeyword: variableBindingKeyword,
           pattern: pattern,
           typeAnnotation: annotation,
           initializer: initializer,

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -1044,7 +1044,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       return $0.initializer?.value.as(TryExprSyntax.self)?.tryKeyword
     })
     exchangeTokens(
-      unexpected: node.unexpectedBetweenModifiersAndLetOrVarKeyword,
+      unexpected: node.unexpectedBetweenModifiersAndVariableBindingKeyword,
       unexpectedTokenCondition: { $0.tokenKind == .keyword(.try) },
       correctTokens: missingTries,
       message: { _ in .tryOnInitialValueExpression },

Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift

@@ -9506,9 +9506,9 @@ public struct RawVariableDeclSyntax: RawDeclSyntaxNodeProtocol {
     attributes: RawAttributeListSyntax?,
     _ unexpectedBetweenAttributesAndModifiers: RawUnexpectedNodesSyntax? = nil,
     modifiers: RawModifierListSyntax?,
-    _ unexpectedBetweenModifiersAndLetOrVarKeyword: RawUnexpectedNodesSyntax? = nil,
-    letOrVarKeyword: RawTokenSyntax,
-    _ unexpectedBetweenLetOrVarKeywordAndBindings: RawUnexpectedNodesSyntax? = nil,
+    _ unexpectedBetweenModifiersAndVariableBindingKeyword: RawUnexpectedNodesSyntax? = nil,
+    variableBindingKeyword: RawTokenSyntax,
+    _ unexpectedBetweenVariableBindingKeywordAndBindings: RawUnexpectedNodesSyntax? = nil,
     bindings: RawPatternBindingListSyntax,
     _ unexpectedAfterBindings: RawUnexpectedNodesSyntax? = nil,
     arena: __shared SyntaxArena
@@ -9520,9 +9520,9 @@ public struct RawVariableDeclSyntax: RawDeclSyntaxNodeProtocol {
       layout[1] = attributes?.raw
       layout[2] = unexpectedBetweenAttributesAndModifiers?.raw
       layout[3] = modifiers?.raw
-      layout[4] = unexpectedBetweenModifiersAndLetOrVarKeyword?.raw
-      layout[5] = letOrVarKeyword.raw
-      layout[6] = unexpectedBetweenLetOrVarKeywordAndBindings?.raw
+      layout[4] = unexpectedBetweenModifiersAndVariableBindingKeyword?.raw
+      layout[5] = variableBindingKeyword.raw
+      layout[6] = unexpectedBetweenVariableBindingKeywordAndBindings?.raw
       layout[7] = bindings.raw
       layout[8] = unexpectedAfterBindings?.raw
     }
@@ -9541,13 +9541,13 @@ public struct RawVariableDeclSyntax: RawDeclSyntaxNodeProtocol {
   public var modifiers: RawModifierListSyntax? {
     layoutView.children[3].map(RawModifierListSyntax.init(raw:))
   }
-  public var unexpectedBetweenModifiersAndLetOrVarKeyword: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenModifiersAndVariableBindingKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[4].map(RawUnexpectedNodesSyntax.init(raw:))
   }
-  public var letOrVarKeyword: RawTokenSyntax {
+  public var variableBindingKeyword: RawTokenSyntax {
     layoutView.children[5].map(RawTokenSyntax.init(raw:))!
   }
-  public var unexpectedBetweenLetOrVarKeywordAndBindings: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenVariableBindingKeywordAndBindings: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var bindings: RawPatternBindingListSyntax {
@@ -14791,9 +14791,9 @@ public struct RawOptionalBindingConditionSyntax: RawSyntaxNodeProtocol {
   }
 
   public init(
-    _ unexpectedBeforeLetOrVarKeyword: RawUnexpectedNodesSyntax? = nil,
-    letOrVarKeyword: RawTokenSyntax,
-    _ unexpectedBetweenLetOrVarKeywordAndPattern: RawUnexpectedNodesSyntax? = nil,
+    _ unexpectedBeforeVariableBindingKeyword: RawUnexpectedNodesSyntax? = nil,
+    variableBindingKeyword: RawTokenSyntax,
+    _ unexpectedBetweenVariableBindingKeywordAndPattern: RawUnexpectedNodesSyntax? = nil,
     pattern: RawPatternSyntax,
     _ unexpectedBetweenPatternAndTypeAnnotation: RawUnexpectedNodesSyntax? = nil,
     typeAnnotation: RawTypeAnnotationSyntax?,
@@ -14805,9 +14805,9 @@ public struct RawOptionalBindingConditionSyntax: RawSyntaxNodeProtocol {
     let raw = RawSyntax.makeLayout(
       kind: .optionalBindingCondition, uninitializedCount: 9, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLetOrVarKeyword?.raw
-      layout[1] = letOrVarKeyword.raw
-      layout[2] = unexpectedBetweenLetOrVarKeywordAndPattern?.raw
+      layout[0] = unexpectedBeforeVariableBindingKeyword?.raw
+      layout[1] = variableBindingKeyword.raw
+      layout[2] = unexpectedBetweenVariableBindingKeywordAndPattern?.raw
       layout[3] = pattern.raw
       layout[4] = unexpectedBetweenPatternAndTypeAnnotation?.raw
       layout[5] = typeAnnotation?.raw
@@ -14818,13 +14818,13 @@ public struct RawOptionalBindingConditionSyntax: RawSyntaxNodeProtocol {
     self.init(raw: raw)
   }
 
-  public var unexpectedBeforeLetOrVarKeyword: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeVariableBindingKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
-  public var letOrVarKeyword: RawTokenSyntax {
+  public var variableBindingKeyword: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
-  public var unexpectedBetweenLetOrVarKeywordAndPattern: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenVariableBindingKeywordAndPattern: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var pattern: RawPatternSyntax {
@@ -17916,32 +17916,32 @@ public struct RawValueBindingPatternSyntax: RawPatternSyntaxNodeProtocol {
   }
 
   public init(
-    _ unexpectedBeforeLetOrVarKeyword: RawUnexpectedNodesSyntax? = nil,
-    letOrVarKeyword: RawTokenSyntax,
-    _ unexpectedBetweenLetOrVarKeywordAndValuePattern: RawUnexpectedNodesSyntax? = nil,
+    _ unexpectedBeforeVariableBindingKeyword: RawUnexpectedNodesSyntax? = nil,
+    variableBindingKeyword: RawTokenSyntax,
+    _ unexpectedBetweenVariableBindingKeywordAndValuePattern: RawUnexpectedNodesSyntax? = nil,
     valuePattern: RawPatternSyntax,
     _ unexpectedAfterValuePattern: RawUnexpectedNodesSyntax? = nil,
     arena: __shared SyntaxArena
   ) {
     let raw = RawSyntax.makeLayout(
       kind: .valueBindingPattern, uninitializedCount: 5, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeLetOrVarKeyword?.raw
-      layout[1] = letOrVarKeyword.raw
-      layout[2] = unexpectedBetweenLetOrVarKeywordAndValuePattern?.raw
+      layout[0] = unexpectedBeforeVariableBindingKeyword?.raw
+      layout[1] = variableBindingKeyword.raw
+      layout[2] = unexpectedBetweenVariableBindingKeywordAndValuePattern?.raw
       layout[3] = valuePattern.raw
       layout[4] = unexpectedAfterValuePattern?.raw
     }
     self.init(raw: raw)
   }
 
-  public var unexpectedBeforeLetOrVarKeyword: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforeVariableBindingKeyword: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
-  public var letOrVarKeyword: RawTokenSyntax {
+  public var variableBindingKeyword: RawTokenSyntax {
     layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
-  public var unexpectedBetweenLetOrVarKeywordAndValuePattern: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenVariableBindingKeywordAndValuePattern: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
   public var valuePattern: RawPatternSyntax {

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

@@ -4501,15 +4501,15 @@ public enum SyntaxFactory {
     }
   }
   @available(*, deprecated, message: "Use initializer on VariableDeclSyntax")
-  public static func makeVariableDecl(_ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil, attributes: AttributeListSyntax?, _ unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil, modifiers: ModifierListSyntax?, _ unexpectedBetweenModifiersAndLetOrVarKeyword: UnexpectedNodesSyntax? = nil, letOrVarKeyword: TokenSyntax, _ unexpectedBetweenLetOrVarKeywordAndBindings: UnexpectedNodesSyntax? = nil, bindings: PatternBindingListSyntax, _ unexpectedAfterBindings: UnexpectedNodesSyntax? = nil) -> VariableDeclSyntax {
+  public static func makeVariableDecl(_ unexpectedBeforeAttributes: UnexpectedNodesSyntax? = nil, attributes: AttributeListSyntax?, _ unexpectedBetweenAttributesAndModifiers: UnexpectedNodesSyntax? = nil, modifiers: ModifierListSyntax?, _ unexpectedBetweenModifiersAndVariableBindingKeyword: UnexpectedNodesSyntax? = nil, variableBindingKeyword: TokenSyntax, _ unexpectedBetweenVariableBindingKeywordAndBindings: UnexpectedNodesSyntax? = nil, bindings: PatternBindingListSyntax, _ unexpectedAfterBindings: UnexpectedNodesSyntax? = nil) -> VariableDeclSyntax {
     let layout: [RawSyntax?] = [
       unexpectedBeforeAttributes?.raw,
       attributes?.raw,
       unexpectedBetweenAttributesAndModifiers?.raw,
       modifiers?.raw,
-      unexpectedBetweenModifiersAndLetOrVarKeyword?.raw,
-      letOrVarKeyword.raw,
-      unexpectedBetweenLetOrVarKeywordAndBindings?.raw,
+      unexpectedBetweenModifiersAndVariableBindingKeyword?.raw,
+      variableBindingKeyword.raw,
+      unexpectedBetweenVariableBindingKeywordAndBindings?.raw,
       bindings.raw,
       unexpectedAfterBindings?.raw,
     ]
@@ -6912,11 +6912,11 @@ public enum SyntaxFactory {
     }
   }
   @available(*, deprecated, message: "Use initializer on OptionalBindingConditionSyntax")
-  public static func makeOptionalBindingCondition(_ unexpectedBeforeLetOrVarKeyword: UnexpectedNodesSyntax? = nil, letOrVarKeyword: TokenSyntax, _ unexpectedBetweenLetOrVarKeywordAndPattern: UnexpectedNodesSyntax? = nil, pattern: PatternSyntax, _ unexpectedBetweenPatternAndTypeAnnotation: UnexpectedNodesSyntax? = nil, typeAnnotation: TypeAnnotationSyntax?, _ unexpectedBetweenTypeAnnotationAndInitializer: UnexpectedNodesSyntax? = nil, initializer: InitializerClauseSyntax?, _ unexpectedAfterInitializer: UnexpectedNodesSyntax? = nil) -> OptionalBindingConditionSyntax {
+  public static func makeOptionalBindingCondition(_ unexpectedBeforeVariableBindingKeyword: UnexpectedNodesSyntax? = nil, variableBindingKeyword: TokenSyntax, _ unexpectedBetweenVariableBindingKeywordAndPattern: UnexpectedNodesSyntax? = nil, pattern: PatternSyntax, _ unexpectedBetweenPatternAndTypeAnnotation: UnexpectedNodesSyntax? = nil, typeAnnotation: TypeAnnotationSyntax?, _ unexpectedBetweenTypeAnnotationAndInitializer: UnexpectedNodesSyntax? = nil, initializer: InitializerClauseSyntax?, _ unexpectedAfterInitializer: UnexpectedNodesSyntax? = nil) -> OptionalBindingConditionSyntax {
     let layout: [RawSyntax?] = [
-      unexpectedBeforeLetOrVarKeyword?.raw,
-      letOrVarKeyword.raw,
-      unexpectedBetweenLetOrVarKeywordAndPattern?.raw,
+      unexpectedBeforeVariableBindingKeyword?.raw,
+      variableBindingKeyword.raw,
+      unexpectedBetweenVariableBindingKeywordAndPattern?.raw,
       pattern.raw,
       unexpectedBetweenPatternAndTypeAnnotation?.raw,
       typeAnnotation?.raw,
@@ -8460,11 +8460,11 @@ public enum SyntaxFactory {
     }
   }
   @available(*, deprecated, message: "Use initializer on ValueBindingPatternSyntax")
-  public static func makeValueBindingPattern(_ unexpectedBeforeLetOrVarKeyword: UnexpectedNodesSyntax? = nil, letOrVarKeyword: TokenSyntax, _ unexpectedBetweenLetOrVarKeywordAndValuePattern: UnexpectedNodesSyntax? = nil, valuePattern: PatternSyntax, _ unexpectedAfterValuePattern: UnexpectedNodesSyntax? = nil) -> ValueBindingPatternSyntax {
+  public static func makeValueBindingPattern(_ unexpectedBeforeVariableBindingKeyword: UnexpectedNodesSyntax? = nil, variableBindingKeyword: TokenSyntax, _ unexpectedBetweenVariableBindingKeywordAndValuePattern: UnexpectedNodesSyntax? = nil, valuePattern: PatternSyntax, _ unexpectedAfterValuePattern: UnexpectedNodesSyntax? = nil) -> ValueBindingPatternSyntax {
     let layout: [RawSyntax?] = [
-      unexpectedBeforeLetOrVarKeyword?.raw,
-      letOrVarKeyword.raw,
-      unexpectedBetweenLetOrVarKeywordAndValuePattern?.raw,
+      unexpectedBeforeVariableBindingKeyword?.raw,
+      variableBindingKeyword.raw,
+      unexpectedBetweenVariableBindingKeywordAndValuePattern?.raw,
       valuePattern.raw,
       unexpectedAfterValuePattern?.raw,
     ]