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

Make Parse::NodeCategory printable (#3548)

Browse Source 
Completes TODO in `parse/extract.cpp`, moving the printing code for
`NodeCategory` out of the implementation of
`Extractable<NodeIdInCategory<T>>`.
This commit is contained in:
josh11b
2023-12-28 20:04:54 +00:00
committed by GitHub
parent 73cf277bdf
commit 83b5db9c1e
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/extract.cpp
+5 -23
View File
@@ -87,38 +87,20 @@ struct Extractable<NodeIdInCategory<Category>> {
static auto Extract(const Tree* tree, Tree::SiblingIterator& it,
Tree::SiblingIterator end, ErrorBuilder* trace)
-> std::optional<NodeIdInCategory<Category>> {
if (trace) {
*trace << "NodeIdInCategory";
// TODO: Make NodeCategory printable instead.
if (!Category) {
*trace << " <none>";
}
#define CARBON_NODE_CATEGORY(Name) \
if (!!(Category & NodeCategory::Name)) { \
*trace << " " #Name; \
}
CARBON_NODE_CATEGORY(Decl);
CARBON_NODE_CATEGORY(Expr);
CARBON_NODE_CATEGORY(Modifier);
CARBON_NODE_CATEGORY(NameComponent);
CARBON_NODE_CATEGORY(Pattern);
CARBON_NODE_CATEGORY(Statement);
#undef CARBON_NODE_CATEGORY
}
if (it == end || !(tree->node_kind(*it).category() & Category)) {
if (trace) {
*trace << "NodeIdInCategory " << Category << " error: ";
if (it == end) {
*trace << " error: no more children\n";
*trace << "no more children\n";
} else {
*trace << " error: kind " << tree->node_kind(*it)
<< " doesn't match\n";
*trace << "kind " << tree->node_kind(*it) << " doesn't match\n";
}
}
return std::nullopt;
}
if (trace) {
*trace << ": kind " << tree->node_kind(*it) << " consumed\n";
*trace << "NodeIdInCategory " << Category << ": kind "
<< tree->node_kind(*it) << " consumed\n";
}
return NodeIdInCategory<Category>(*it++);
}