averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Syntax: use child name instead of type name for gyb-generated functions

Browse Source 
ParsedSyntaxBuilder has a convenient function to add member to a syntax-collection
child. The function name uses the type name of the collection's members,
which can lead to name collision. This patch renames it.
This commit is contained in:
Xi Ge
2019-04-19 17:31:45 -07:00
parent fd4eea9d38
commit 1015a6024d
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Parse/ParsedSyntaxBuilders.cpp.gyb
View File

@@ -35,11 +35,12 @@ using namespace swift::syntax;
% if child_node and child_node.is_syntax_collection():
% child_elt = child_node.collection_element_name
% child_elt_type = child_node.collection_element_type
% child_elt_name = child.name + 'Member'
% end
Parsed${node.name}Builder &
Parsed${node.name}Builder::use${child.name}(Parsed${child.type_name} ${child.name}) {
% if child_elt:
assert(${child_elt}Nodes.empty() && "use either 'use' function or 'add', not both");
assert(${child_elt_name}s.empty() && "use either 'use' function or 'add', not both");
% end
Layout[cursorIndex(${node.name}::Cursor::${child.name})] =
${child.name}.getRaw();
@@ -47,9 +48,9 @@ Parsed${node.name}Builder::use${child.name}(Parsed${child.type_name} ${child.nam
}
% if child_elt:
Parsed${node.name}Builder &
Parsed${node.name}Builder::add${child_elt}(Parsed${child_elt_type} ${child_elt}) {
Parsed${node.name}Builder::add${child_elt_name}(Parsed${child_elt_type} ${child_elt}) {
assert(Layout[cursorIndex(${node.name}::Cursor::${child.name})].isNull() && "use either 'use' function or 'add', not both");
${child_elt}Nodes.push_back(std::move(${child_elt}.getRaw()));
${child_elt_name}s.push_back(std::move(${child_elt}.getRaw()));
return *this;
}
% end
@@ -88,12 +89,12 @@ void Parsed${node.name}Builder::finishLayout(bool deferred) {
% if child_node and child_node.is_syntax_collection():
% child_elt = child_node.collection_element_name
% if child_elt:
if (!${child_elt}Nodes.empty()) {
if (!${child_elt_name}s.empty()) {
if (deferred) {
Layout[${idx}] = ParsedRawSyntaxNode::makeDeferred(SyntaxKind::${child_node.syntax_kind},
${child_elt}Nodes, SPCtx);
${child_elt_name}s, SPCtx);
} else {
Layout[${idx}] = Rec.recordRawSyntax(SyntaxKind::${child_node.syntax_kind}, ${child_elt}Nodes);
Layout[${idx}] = Rec.recordRawSyntax(SyntaxKind::${child_node.syntax_kind}, ${child_elt_name}s);
}
}
% end