Merge pull request #60196 from ahoppen/pr/misc-libsyntax-improvements

[libSyntax] Small improvements

Author: ahoppen

lib/Parse/ParsedSyntaxBuilders.cpp.gyb

@@ -85,6 +85,7 @@ void Parsed${node.name}Builder::finishLayout(bool deferred) {
 % if node.children:
 %   for (idx, child) in enumerate(node.children):
 %     child_elt = None
+%     child_elt_name = child.name + 'Member'
 %     child_node = NODE_MAP.get(child.syntax_kind)
 %     if child_node and child_node.is_syntax_collection():
 %       child_elt = child_node.collection_element_name

utils/gyb_syntax_support/Classification.py

@@ -1,4 +1,4 @@
-from .Node import error
+from .Utils import error
 from .kinds import lowercase_first_word  # noqa: I201
 
 

utils/gyb_syntax_support/Node.py

@@ -1,13 +1,7 @@
-import sys  # noqa: I201
-
+from .Utils import error
 from .kinds import SYNTAX_BASE_KINDS, kind_to_type, lowercase_first_word
 
 
-def error(msg):
-    print('error: ' + msg, file=sys.stderr)
-    sys.exit(-1)
-
-
 class Node(object):
     """
     A Syntax node, possibly with children.

utils/gyb_syntax_support/NodeSerializationCodes.py

@@ -1,4 +1,4 @@
-from .Node import error
+from .Utils import error
 
 
 SYNTAX_NODE_SERIALIZATION_CODES = {

utils/gyb_syntax_support/Token.py

@@ -1,5 +1,5 @@
 from .Classification import classification_by_name
-from .Node import error  # noqa: I201
+from .Utils import error  # noqa: I201
 from .kinds import lowercase_first_word  # noqa: I201
 
 

utils/gyb_syntax_support/Trivia.py

@@ -1,4 +1,4 @@
-from .Node import error
+from .Utils import error
 from .kinds import lowercase_first_word  # noqa: I201
 
 

utils/gyb_syntax_support/Utils.py

@@ -0,0 +1,6 @@
+import sys
+
+
+def error(msg):
+    print('error: ' + msg, file=sys.stderr)
+    sys.exit(-1)