Set up a 'Parse' namespace. (#3161)

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>
This commit is contained in:
Jon Ross-PerkinsandRichard Smith authored and GitHub committed 2023-08-28 21:58:38 +00:00
1 parent 64687aa7d1
commit 7157445f97
75 files changed
+1181 -1277

No files matched your search

+9 -10
View File
@@ -6,14 +6,14 @@
#include "common/check.h"
namespace Carbon {
namespace Carbon::Parse {
CARBON_DEFINE_ENUM_CLASS_NAMES(ParseNodeKind) = {
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 ParseNodeKind::has_bracket() const -> bool {
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,
@@ -22,13 +22,12 @@ auto ParseNodeKind::has_bracket() const -> bool {
return HasBracket[AsInt()];
}
auto ParseNodeKind::bracket() const -> ParseNodeKind {
auto NodeKind::bracket() const -> NodeKind {
// Nodes are never self-bracketed, so we use that for nodes that instead set
// child_count.
static constexpr ParseNodeKind Bracket[] = {
#define CARBON_PARSE_NODE_KIND_BRACKET(Name, BracketName) \
ParseNodeKind::BracketName,
#define CARBON_PARSE_NODE_KIND_CHILD_COUNT(Name, ...) ParseNodeKind::Name,
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()];
@@ -36,7 +35,7 @@ auto ParseNodeKind::bracket() const -> ParseNodeKind {
return bracket;
}
auto ParseNodeKind::child_count() const -> int32_t {
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,
@@ -47,4 +46,4 @@ auto ParseNodeKind::child_count() const -> int32_t {
return child_count;
}
} // namespace Carbon
} // namespace Carbon::Parse