SwiftSyntax: Add ParenthesizedSyntax trait and mark various syntax nodes for conformances. NFC

Author: nkcsgexi

utils/gyb_syntax_support/DeclNodes.py

@@ -56,6 +56,7 @@
          element='FunctionParameter'),
 
     Node('ParameterClause', kind='Syntax',
+         traits=['Parenthesized'],
          children=[
              Child('LeftParen', kind='LeftParenToken'),
              Child('ParameterList', kind='FunctionParameterList'),
@@ -106,19 +107,21 @@
          ]),
 
     Node('PoundErrorDecl', kind='Decl',
+         traits=['Parenthesized'],
          children=[
              Child('PoundError', kind='PoundErrorToken'),
-             Child('LeftParenToken', kind='LeftParenToken'),
+             Child('LeftParen', kind='LeftParenToken'),
              Child('Message', kind='StringLiteralExpr'),
-             Child('RightParenToken', kind='RightParenToken')
+             Child('RightParen', kind='RightParenToken')
          ]),
 
     Node('PoundWarningDecl', kind='Decl',
+         traits=['Parenthesized'],
          children=[
              Child('PoundWarning', kind='PoundWarningToken'),
-             Child('LeftParenToken', kind='LeftParenToken'),
+             Child('LeftParen', kind='LeftParenToken'),
              Child('Message', kind='StringLiteralExpr'),
-             Child('RightParenToken', kind='RightParenToken')
+             Child('RightParen', kind='RightParenToken')
          ]),
 
     Node('DeclModifier', kind='Syntax',
@@ -416,11 +419,11 @@
     Node('AccessLevelModifier', kind='Syntax',
          children=[
              Child('Name', kind='IdentifierToken'),
-             Child('OpenParen', kind='LeftParenToken',
+             Child('LeftParen', kind='LeftParenToken',
                    is_optional=True),
              Child('Modifier', kind='IdentifierToken',
                    is_optional=True),
-             Child('CloseParen', kind='RightParenToken',
+             Child('RightParen', kind='RightParenToken',
                    is_optional=True),
          ]),
 
@@ -447,6 +450,7 @@
 
     # (value)
     Node('AccessorParameter', kind='Syntax',
+         traits=['Parenthesized'],
          children=[
              Child('LeftParen', kind='LeftParenToken'),
              Child('Name', kind='IdentifierToken'),

utils/gyb_syntax_support/ExprNodes.py

@@ -59,6 +59,7 @@
     Node('DeclNameArgumentList', kind='SyntaxCollection',
          element='DeclNameArgument'),
     Node('DeclNameArguments', kind='Syntax',
+         traits=['Parenthesized'],
          children=[
              Child('LeftParen', kind='LeftParenToken'),
              Child('Arguments', kind='DeclNameArgumentList'),
@@ -181,6 +182,7 @@
          ]),
 
     Node('TupleExpr', kind='Expr',
+         traits=['Parenthesized'],
          children=[
              Child('LeftParen', kind='LeftParenToken'),
              Child('ElementList', kind='TupleElementList'),
@@ -459,6 +461,7 @@
 
     # expression segment in a string interpolation expression.
     Node('ExpressionSegment', kind='Syntax',
+         traits=['Parenthesized'],
          children=[
              Child('Backslash', kind='BackslashToken'),
              Child('LeftParen', kind='LeftParenToken'),
@@ -501,6 +504,7 @@
 
     # e.g. "#keyPath(a.b.c)"
     Node('ObjcKeyPathExpr', kind='Expr',
+         traits=['Parenthesized'],
          children=[
              Child('KeyPath', kind='PoundKeyPathToken'),
              Child('LeftParen', kind='LeftParenToken'),
@@ -515,6 +519,7 @@
          ]),
     # #fileLiteral(a, b, c)
     Node('ObjectLiteralExpr', kind='Expr',
+         traits=['Parenthesized'],
          children=[
              Child('Identifier', kind='Token',
                    token_choices=[

utils/gyb_syntax_support/PatternNodes.py

@@ -51,10 +51,11 @@
 
     # tuple-pattern -> '(' tuple-pattern-element-list ')'
     Node('TuplePattern', kind='Pattern',
+         traits=['Parenthesized'],
          children=[
-             Child('OpenParen', kind='LeftParenToken'),
+             Child('LeftParen', kind='LeftParenToken'),
              Child('Elements', kind='TuplePatternElementList'),
-             Child('CloseParen', kind='RightParenToken'),
+             Child('RightParen', kind='RightParenToken'),
          ]),
 
     # wildcard-pattern -> '_' type-annotation?

utils/gyb_syntax_support/Traits.py

@@ -31,4 +31,10 @@ def __init__(self, trait_name, children):
           children=[
               Child('Body', kind='CodeBlock'),
           ]),
+
+    Trait('Parenthesized',
+          children=[
+              Child('LeftParen', kind='LeftParenToken'),
+              Child('RightParen', kind='RightParenToken'),
+          ]),
 ]

utils/gyb_syntax_support/TypeNodes.py

@@ -133,6 +133,7 @@
 
     # tuple-type -> '(' tuple-type-element-list ')'
     Node('TupleType', kind='Type',
+         traits=['Parenthesized'],
          children=[
              Child('LeftParen', kind='LeftParenToken'),
              Child('Elements', kind='TupleTypeElementList'),
@@ -143,6 +144,7 @@
     # function-type -> attribute-list '(' function-type-argument-list ')'
     #   throwing-specifier? '->'? type?
     Node('FunctionType', kind='Type',
+         traits=['Parenthesized'],
          children=[
              Child('LeftParen', kind='LeftParenToken'),
              Child('Arguments', kind='TupleTypeElementList'),