mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 02:28:12 +00:00
Continuing on #3070. I moved ParseTree::Node to just Parse::Node, versus Parse::Tree::Node. Other name changes are just removing "Parse" or "Parser" prefixes. In EnumBase, I'm directly defining operator<< because the ostream.h approach just isn't working, not for either of Parse::State nor Parse::NodeKind. Errors look like: ```toolchain/parser/parser_context.cpp:449:34: error: invalid operands to binary expression ('llvm::raw_ostream' and 'const Carbon::Parse::State') output << "\t" << i << ".\t" << entry.state; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~ ``` The expected template in `Carbon::` is not in the error list; I only see the: ``` ./common/ostream.h:112:6: note: candidate template ignored: requirement 'std::is_base_of_v<std::ostream, llvm::raw_ostream>' was not satisfied [with S = llvm::raw_ostream, T = Carbon::Parse::State] auto operator<<(S& standard_out, const T& value) -> S& { ^ ``` I'm still prodding at this, but not seeing an obvious fix. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
50 lines
1.6 KiB
C++
50 lines
1.6 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/parser/parse_node_kind.h"
|
|
|
|
#include "common/check.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
CARBON_DEFINE_ENUM_CLASS_NAMES(NodeKind) = {
|
|
#define CARBON_PARSE_NODE_KIND(Name) CARBON_ENUM_CLASS_NAME_STRING(Name)
|
|
#include "toolchain/parser/parse_node_kind.def"
|
|
};
|
|
|
|
auto NodeKind::has_bracket() const -> bool {
|
|
static constexpr bool HasBracket[] = {
|
|
#define CARBON_PARSE_NODE_KIND_BRACKET(...) true,
|
|
#define CARBON_PARSE_NODE_KIND_CHILD_COUNT(...) false,
|
|
#include "toolchain/parser/parse_node_kind.def"
|
|
};
|
|
return HasBracket[AsInt()];
|
|
}
|
|
|
|
auto NodeKind::bracket() const -> NodeKind {
|
|
// Nodes are never self-bracketed, so we use that for nodes that instead set
|
|
// child_count.
|
|
static constexpr NodeKind Bracket[] = {
|
|
#define CARBON_PARSE_NODE_KIND_BRACKET(Name, BracketName) NodeKind::BracketName,
|
|
#define CARBON_PARSE_NODE_KIND_CHILD_COUNT(Name, ...) NodeKind::Name,
|
|
#include "toolchain/parser/parse_node_kind.def"
|
|
};
|
|
auto bracket = Bracket[AsInt()];
|
|
CARBON_CHECK(bracket != *this) << *this;
|
|
return bracket;
|
|
}
|
|
|
|
auto NodeKind::child_count() const -> int32_t {
|
|
static constexpr int32_t ChildCount[] = {
|
|
#define CARBON_PARSE_NODE_KIND_BRACKET(...) -1,
|
|
#define CARBON_PARSE_NODE_KIND_CHILD_COUNT(Name, Size) Size,
|
|
#include "toolchain/parser/parse_node_kind.def"
|
|
};
|
|
auto child_count = ChildCount[AsInt()];
|
|
CARBON_CHECK(child_count >= 0) << *this;
|
|
return child_count;
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|