adopt new syntax nodes for catch items

Author: owenv

lib/Parse/ParseStmt.cpp

@@ -1972,12 +1972,10 @@ ParserResult<CaseStmt> Parser::parseStmtCatch() {
   SmallVector<CaseLabelItem, 1> caseLabelItems;
 
   {
-    SyntaxParsingContext ListContext(SyntaxContext, SyntaxKind::CaseItemList);
+    SyntaxParsingContext ListContext(SyntaxContext, SyntaxKind::CatchItemList);
     bool isFirst = true;
     while (true) {
-      SyntaxParsingContext ItemContext(SyntaxContext, SyntaxKind::CaseItem);
-      //if (Tok.is(tok::l_brace))
-        //ItemContext.setDiscard()
+      SyntaxParsingContext ItemContext(SyntaxContext, SyntaxKind::CatchItem);
       GuardedPattern PatternResult;
       parseGuardedPattern(*this, PatternResult, status, boundDecls,
                           GuardedPatternContext::Catch, isFirst);

test/Syntax/Outputs/round_trip_parse_gen.swift.withkinds

@@ -328,11 +328,11 @@ do <CodeBlock>{<SwitchStmt>
 
 func statementTests<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{<DoStmt>
   do <CodeBlock>{
-  } </CodeBlock><CatchClause>catch <CaseItem><ExpressionPattern><TupleExpr>(<TupleExprElement><UnresolvedPatternExpr><ValueBindingPattern>var <IdentifierPattern>x</IdentifierPattern></ValueBindingPattern></UnresolvedPatternExpr>, </TupleExprElement><TupleExprElement><UnresolvedPatternExpr><ValueBindingPattern>let <IdentifierPattern>y</IdentifierPattern></ValueBindingPattern></UnresolvedPatternExpr></TupleExprElement>) </TupleExpr></ExpressionPattern></CaseItem><CodeBlock>{
-  } </CodeBlock></CatchClause><CatchClause>catch <CaseItem><WhereClause>where <BooleanLiteralExpr>false </BooleanLiteralExpr></WhereClause></CaseItem><CodeBlock>{
-  } </CodeBlock></CatchClause><CatchClause>catch <CaseItem><ValueBindingPattern>let <IdentifierPattern>e </IdentifierPattern></ValueBindingPattern><WhereClause>where <SequenceExpr><MemberAccessExpr><IdentifierExpr>e</IdentifierExpr>.foo </MemberAccessExpr><BinaryOperatorExpr>== </BinaryOperatorExpr><IdentifierExpr>bar </IdentifierExpr></SequenceExpr></WhereClause></CaseItem><CodeBlock>{
-  } </CodeBlock></CatchClause><CatchClause>catch <CaseItem><ExpressionPattern><FunctionCallExpr><MemberAccessExpr>.a</MemberAccessExpr>(<TupleExprElement><UnresolvedPatternExpr><ValueBindingPattern>let <IdentifierPattern>a</IdentifierPattern></ValueBindingPattern></UnresolvedPatternExpr></TupleExprElement>)</FunctionCallExpr></ExpressionPattern>, </CaseItem><CaseItem><ExpressionPattern><FunctionCallExpr><MemberAccessExpr>.b</MemberAccessExpr>(<TupleExprElement><UnresolvedPatternExpr><ValueBindingPattern>let <IdentifierPattern>b</IdentifierPattern></ValueBindingPattern></UnresolvedPatternExpr></TupleExprElement>) </FunctionCallExpr></ExpressionPattern><WhereClause>where <SequenceExpr><IdentifierExpr>b </IdentifierExpr><BinaryOperatorExpr>== </BinaryOperatorExpr><StringLiteralExpr>"<StringSegment></StringSegment>" </StringLiteralExpr></SequenceExpr></WhereClause></CaseItem><CodeBlock>{
-  } </CodeBlock></CatchClause><CatchClause>catch <CaseItem></CaseItem><CodeBlock>{
+  } </CodeBlock><CatchClause>catch <CatchItem><ExpressionPattern><TupleExpr>(<TupleExprElement><UnresolvedPatternExpr><ValueBindingPattern>var <IdentifierPattern>x</IdentifierPattern></ValueBindingPattern></UnresolvedPatternExpr>, </TupleExprElement><TupleExprElement><UnresolvedPatternExpr><ValueBindingPattern>let <IdentifierPattern>y</IdentifierPattern></ValueBindingPattern></UnresolvedPatternExpr></TupleExprElement>) </TupleExpr></ExpressionPattern></CatchItem><CodeBlock>{
+  } </CodeBlock></CatchClause><CatchClause>catch <CatchItem><WhereClause>where <BooleanLiteralExpr>false </BooleanLiteralExpr></WhereClause></CatchItem><CodeBlock>{
+  } </CodeBlock></CatchClause><CatchClause>catch <CatchItem><ValueBindingPattern>let <IdentifierPattern>e </IdentifierPattern></ValueBindingPattern><WhereClause>where <SequenceExpr><MemberAccessExpr><IdentifierExpr>e</IdentifierExpr>.foo </MemberAccessExpr><BinaryOperatorExpr>== </BinaryOperatorExpr><IdentifierExpr>bar </IdentifierExpr></SequenceExpr></WhereClause></CatchItem><CodeBlock>{
+  } </CodeBlock></CatchClause><CatchClause>catch <CatchItem><ExpressionPattern><FunctionCallExpr><MemberAccessExpr>.a</MemberAccessExpr>(<TupleExprElement><UnresolvedPatternExpr><ValueBindingPattern>let <IdentifierPattern>a</IdentifierPattern></ValueBindingPattern></UnresolvedPatternExpr></TupleExprElement>)</FunctionCallExpr></ExpressionPattern>, </CatchItem><CatchItem><ExpressionPattern><FunctionCallExpr><MemberAccessExpr>.b</MemberAccessExpr>(<TupleExprElement><UnresolvedPatternExpr><ValueBindingPattern>let <IdentifierPattern>b</IdentifierPattern></ValueBindingPattern></UnresolvedPatternExpr></TupleExprElement>) </FunctionCallExpr></ExpressionPattern><WhereClause>where <SequenceExpr><IdentifierExpr>b </IdentifierExpr><BinaryOperatorExpr>== </BinaryOperatorExpr><StringLiteralExpr>"<StringSegment></StringSegment>" </StringLiteralExpr></SequenceExpr></WhereClause></CatchItem><CodeBlock>{
+  } </CodeBlock></CatchClause><CatchClause>catch <CatchItem></CatchItem><CodeBlock>{
   }</CodeBlock></CatchClause></DoStmt><RepeatWhileStmt>
   repeat <CodeBlock>{ } </CodeBlock>while <BooleanLiteralExpr>true</BooleanLiteralExpr></RepeatWhileStmt><RepeatWhileStmt>
   LABEL: repeat <CodeBlock>{ } </CodeBlock>while <BooleanLiteralExpr>false</BooleanLiteralExpr></RepeatWhileStmt><WhileStmt>

utils/gyb_syntax_support/StmtNodes.py

@@ -176,6 +176,10 @@
     # case-item-list -> case-item case-item-list?
     Node('CaseItemList', kind='SyntaxCollection',
          element='CaseItem'),
+         
+    # catch-item-list -> catch-item catch-item-list?
+    Node('CatchItemList', kind='SyntaxCollection',
+         element='CatchItem'),
 
     # condition -> expression
     #            | availability-condition
@@ -304,8 +308,19 @@
              Child('Colon', kind='ColonToken'),
          ]),
 
-    # case-item -> pattern? where-clause? ','?
+    # case-item -> pattern where-clause? ','?
     Node('CaseItem', kind='Syntax',
+         traits=['WithTrailingComma'],
+         children=[
+             Child('Pattern', kind='Pattern'),
+             Child('WhereClause', kind='WhereClause',
+                   is_optional=True),
+             Child('TrailingComma', kind='CommaToken',
+                   is_optional=True),
+         ]),
+         
+    # catch-item -> pattern? where-clause? ','?
+    Node('CatchItem', kind='Syntax',
          traits=['WithTrailingComma'],
          children=[
              Child('Pattern', kind='Pattern', is_optional=True),
@@ -329,8 +344,8 @@
          traits=['WithCodeBlock'],
          children=[
              Child('CatchKeyword', kind='CatchToken'),
-             Child('CaseItems', kind='CaseItemList',
-             collection_element_name='CaseItem', is_optional=True),
+             Child('CatchItems', kind='CatchItemList',
+             collection_element_name='CatchItem', is_optional=True),
              Child('Body', kind='CodeBlock'),
          ]),