SwiftSyntax: add WithStatementsSyntax trait and make all names consistent. NFC (#14782)

Author: nkcsgexi

lib/Parse/SyntaxParsingContext.cpp

@@ -250,7 +250,7 @@ void finalizeSourceFile(RootContextData &RootData,
   if (SF.hasSyntaxRoot()) {
     auto SourceRaw = SF.getSyntaxRoot().getRaw();
     auto Decls =
-        SourceRaw->getChild(SourceFileSyntax::Cursor::Items)->getLayout();
+        SourceRaw->getChild(SourceFileSyntax::Cursor::Statements)->getLayout();
     std::copy(Decls.begin(), Decls.end(), std::back_inserter(AllTopLevel));
     EOFToken = SourceRaw->getChild(SourceFileSyntax::Cursor::EOFToken);
   }

utils/gyb_syntax_support/CommonNodes.py

@@ -32,7 +32,7 @@
 
     # code-block -> '{' stmt-list '}'
     Node('CodeBlock', kind='Syntax',
-         traits=['Braced'],
+         traits=['Braced', 'WithStatements'],
          children=[
              Child('LeftBrace', kind='LeftBraceToken'),
              Child('Statements', kind='CodeBlockItemList'),

utils/gyb_syntax_support/DeclNodes.py

@@ -86,19 +86,21 @@
 
     # else-if-directive-clause -> '#elseif' expr stmt-list
     Node('ElseifDirectiveClause', kind='Syntax',
+         traits=['WithStatements'],
          children=[
              Child('PoundElseif', kind='PoundElseifToken'),
              Child('Condition', kind='Expr'),
-             Child('Body', kind='CodeBlockItemList'),
+             Child('Statements', kind='CodeBlockItemList'),
          ]),
 
     # if-config-decl -> '#if' expr stmt-list else-if-directive-clause-list
     #   else-clause? '#endif'
     Node('IfConfigDecl', kind='Decl',
+         traits=['WithStatements'],
          children=[
              Child('PoundIf', kind='PoundIfToken'),
              Child('Condition', kind='Expr'),
-             Child('Body', kind='CodeBlockItemList'),
+             Child('Statements', kind='CodeBlockItemList'),
              Child('ElseifDirectiveClauses', kind='ElseifDirectiveClauseList',
                    is_optional=True),
              Child('ElseClause', kind='ElseDirectiveClause',
@@ -254,8 +256,9 @@
 
     # source-file = code-block-item-list eof
     Node('SourceFile', kind='Syntax',
+         traits=['WithStatements'],
          children=[
-             Child('Items', kind='CodeBlockItemList'),
+             Child('Statements', kind='CodeBlockItemList'),
              Child('EOFToken', kind='EOFToken')
          ]),
 
@@ -408,9 +411,10 @@
 
     # else-directive-clause -> '#else' stmt-list
     Node('ElseDirectiveClause', kind='Syntax',
+         traits=['WithStatements'],
          children=[
              Child('PoundElse', kind='PoundElseToken'),
-             Child('Body', kind='CodeBlockItemList'),
+             Child('Statements', kind='CodeBlockItemList'),
          ]),
 
     # access-level-modifier -> 'private' | 'private' '(' 'set' ')'

utils/gyb_syntax_support/ExprNodes.py

@@ -392,7 +392,7 @@
          ]),
 
     Node('ClosureExpr', kind='Expr',
-         traits=['Braced'],
+         traits=['Braced', 'WithStatements'],
          children=[
              Child('LeftBrace', kind='LeftBraceToken'),
              Child('Signature', kind='ClosureSignature', is_optional=True),

utils/gyb_syntax_support/StmtNodes.py

@@ -255,9 +255,10 @@
     # switch-case -> switch-case-label stmt-list
     #              | default-label stmt-list
     Node('SwitchCase', kind='Syntax',
+         traits=['WithStatements'],
          children=[
              Child('Label', kind='Syntax'),
-             Child('Body', kind='CodeBlockItemList'),
+             Child('Statements', kind='CodeBlockItemList'),
          ]),
 
     # switch-default-label -> 'default' ':'

utils/gyb_syntax_support/Traits.py

@@ -48,4 +48,9 @@ def __init__(self, trait_name, children):
               Child('LabelName', kind='IdentifierToken', is_optional=True),
               Child('LabelColon', kind='ColonToken', is_optional=True),
           ]),
+
+    Trait('WithStatements',
+          children=[
+              Child('Statements', kind='CodeBlockItemList'),
+          ]),
 ]