Merge pull request #190 from owenv/catch_proposal_updates

Update gyb generated files for multi-pattern catch clauses (SE-0276)

Author: DougGregor

Sources/SwiftSyntax/gyb_generated/Misc.swift

@@ -1041,6 +1041,12 @@ extension SyntaxNode {
     return CaseItemListSyntax(asSyntaxData)
   }
 
+  public var isCatchItemList: Bool { return raw.kind == .catchItemList }
+  public var asCatchItemList: CatchItemListSyntax? {
+    guard isCatchItemList else { return nil }
+    return CatchItemListSyntax(asSyntaxData)
+  }
+
   public var isConditionElement: Bool { return raw.kind == .conditionElement }
   public var asConditionElement: ConditionElementSyntax? {
     guard isConditionElement else { return nil }
@@ -1119,6 +1125,12 @@ extension SyntaxNode {
     return CaseItemSyntax(asSyntaxData)
   }
 
+  public var isCatchItem: Bool { return raw.kind == .catchItem }
+  public var asCatchItem: CatchItemSyntax? {
+    guard isCatchItem else { return nil }
+    return CatchItemSyntax(asSyntaxData)
+  }
+
   public var isSwitchCaseLabel: Bool { return raw.kind == .switchCaseLabel }
   public var asSwitchCaseLabel: SwitchCaseLabelSyntax? {
     guard isSwitchCaseLabel else { return nil }
@@ -1775,6 +1787,8 @@ extension Syntax {
       return node
     case .caseItemList(let node):
       return node
+    case .catchItemList(let node):
+      return node
     case .conditionElement(let node):
       return node
     case .availabilityCondition(let node):
@@ -1801,6 +1815,8 @@ extension Syntax {
       return node
     case .caseItem(let node):
       return node
+    case .catchItem(let node):
+      return node
     case .switchCaseLabel(let node):
       return node
     case .catchClause(let node):
@@ -1904,6 +1920,6 @@ extension Syntax {
 extension SyntaxParser {
   static func verifyNodeDeclarationHash() -> Bool {
     return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
-      "-7765007021548643080"
+      "-1461032627210044719"
   }
 }

Sources/SwiftSyntax/gyb_generated/SyntaxAnyVisitor.swift

@@ -1254,6 +1254,13 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
   override open func visitPost(_ node: CaseItemListSyntax) {
     visitAnyPost(node._syntaxNode)
   }
+  override open func visit(_ node: CatchItemListSyntax) -> SyntaxVisitorContinueKind {
+    return visitAny(node._syntaxNode)
+  }
+
+  override open func visitPost(_ node: CatchItemListSyntax) {
+    visitAnyPost(node._syntaxNode)
+  }
   override open func visit(_ node: ConditionElementSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }
@@ -1345,6 +1352,13 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
   override open func visitPost(_ node: CaseItemSyntax) {
     visitAnyPost(node._syntaxNode)
   }
+  override open func visit(_ node: CatchItemSyntax) -> SyntaxVisitorContinueKind {
+    return visitAny(node._syntaxNode)
+  }
+
+  override open func visitPost(_ node: CatchItemSyntax) {
+    visitAnyPost(node._syntaxNode)
+  }
   override open func visit(_ node: SwitchCaseLabelSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }

Sources/SwiftSyntax/gyb_generated/SyntaxBuilders.swift

@@ -8186,6 +8186,51 @@ extension CaseItemSyntax {
   }
 }
 
+public struct CatchItemSyntaxBuilder {
+  private var layout =
+    Array<RawSyntax?>(repeating: nil, count: 3)
+
+  internal init() {}
+
+  public mutating func usePattern(_ node: PatternSyntax) {
+    let idx = CatchItemSyntax.Cursor.pattern.rawValue
+    layout[idx] = node.raw
+  }
+
+  public mutating func useWhereClause(_ node: WhereClauseSyntax) {
+    let idx = CatchItemSyntax.Cursor.whereClause.rawValue
+    layout[idx] = node.raw
+  }
+
+  public mutating func useTrailingComma(_ node: TokenSyntax) {
+    let idx = CatchItemSyntax.Cursor.trailingComma.rawValue
+    layout[idx] = node.raw
+  }
+
+  internal mutating func buildData() -> SyntaxData {
+
+    return .forRoot(RawSyntax.createAndCalcLength(kind: .catchItem,
+      layout: layout, presence: .present))
+  }
+}
+
+extension CatchItemSyntax {
+  /// Creates a `CatchItemSyntax` using the provided build function.
+  /// - Parameter:
+  ///   - build: A closure that wil be invoked in order to initialize
+  ///            the fields of the syntax node.
+  ///            This closure is passed a `CatchItemSyntaxBuilder` which you can use to
+  ///            incrementally build the structure of the node.
+  /// - Returns: A `CatchItemSyntax` with all the fields populated in the builder
+  ///            closure.
+  public init(_ build: (inout CatchItemSyntaxBuilder) -> Void) {
+    var builder = CatchItemSyntaxBuilder()
+    build(&builder)
+    let data = builder.buildData()
+    self.init(data)
+  }
+}
+
 public struct SwitchCaseLabelSyntaxBuilder {
   private var layout =
     Array<RawSyntax?>(repeating: nil, count: 3)
@@ -8248,7 +8293,7 @@ extension SwitchCaseLabelSyntax {
 
 public struct CatchClauseSyntaxBuilder {
   private var layout =
-    Array<RawSyntax?>(repeating: nil, count: 4)
+    Array<RawSyntax?>(repeating: nil, count: 3)
 
   internal init() {}
 
@@ -8257,14 +8302,15 @@ public struct CatchClauseSyntaxBuilder {
     layout[idx] = node.raw
   }
 
-  public mutating func usePattern(_ node: PatternSyntax) {
-    let idx = CatchClauseSyntax.Cursor.pattern.rawValue
-    layout[idx] = node.raw
-  }
-
-  public mutating func useWhereClause(_ node: WhereClauseSyntax) {
-    let idx = CatchClauseSyntax.Cursor.whereClause.rawValue
-    layout[idx] = node.raw
+  public mutating func addCatchItem(_ elt: CatchItemSyntax) {
+    let idx = CatchClauseSyntax.Cursor.catchItems.rawValue
+    if let list = layout[idx] {
+      layout[idx] = list.appending(elt.raw)
+    } else {
+      layout[idx] = RawSyntax.create(kind: SyntaxKind.catchItemList,
+        layout: [elt.raw], length: elt.raw.totalLength,
+        presence: SourcePresence.present)
+    }
   }
 
   public mutating func useBody(_ node: CodeBlockSyntax) {
@@ -8276,8 +8322,8 @@ public struct CatchClauseSyntaxBuilder {
     if (layout[0] == nil) {
       layout[0] = RawSyntax.missingToken(TokenKind.catchKeyword)
     }
-    if (layout[3] == nil) {
-      layout[3] = RawSyntax.missing(SyntaxKind.codeBlock)
+    if (layout[2] == nil) {
+      layout[2] = RawSyntax.missing(SyntaxKind.codeBlock)
     }
 
     return .forRoot(RawSyntax.createAndCalcLength(kind: .catchClause,