Merge pull request swiftlang#236 from DougGregor/concurrency-contextual-await

[Concurrency] Regenerate for 'await' being a contextual keyword.

Author: DougGregor

Sources/SwiftSyntax/gyb_generated/Misc.swift

@@ -1944,6 +1944,6 @@ extension Syntax {
 extension SyntaxParser {
   static func verifyNodeDeclarationHash() -> Bool {
     return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
-      "71bf2d5d9308cb7092ce3660702fe668381dbbab"
+      "26709743ccc5ea2001419f44996c8fa671901c03"
   }
 }

Sources/SwiftSyntax/gyb_generated/SyntaxBuilders.swift

@@ -274,7 +274,7 @@ public struct AwaitExprSyntaxBuilder {
 
   internal mutating func buildData() -> SyntaxData {
     if (layout[0] == nil) {
-      layout[0] = RawSyntax.missingToken(TokenKind.awaitKeyword)
+      layout[0] = RawSyntax.missingToken(TokenKind.identifier(""))
     }
     if (layout[1] == nil) {
       layout[1] = RawSyntax.missing(SyntaxKind.expr)

Sources/SwiftSyntax/gyb_generated/SyntaxClassification.swift

@@ -65,6 +65,8 @@ extension SyntaxClassification {
     // Separate checks for token nodes (most common checks) versus checks for layout nodes.
     if childKind == .token {
       switch (parentKind, indexInParent) {
+      case (.awaitExpr, 0):
+        return (.keyword, false)
       case (.arrowExpr, 0):
         return (.keyword, false)
       case (.closureSignature, 2):
@@ -220,8 +222,6 @@ extension RawTokenKind {
       return .keyword
     case .throwsKeyword:
       return .keyword
-    case .awaitKeyword:
-      return .keyword
     case .__file__Keyword:
       return .keyword
     case .__line__Keyword:

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

@@ -264,7 +264,7 @@ public enum SyntaxFactory {
   public static func makeBlankAwaitExpr() -> AwaitExprSyntax {
     let data = SyntaxData.forRoot(RawSyntax.create(kind: .awaitExpr,
       layout: [
-      RawSyntax.missingToken(TokenKind.awaitKeyword),
+      RawSyntax.missingToken(TokenKind.identifier("")),
       RawSyntax.missing(SyntaxKind.expr),
     ], length: .zero, presence: .present))
     return AwaitExprSyntax(data)
@@ -5066,12 +5066,6 @@ public enum SyntaxFactory {
                      leadingTrivia: leadingTrivia,
                      trailingTrivia: trailingTrivia)
   }
-  public static func makeAwaitKeyword(leadingTrivia: Trivia = [],
-    trailingTrivia: Trivia = []) -> TokenSyntax {
-    return makeToken(.awaitKeyword, presence: .present,
-                     leadingTrivia: leadingTrivia,
-                     trailingTrivia: trailingTrivia)
-  }
   public static func make__FILE__Keyword(leadingTrivia: Trivia = [],
     trailingTrivia: Trivia = []) -> TokenSyntax {
     return makeToken(.__file__Keyword, presence: .present,

Sources/SwiftSyntax/gyb_generated/TokenKind.swift

@@ -68,7 +68,6 @@ public enum TokenKind {
   case trueKeyword
   case tryKeyword
   case throwsKeyword
-  case awaitKeyword
   case __file__Keyword
   case __line__Keyword
   case __column__Keyword
@@ -196,7 +195,6 @@ public enum TokenKind {
     case .trueKeyword: return "true"
     case .tryKeyword: return "try"
     case .throwsKeyword: return "throws"
-    case .awaitKeyword: return "__await"
     case .__file__Keyword: return "__FILE__"
     case .__line__Keyword: return "__LINE__"
     case .__column__Keyword: return "__COLUMN__"
@@ -325,7 +323,6 @@ public enum TokenKind {
     case .trueKeyword: return true
     case .tryKeyword: return true
     case .throwsKeyword: return true
-    case .awaitKeyword: return true
     case .__file__Keyword: return true
     case .__line__Keyword: return true
     case .__column__Keyword: return true
@@ -454,7 +451,6 @@ public enum TokenKind {
     case .trueKeyword: return "kw_true"
     case .tryKeyword: return "kw_try"
     case .throwsKeyword: return "kw_throws"
-    case .awaitKeyword: return "kw___await"
     case .__file__Keyword: return "kw___FILE__"
     case .__line__Keyword: return "kw___LINE__"
     case .__column__Keyword: return "kw___COLUMN__"
@@ -583,7 +579,6 @@ public enum TokenKind {
     case .trueKeyword: return SourceLength(utf8Length: 4)
     case .tryKeyword: return SourceLength(utf8Length: 3)
     case .throwsKeyword: return SourceLength(utf8Length: 6)
-    case .awaitKeyword: return SourceLength(utf8Length: 7)
     case .__file__Keyword: return SourceLength(utf8Length: 8)
     case .__line__Keyword: return SourceLength(utf8Length: 8)
     case .__column__Keyword: return SourceLength(utf8Length: 10)
@@ -714,7 +709,6 @@ extension TokenKind: Equatable {
     case (.trueKeyword, .trueKeyword): return true
     case (.tryKeyword, .tryKeyword): return true
     case (.throwsKeyword, .throwsKeyword): return true
-    case (.awaitKeyword, .awaitKeyword): return true
     case (.__file__Keyword, .__file__Keyword): return true
     case (.__line__Keyword, .__line__Keyword): return true
     case (.__column__Keyword, .__column__Keyword): return true
@@ -913,8 +907,6 @@ extension TokenKind {
       return .tryKeyword
     case 53:
       return .throwsKeyword
-    case 123:
-      return .awaitKeyword
     case 54:
       return .__file__Keyword
     case 55:
@@ -1175,8 +1167,6 @@ extension TokenKind {
       return false
     case 53:
       return false
-    case 123:
-      return false
     case 54:
       return false
     case 55:
@@ -1377,7 +1367,6 @@ internal enum RawTokenKind: CTokenKind {
   case trueKeyword = 51
   case tryKeyword = 52
   case throwsKeyword = 53
-  case awaitKeyword = 123
   case __file__Keyword = 54
   case __line__Keyword = 55
   case __column__Keyword = 56
@@ -1619,9 +1608,6 @@ extension TokenKind {
     case .throwsKeyword:
       let length = 6
       return body(.init(kind: .throwsKeyword, length: length))
-    case .awaitKeyword:
-      let length = 7
-      return body(.init(kind: .awaitKeyword, length: length))
     case .__file__Keyword:
       let length = 8
       return body(.init(kind: .__file__Keyword, length: length))

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxExprNodes.swift

@@ -412,7 +412,7 @@ public struct AwaitExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   ///                   current `awaitKeyword`, if present.
   public func withAwaitKeyword(
     _ newChild: TokenSyntax?) -> AwaitExprSyntax {
-    let raw = newChild?.raw ?? RawSyntax.missingToken(TokenKind.awaitKeyword)
+    let raw = newChild?.raw ?? RawSyntax.missingToken(TokenKind.identifier(""))
     let newData = data.replacingChild(raw, at: Cursor.awaitKeyword)
     return AwaitExprSyntax(newData)
   }