mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Richard Smith
1917ea223e
When a node kind's Id::Kind is determined from its category, don't also require it to be listed in the switch over all node kinds. This was both redundant and also error prone -- and in practice for several node kinds, the Id::Kind computed in the two different ways was different. Instead, have the switch over node kinds handle only special cases that can't be handled by their category, and enforce that each node kind has an Id::Kind specified in exactly one way via checks in the .cpp file. This refines the previous change in #4280 -- we still get the improved errors for missing updates, but now also don't require redundant additions to the switch.
61 lines
2.4 KiB
C++
61 lines
2.4 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/check/node_stack.h"
|
|
|
|
#include "llvm/ADT/STLExtras.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto NodeStack::PrintForStackDump(int indent, llvm::raw_ostream& output) const
|
|
-> void {
|
|
auto print_id = [&]<Id::Kind Kind>(Id id) {
|
|
if constexpr (Kind == Id::Kind::None) {
|
|
output << "no value";
|
|
} else if constexpr (Kind == Id::Kind::Invalid) {
|
|
CARBON_FATAL("Should not be in node stack");
|
|
} else {
|
|
output << id.As<Kind>();
|
|
}
|
|
};
|
|
|
|
output.indent(indent);
|
|
output << "NodeStack:\n";
|
|
for (auto [i, entry] : llvm::enumerate(stack_)) {
|
|
auto node_kind = parse_tree_->node_kind(entry.node_id);
|
|
output.indent(indent + 2);
|
|
output << i << ". " << node_kind << ": ";
|
|
switch (node_kind) {
|
|
#define CARBON_PARSE_NODE_KIND(Kind) \
|
|
case Parse::NodeKind::Kind: \
|
|
print_id.operator()<NodeKindToIdKind(Parse::NodeKind::Kind)>(entry.id); \
|
|
break;
|
|
#include "toolchain/parse/node_kind.def"
|
|
}
|
|
output << "\n";
|
|
}
|
|
}
|
|
|
|
// NOLINTNEXTLINE(readability-function-size)
|
|
auto NodeStack::CheckIdKindTable() -> void {
|
|
#define CARBON_PARSE_NODE_KIND(Name) \
|
|
{ \
|
|
constexpr auto from_category = \
|
|
NodeCategoryToIdKind(Parse::Name::Kind.category(), true); \
|
|
constexpr auto from_kind = \
|
|
NodeKindToIdKindSpecialCases(Parse::Name::Kind); \
|
|
static_assert(from_category || from_kind, \
|
|
"Id::Kind not specified for " #Name \
|
|
"; add to NodeStack::NodeKindToIdKindSpecialCases or " \
|
|
"specify a node category in typed_nodes.h"); \
|
|
static_assert(!from_category || !from_kind, \
|
|
"Special case Id::Kind specified for " #Name \
|
|
", but node category has an Id::Kind; remove from " \
|
|
"NodeStack::NodeKindToIdKindSpecialCases"); \
|
|
}
|
|
#include "toolchain/parse/node_kind.def"
|
|
}
|
|
|
|
} // namespace Carbon::Check
|