Merge pull request #14749 from nkcsgexi/some-branch

Author: swift-ci

utils/gyb_syntax_support/DeclNodes.py

@@ -138,6 +138,7 @@
          ]),
 
     Node('InheritedType', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
             Child('TypeName', kind='Type'),
             Child('TrailingComma', kind='CommaToken', is_optional=True),
@@ -269,6 +270,7 @@
     # external-parameter-name? local-parameter-name ':'
     #   type '...'? '='? expression? ','?
     Node('FunctionParameter', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('Attributes', kind='AttributeList',
                    is_optional=True),
@@ -483,6 +485,7 @@
 
     # Pattern: Type = Value { get {} },
     Node('PatternBinding', kind="Syntax",
+         traits=['WithTrailingComma'],
          children=[
              Child('Pattern', kind='Pattern'),
              Child('TypeAnnotation', kind='TypeAnnotation', is_optional=True),

utils/gyb_syntax_support/ExprNodes.py

@@ -220,6 +220,7 @@
 
     # function-call-argument -> label? ':'? expression ','?
     Node('FunctionCallArgument', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('Label', kind='IdentifierToken',
                    is_optional=True),
@@ -232,6 +233,7 @@
 
     # An element inside a tuple element list
     Node('TupleElement', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('Label', kind='IdentifierToken',
                    is_optional=True),
@@ -244,13 +246,15 @@
 
     # element inside an array expression: expression ','?
     Node('ArrayElement', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('Expression', kind='Expr'),
              Child('TrailingComma', kind='CommaToken', is_optional=True),
          ]),
 
     # element inside an array expression: expression ','?
     Node('DictionaryElement', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('KeyExpression', kind='Expr'),
              Child('Colon', kind='ColonToken'),
@@ -340,6 +344,7 @@
          ]),
 
     Node('ClosureCaptureItem', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child("Specifier", kind='TokenList', is_optional=True),
              Child("Name", kind='IdentifierToken', is_optional=True),
@@ -359,6 +364,7 @@
          ]),
 
     Node('ClosureParam', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('Name', kind='Token',
                    token_choices=[

utils/gyb_syntax_support/PatternNodes.py

@@ -68,13 +68,14 @@
 
     # tuple-pattern-element -> identifier? ':' pattern ','?
     Node('TuplePatternElement', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('LabelName', kind='IdentifierToken',
                    is_optional=True),
              Child('Colon', kind='ColonToken',
                    is_optional=True),
              Child('Pattern', kind='Pattern'),
-             Child('Comma', kind='CommaToken',
+             Child('TrailingComma', kind='CommaToken',
                    is_optional=True),
          ]),
 

utils/gyb_syntax_support/StmtNodes.py

@@ -158,6 +158,7 @@
     #            | case-condition
     #            | optional-binding-condition
     Node('ConditionElement', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('Condition', kind='Syntax',
                    node_choices=[
@@ -268,11 +269,12 @@
 
     # case-item -> pattern where-clause? ','?
     Node('CaseItem', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('Pattern', kind='Pattern'),
              Child('WhereClause', kind='WhereClause',
                    is_optional=True),
-             Child('Comma', kind='CommaToken',
+             Child('TrailingComma', kind='CommaToken',
                    is_optional=True),
          ]),
 

utils/gyb_syntax_support/Traits.py

@@ -37,4 +37,9 @@ def __init__(self, trait_name, children):
               Child('LeftParen', kind='LeftParenToken'),
               Child('RightParen', kind='RightParenToken'),
           ]),
+
+    Trait('WithTrailingComma',
+          children=[
+              Child('TrailingComma', kind='CommaToken', is_optional=True),
+          ])
 ]