SwiftSyntax: Add LabeledSyntax trait. NFC

This commit also adds several "WithTrailingComma" I've missed in the
previous commit.

Author: nkcsgexi

utils/gyb_syntax_support/GenericNodes.py

@@ -15,6 +15,7 @@
 
     # same-type-requirement -> type-identifier == type
     Node('SameTypeRequirement', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('LeftTypeIdentifier', kind='Type'),
              Child('EqualityToken', kind='Token',
@@ -34,6 +35,7 @@
     #                    | type-name : type-identifier
     #                    | type-name : protocol-composition-type
     Node('GenericParameter', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('Attributes', kind='AttributeList',
                    is_optional=True),
@@ -56,6 +58,7 @@
 
     # conformance-requirement -> type-identifier : type-identifier
     Node('ConformanceRequirement', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('LeftTypeIdentifier', kind='Type'),
              Child('Colon', kind='ColonToken'),

utils/gyb_syntax_support/PatternNodes.py

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

utils/gyb_syntax_support/StmtNodes.py

@@ -12,7 +12,7 @@
 
     # while-stmt -> label? ':'? 'while' condition-list code-block ';'?
     Node('WhileStmt', kind='Stmt',
-         traits=['WithCodeBlock'],
+         traits=['WithCodeBlock', 'Labeled'],
          children=[
              Child('LabelName', kind='IdentifierToken',
                    is_optional=True),
@@ -43,7 +43,7 @@
 
     # repeat-while-stmt -> label? ':'? 'repeat' code-block 'while' expr ';'?
     Node('RepeatWhileStmt', kind='Stmt',
-         traits=['WithCodeBlock'],
+         traits=['WithCodeBlock', 'Labeled'],
          children=[
              Child('LabelName', kind='IdentifierToken',
                    is_optional=True),
@@ -74,7 +74,7 @@
     # for-in-stmt -> label? ':'? 'for' 'case'? pattern 'in' expr 'where'?
     #   expr code-block ';'?
     Node('ForInStmt', kind='Stmt',
-         traits=['WithCodeBlock'],
+         traits=['WithCodeBlock', 'Labeled'],
          children=[
              Child('LabelName', kind='IdentifierToken',
                    is_optional=True),
@@ -96,7 +96,7 @@
     # switch-stmt -> identifier? ':'? 'switch' expr '{'
     #   switch-case-list '}' ';'?
     Node('SwitchStmt', kind='Stmt',
-         traits=['Braced'],
+         traits=['Braced', 'Labeled'],
          children=[
              Child('LabelName', kind='IdentifierToken',
                    is_optional=True),
@@ -115,7 +115,7 @@
 
     # do-stmt -> identifier? ':'? 'do' code-block catch-clause-list ';'?
     Node('DoStmt', kind='Stmt',
-         traits=['WithCodeBlock'],
+         traits=['WithCodeBlock', 'Labeled'],
          children=[
              Child('LabelName', kind='IdentifierToken',
                    is_optional=True),
@@ -219,7 +219,7 @@
     # if-stmt -> identifier? ':'? 'if' condition-list code-block
     #   else-clause ';'?
     Node('IfStmt', kind='Stmt',
-         traits=['WithCodeBlock'],
+         traits=['WithCodeBlock', 'Labeled'],
          children=[
              Child('LabelName', kind='IdentifierToken',
                    is_optional=True),

utils/gyb_syntax_support/Traits.py

@@ -41,5 +41,11 @@ def __init__(self, trait_name, children):
     Trait('WithTrailingComma',
           children=[
               Child('TrailingComma', kind='CommaToken', is_optional=True),
-          ])
+          ]),
+
+    Trait('Labeled',
+          children=[
+              Child('LabelName', kind='IdentifierToken', is_optional=True),
+              Child('LabelColon', kind='ColonToken', is_optional=True),
+          ]),
 ]

utils/gyb_syntax_support/TypeNodes.py

@@ -101,6 +101,7 @@
 
     # tuple-type-element -> identifier? ':'? type-annotation ','?
     Node('TupleTypeElement', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('InOut', kind='InOutToken',
                    is_optional=True),
@@ -180,6 +181,7 @@
     # Dictionary<Int, String>
     #            ^~~~ ^~~~~~
     Node('GenericArgument', kind='Syntax',
+         traits=['WithTrailingComma'],
          children=[
              Child('ArgumentType', kind='Type'),
              Child('TrailingComma', kind='CommaToken',