Merge pull request #2079 from gottesmm/pr-400082eaa63991e6cdae229be5e30e6b83c38363

[reference-bindings] Small fixups as requested from @ahoppen's review.

Author: gottesmm

Sources/SwiftParser/Declarations.swift

@@ -210,7 +210,7 @@ extension Parser {
     // while recovering to the declaration start.
     let recoveryPrecedence = inMemberDeclList ? TokenPrecedence.closingBrace : nil
 
-    CanRecoverToSwitch: switch self.canRecoverTo(anyIn: DeclarationKeyword.self, overrideRecoveryPrecedence: recoveryPrecedence) {
+    switch self.canRecoverTo(anyIn: DeclarationKeyword.self, overrideRecoveryPrecedence: recoveryPrecedence) {
     case (.lhs(.import), let handle)?:
       return RawDeclSyntax(self.parseImportDeclaration(attrs, handle))
     case (.lhs(.class), let handle)?:
@@ -249,21 +249,12 @@ extension Parser {
       return RawDeclSyntax(self.parseMacroExpansionDeclaration(attrs, handle))
     case (.rhs(let binding), let handle)?:
       switch binding {
-      case ._mutating:
-        fallthrough
-      case ._borrowing:
-        fallthrough
-      case ._consuming:
+      case ._mutating, ._borrowing, ._consuming:
         guard experimentalFeatures.contains(.referenceBindings) else {
-          break CanRecoverToSwitch
+          break
         }
         fallthrough
-      case .let:
-        fallthrough
-      case .var:
-        fallthrough
-      case .inout:
-        // Handle all cases of `ValueBindingPatternSyntax.BindingSpecifierOptions` in the same way.
+      case .let, .var, .inout:
         return RawDeclSyntax(self.parseBindingDeclaration(attrs, handle, inMemberDeclList: inMemberDeclList))
       }
     case nil:

Sources/SwiftParser/Patterns.swift

@@ -88,21 +88,12 @@ extension Parser {
       )
     case (.rhs(let binding), let handle)?:
       switch binding {
-      case ._mutating:
-        fallthrough
-      case ._borrowing:
-        fallthrough
-      case ._consuming:
+      case ._mutating, ._borrowing, ._consuming:
         guard experimentalFeatures.contains(.referenceBindings) else {
           break
         }
         fallthrough
-      case .let:
-        fallthrough
-      case .var:
-        fallthrough
-      case .inout:
-        // Handle all cases of `ValueBindingPatternSyntax.BindingSpecifierOptions` in the same way.
+      case .let, .var, .inout:
         let bindingSpecifier = self.eat(handle)
         let value = self.parsePattern()
         return RawPatternSyntax(
@@ -225,7 +216,7 @@ extension Parser {
   /// for-in loops and guard clauses.
   mutating func parseMatchingPattern(context: PatternContext) -> RawPatternSyntax {
     // Parse productions that can only be patterns.
-    OuterSwitch: switch self.at(anyIn: MatchingPatternStart.self) {
+    switch self.at(anyIn: MatchingPatternStart.self) {
     case (.lhs(.is), let handle)?:
       let isKeyword = self.eat(handle)
       let type = self.parseType()
@@ -238,21 +229,12 @@ extension Parser {
       )
     case (.rhs(let binding), let handle)?:
       switch binding {
-      case ._mutating:
-        fallthrough
-      case ._borrowing:
-        fallthrough
-      case ._consuming:
+      case ._mutating, ._borrowing, ._consuming:
         guard experimentalFeatures.contains(.referenceBindings) else {
-          break OuterSwitch
+          break
         }
         fallthrough
-      case .let:
-        fallthrough
-      case .var:
-        fallthrough
-      case .inout:
-        // Handle all cases of `ValueBindingPatternSyntax.BindingSpecifierOptions` in the same way.
+      case .let, .var, .inout:
         let bindingSpecifier = self.eat(handle)
         let value = self.parseMatchingPattern(context: .bindingIntroducer)
         return RawPatternSyntax(
@@ -327,27 +309,19 @@ extension Parser.Lookahead {
       (.lhs(.wildcard), let handle)?:
       self.eat(handle)
       return true
+    case (.lhs(.leftParen), _)?:
+      return self.canParsePatternTuple()
     case (.rhs(let binding), let handle)?:
       switch binding {
-      case ._mutating:
-        fallthrough
-      case ._borrowing:
-        fallthrough
-      case ._consuming:
+      case ._mutating, ._borrowing, ._consuming:
         guard experimentalFeatures.contains(.referenceBindings) else {
           return false
         }
         fallthrough
-      case .let:
-        fallthrough
-      case .var:
-        fallthrough
-      case .inout:
+      case .let, .var, .inout:
         self.eat(handle)
         return self.canParsePattern()
       }
-    case (.lhs(.leftParen), _)?:
-      return self.canParsePatternTuple()
     case nil:
       return false
     }