mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Richard SmithandJon Ross-Perkins
3c01ee69ed
Instead of tracking the token associated with a parse node in the `.def` file macro, track it on the typed node instead. List the token as a field inside the node structure to show the order of the token relative to the other components of the grammar production, and to allow the token index to be accessed when the node is extracted. Remove the corresponding information from the `.def` file, leaving behind just a list of parse node kinds in the majority of cases. This also removes the checking of the token kind associated with a parse node in the case where the parse node has errors. Previously we had a flag on the node kind to indicate whether we should check this, but per [discord discussion](https://discord.com/channels/655572317891461132/655578254970716160/1246214418979881052), we have decided to remove this. --------- Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
71 lines
1.9 KiB
C++
71 lines
1.9 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/parse/node_kind.h"
|
|
|
|
#include "llvm/ADT/StringExtras.h"
|
|
#include "toolchain/parse/typed_nodes.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
auto NodeCategory::Print(llvm::raw_ostream& out) const -> void {
|
|
if (!value_) {
|
|
out << "<none>";
|
|
} else {
|
|
llvm::ListSeparator sep("|");
|
|
|
|
#define CARBON_NODE_CATEGORY(Name) \
|
|
if (value_ & NodeCategory::Name) { \
|
|
out << sep << #Name; \
|
|
}
|
|
CARBON_NODE_CATEGORY(Decl);
|
|
CARBON_NODE_CATEGORY(Expr);
|
|
CARBON_NODE_CATEGORY(ImplAs);
|
|
CARBON_NODE_CATEGORY(MemberExpr);
|
|
CARBON_NODE_CATEGORY(MemberName);
|
|
CARBON_NODE_CATEGORY(Modifier);
|
|
CARBON_NODE_CATEGORY(Pattern);
|
|
CARBON_NODE_CATEGORY(Statement);
|
|
#undef CARBON_NODE_CATEGORY
|
|
}
|
|
}
|
|
|
|
CARBON_DEFINE_ENUM_CLASS_NAMES(NodeKind) = {
|
|
#define CARBON_PARSE_NODE_KIND(Name) CARBON_ENUM_CLASS_NAME_STRING(Name)
|
|
#include "toolchain/parse/node_kind.def"
|
|
};
|
|
|
|
// Check that each typed node defines a `token` member.
|
|
#define CARBON_PARSE_NODE_KIND(Name) \
|
|
static_assert(requires(Name node) { node.token; });
|
|
#include "toolchain/parse/node_kind.def"
|
|
|
|
auto NodeKind::has_bracket() const -> bool {
|
|
return definition().has_bracket();
|
|
}
|
|
|
|
auto NodeKind::bracket() const -> NodeKind { return definition().bracket(); }
|
|
|
|
auto NodeKind::has_child_count() const -> bool {
|
|
return definition().has_child_count();
|
|
}
|
|
|
|
auto NodeKind::child_count() const -> int32_t {
|
|
return definition().child_count();
|
|
}
|
|
|
|
auto NodeKind::category() const -> NodeCategory {
|
|
return definition().category();
|
|
}
|
|
|
|
auto NodeKind::definition() const -> const Definition& {
|
|
static constexpr const Definition* Table[] = {
|
|
#define CARBON_PARSE_NODE_KIND(Name) &Parse::Name::Kind,
|
|
#include "toolchain/parse/node_kind.def"
|
|
};
|
|
return *Table[AsInt()];
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|