carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 08:31:04 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Remove the stack from postorder tree printing (#5396)

Browse Source 
I was thinking about this while working on parent generation on #5394
(which does a similar loop), it's just a simplification.

Also remove surplus spaces in the preorder print.
This commit is contained in:
Jon Ross-Perkins
2025-04-30 20:31:28 +00:00
committed by GitHub
parent 64e0760275
commit 500cf63d0d
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/tree_and_subtrees.cpp
+8 -19
View File
@@ -168,27 +168,16 @@ auto TreeAndSubtrees::Print(llvm::raw_ostream& output) const -> void {
output << "- filename: " << tokens_->source().filename() << "\n"
<< " parse_tree: [\n";
// Walk the tree just to calculate depths for each node.
llvm::SmallVector<int> indents;
indents.resize(subtree_sizes_.size(), 0);
llvm::SmallVector<std::pair<NodeId, int>, 16> node_stack;
for (NodeId n : roots()) {
node_stack.push_back({n, 0});
}
while (!node_stack.empty()) {
NodeId n = NodeId::None;
int depth;
std::tie(n, depth) = node_stack.pop_back_val();
for (NodeId sibling_n : children(n)) {
indents[sibling_n.index] = depth + 1;
node_stack.push_back({sibling_n, depth + 1});
// Walk the tree in reverse, just to calculate depths for each node.
llvm::SmallVector<int> depths(tree_->size(), 0);
for (auto [n, depth] : llvm::reverse(llvm::zip(tree_->postorder(), depths))) {
for (auto child : children(n)) {
depths[child.index] = depth + 1;
}
}
for (NodeId n : tree_->postorder()) {
PrintNode(output, n, indents[n.index], /*preorder=*/false);
for (auto [n, depth] : llvm::zip(tree_->postorder(), depths)) {
PrintNode(output, n, depth, /*preorder=*/false);
output << ",\n";
}
output << " ]\n";
@@ -232,7 +221,7 @@ auto TreeAndSubtrees::PrintPreorder(llvm::raw_ostream& output) const -> void {
// We always end with a comma and a new line as we'll move to the next
// node at whatever the current level ends up being.
output << " ,\n";
output << ",\n";
}
output << " ]\n";
}