Merge pull request swiftlang#1538 from ahoppen/ahoppen/source-alteration-fixes

ahoppen · ahoppen · commit fe1d21ddbdfa · 2023-04-17T17:38:53.000-07:00
Fix parser failures found by source alteration in test cases
diff --git a/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift b/CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
@@ -332,7 +332,7 @@ public let DECL_NODES: [Node] = [
       ),
       Child(
         name: "Detail",
-        kind: .token(choices: [.token(tokenKind: "IdentifierToken"), .keyword(text: "set")])
+        kind: .token(choices: [.token(tokenKind: "IdentifierToken")])
       ),
       Child(
         name: "RightParen",
@@ -348,7 +348,44 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "Name",
-        kind: .token(choices: [.keyword(text: "class"), .keyword(text: "convenience"), .keyword(text: "dynamic"), .keyword(text: "final"), .keyword(text: "infix"), .keyword(text: "lazy"), .keyword(text: "optional"), .keyword(text: "override"), .keyword(text: "postfix"), .keyword(text: "prefix"), .keyword(text: "required"), .keyword(text: "static"), .keyword(text: "unowned"), .keyword(text: "weak"), .keyword(text: "private"), .keyword(text: "fileprivate"), .keyword(text: "internal"), .keyword(text: "public"), .keyword(text: "open"), .keyword(text: "mutating"), .keyword(text: "nonmutating"), .keyword(text: "indirect"), .keyword(text: "__consuming"), .keyword(text: "borrowing"), .keyword(text: "consuming"), .keyword(text: "actor"), .keyword(text: "async"), .keyword(text: "distributed"), .keyword(text: "isolated"), .keyword(text: "nonisolated"), .keyword(text: "_const"), .keyword(text: "_local"), .keyword(text: "package")]),
+        kind: .token(choices: [
+          .keyword(text: "__consuming"),
+          .keyword(text: "__setter_access"),
+          .keyword(text: "_const"),
+          .keyword(text: "_local"),
+          .keyword(text: "actor"),
+          .keyword(text: "async"),
+          .keyword(text: "borrowing"),
+          .keyword(text: "class"),
+          .keyword(text: "consuming"),
+          .keyword(text: "convenience"),
+          .keyword(text: "distributed"),
+          .keyword(text: "dynamic"),
+          .keyword(text: "fileprivate"),
+          .keyword(text: "final"),
+          .keyword(text: "indirect"),
+          .keyword(text: "infix"),
+          .keyword(text: "internal"),
+          .keyword(text: "isolated"),
+          .keyword(text: "lazy"),
+          .keyword(text: "mutating"),
+          .keyword(text: "nonisolated"),
+          .keyword(text: "nonmutating"),
+          .keyword(text: "open"),
+          .keyword(text: "optional"),
+          .keyword(text: "override"),
+          .keyword(text: "package"),
+          .keyword(text: "postfix"),
+          .keyword(text: "prefix"),
+          .keyword(text: "private"),
+          .keyword(text: "public"),
+          .keyword(text: "reasync"),
+          .keyword(text: "required"),
+          .keyword(text: "setter_access"),
+          .keyword(text: "static"),
+          .keyword(text: "unowned"),
+          .keyword(text: "weak"),
+        ]),
         classification: "Attribute"
       ),
       Child(
diff --git a/Sources/SwiftParser/Modifiers.swift b/Sources/SwiftParser/Modifiers.swift
@@ -99,11 +99,12 @@ extension Parser {
 extension Parser {
   mutating func parseModifierDetail() -> RawDeclModifierDetailSyntax {
     let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
-    let detailToken = self.consumeAnyToken()
+    let (unexpectedBeforeDetailToken, detailToken) = self.expect(.identifier, TokenSpec(.set, remapping: .identifier), default: .identifier)
     let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
     return RawDeclModifierDetailSyntax(
       unexpectedBeforeLeftParen,
       leftParen: leftParen,
+      unexpectedBeforeDetailToken,
       detail: detailToken,
       unexpectedBeforeRightParen,
       rightParen: rightParen,
diff --git a/Sources/SwiftParser/Specifiers.swift b/Sources/SwiftParser/Specifiers.swift
@@ -412,11 +412,11 @@ extension RawAccessorEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
 }
 
 extension TokenConsumer {
-  mutating func at<SpecSet1: TokenSpecSet, SpecSet2: TokenSpecSet>(anyIn specSet1: SpecSet1.Type, or specSet2: SpecSet2.Type) -> (TokenSpec, TokenConsumptionHandle)? {
+  mutating func at<SpecSet1: TokenSpecSet, SpecSet2: TokenSpecSet>(anyIn specSet1: SpecSet1.Type, or specSet2: SpecSet2.Type) -> (spec: TokenSpec, handle: TokenConsumptionHandle, matchedSubset: Any.Type)? {
     if let (spec, handle) = self.at(anyIn: specSet1) {
-      return (spec.spec, handle)
+      return (spec.spec, handle, SpecSet1.self)
     } else if let (spec, handle) = self.at(anyIn: specSet2) {
-      return (spec.spec, handle)
+      return (spec.spec, handle, SpecSet2.self)
     } else {
       return nil
     }
@@ -470,14 +470,14 @@ extension Parser {
 
     var unexpectedAfterThrowsLoopProgress = LoopProgressCondition()
     while unexpectedAfterThrowsLoopProgress.evaluate(self.currentToken) {
-      if let (_, handle) = self.at(anyIn: S.MisspelledAsyncSpecifiers.self, or: S.CorrectAsyncTokenKinds.self) {
+      if let (_, handle, _) = self.at(anyIn: S.MisspelledAsyncSpecifiers.self, or: S.CorrectAsyncTokenKinds.self) {
         let misspelledAsync = self.eat(handle)
         unexpectedAfterThrows.append(RawSyntax(misspelledAsync))
         if asyncKeyword == nil {
           // Handle `async` after `throws`
           asyncKeyword = missingToken(.keyword(.async))
         }
-      } else if let (_, handle) = self.at(anyIn: S.MisspelledThrowsTokenKinds.self, or: S.CorrectThrowsTokenKinds.self) {
+      } else if let (_, handle, _) = self.at(anyIn: S.MisspelledThrowsTokenKinds.self, or: S.CorrectThrowsTokenKinds.self) {
         let misspelledThrows = self.eat(handle)
         unexpectedAfterThrows.append(RawSyntax(misspelledThrows))
       } else {
@@ -521,17 +521,25 @@ extension Parser {
     var unexpected: [RawTokenSyntax] = []
     var loopProgress = LoopProgressCondition()
     while loopProgress.evaluate(self.currentToken) {
-      if let (spec, handle) = self.at(anyIn: S.MisspelledAsyncSpecifiers.self, or: S.CorrectAsyncTokenKinds.self) {
+      if let (spec, handle, matchedSubset) = self.at(anyIn: S.MisspelledAsyncSpecifiers.self, or: S.CorrectAsyncTokenKinds.self) {
         let misspelledAsync = self.eat(handle)
         unexpected.append(misspelledAsync)
         if effectSpecifiers?.asyncSpecifier == nil {
-          synthesizedAsync = missingToken(spec)
+          if matchedSubset == S.CorrectAsyncTokenKinds.self {
+            synthesizedAsync = missingToken(spec)
+          } else {
+            synthesizedAsync = missingToken(.async)
+          }
         }
-      } else if let (spec, handle) = self.at(anyIn: S.MisspelledThrowsTokenKinds.self, or: S.CorrectThrowsTokenKinds.self) {
+      } else if let (spec, handle, matchedSubset) = self.at(anyIn: S.MisspelledThrowsTokenKinds.self, or: S.CorrectThrowsTokenKinds.self) {
         let misspelledThrows = self.eat(handle)
         unexpected.append(misspelledThrows)
         if effectSpecifiers?.throwsSpecifier == nil {
-          synthesizedThrows = missingToken(spec)
+          if matchedSubset == S.CorrectThrowsTokenKinds.self {
+            synthesizedThrows = missingToken(spec)
+          } else {
+            synthesizedThrows = missingToken(.throws)
+          }
         }
       } else {
         break
diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift
@@ -807,39 +807,42 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
     assert(layout.count == 5)
     assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [
+            .keyword("__consuming"), 
+            .keyword("__setter_access"), 
+            .keyword("_const"), 
+            .keyword("_local"), 
+            .keyword("actor"), 
+            .keyword("async"), 
+            .keyword("borrowing"), 
             .keyword("class"), 
+            .keyword("consuming"), 
             .keyword("convenience"), 
+            .keyword("distributed"), 
             .keyword("dynamic"), 
+            .keyword("fileprivate"), 
             .keyword("final"), 
+            .keyword("indirect"), 
             .keyword("infix"), 
+            .keyword("internal"), 
+            .keyword("isolated"), 
             .keyword("lazy"), 
+            .keyword("mutating"), 
+            .keyword("nonisolated"), 
+            .keyword("nonmutating"), 
+            .keyword("open"), 
             .keyword("optional"), 
             .keyword("override"), 
+            .keyword("package"), 
             .keyword("postfix"), 
             .keyword("prefix"), 
+            .keyword("private"), 
+            .keyword("public"), 
+            .keyword("reasync"), 
             .keyword("required"), 
+            .keyword("setter_access"), 
             .keyword("static"), 
             .keyword("unowned"), 
-            .keyword("weak"), 
-            .keyword("private"), 
-            .keyword("fileprivate"), 
-            .keyword("internal"), 
-            .keyword("public"), 
-            .keyword("open"), 
-            .keyword("mutating"), 
-            .keyword("nonmutating"), 
-            .keyword("indirect"), 
-            .keyword("__consuming"), 
-            .keyword("borrowing"), 
-            .keyword("consuming"), 
-            .keyword("actor"), 
-            .keyword("async"), 
-            .keyword("distributed"), 
-            .keyword("isolated"), 
-            .keyword("nonisolated"), 
-            .keyword("_const"), 
-            .keyword("_local"), 
-            .keyword("package")
+            .keyword("weak")
           ]))
     assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 3, verify(layout[3], as: RawDeclModifierDetailSyntax?.self))
