Merge pull request #36726 from kimdv/kimdv/add-more-properties-to-help-gyb-for-swift-syntax

[libSyntax] Added helper variables and methods for SwiftSyntax gyb

Author: ahoppen

utils/gyb_syntax_support/Child.py

@@ -12,7 +12,8 @@ class Child(object):
     def __init__(self, name, kind, description=None, is_optional=False,
                  token_choices=None, text_choices=None, node_choices=None,
                  collection_element_name=None,
-                 classification=None, force_classification=False):
+                 classification=None, force_classification=False, 
+                 is_indented=False, requires_leading_newline=False):
         """
         If a classification is passed, it specifies the color identifiers in 
         that subtree should inherit for syntax coloring. Must be a member of 
@@ -29,6 +30,8 @@ def __init__(self, name, kind, description=None, is_optional=False,
         self.collection_element_name = collection_element_name
         self.classification = classification_by_name(classification)
         self.force_classification = force_classification
+        self.is_indented = is_indented
+        self.requires_leading_newline = requires_leading_newline
 
         # If the child has "token" anywhere in the kind, it's considered
         # a token node. Grab the existing reference to that token from the

utils/gyb_syntax_support/CommonNodes.py

@@ -39,15 +39,16 @@
 
     # code-block-item-list -> code-block-item code-block-item-list?
     Node('CodeBlockItemList', kind='SyntaxCollection',
-         element='CodeBlockItem'),
+         element='CodeBlockItem', elements_separated_by_newline=True),
 
     # code-block -> '{' stmt-list '}'
     Node('CodeBlock', kind='Syntax',
          traits=['Braced', 'WithStatements'],
          children=[
              Child('LeftBrace', kind='LeftBraceToken'),
              Child('Statements', kind='CodeBlockItemList',
-                   collection_element_name='Statement'),
-             Child('RightBrace', kind='RightBraceToken'),
+                   collection_element_name='Statement', is_indented=True),
+             Child('RightBrace', kind='RightBraceToken', 
+                   requires_leading_newline=True),
          ]),
 ]

utils/gyb_syntax_support/DeclNodes.py

@@ -288,13 +288,14 @@
          children=[
              Child('LeftBrace', kind='LeftBraceToken'),
              Child('Members', kind='MemberDeclList',
-                   collection_element_name='Member'),
-             Child('RightBrace', kind='RightBraceToken'),
+                   collection_element_name='Member', is_indented=True),
+             Child('RightBrace', kind='RightBraceToken', 
+                   requires_leading_newline=True),
          ]),
 
     # member-decl-list = member-decl member-decl-list?
     Node('MemberDeclList', kind='SyntaxCollection',
-         element='MemberDeclListItem'),
+         element='MemberDeclListItem', elements_separated_by_newline=True),
 
     # member-decl = decl ';'?
     Node('MemberDeclListItem', kind='Syntax', omit_when_empty=True,

utils/gyb_syntax_support/Node.py

@@ -19,7 +19,8 @@ class Node(object):
 
     def __init__(self, name, description=None, kind=None, traits=None,
                  children=None, element=None, element_name=None,
-                 element_choices=None, omit_when_empty=False):
+                 element_choices=None, omit_when_empty=False, 
+                 elements_separated_by_newline=False):
         self.syntax_kind = name
         self.swift_syntax_kind = lowercase_first_word(name)
         self.name = kind_to_type(self.syntax_kind)
@@ -47,6 +48,7 @@ def __init__(self, name, description=None, kind=None, traits=None,
         self.collection_element_name = element_name or self.collection_element
         self.collection_element_type = kind_to_type(self.collection_element)
         self.collection_element_choices = element_choices or []
+        self.elements_separated_by_newline = elements_separated_by_newline
 
     def is_base(self):
         """
@@ -86,3 +88,10 @@ def shall_be_omitted_when_empty(self):
         has no children.
         """
         return self.omit_when_empty
+
+    def is_token(self):
+        """
+        Returns true if this child has a token kind.
+        """
+        return 'Token' in self.syntax_kind or \
+            'Token' in self.collection_element