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

@@ -4,42 +4,42 @@
#include "toolchain/parser/parser_context.h"
namespace Carbon {
namespace Carbon::Parse {
auto ParserHandleCallExpression(ParserContext& context) -> void {
auto HandleCallExpression(Context& context) -> void {
auto state = context.PopState();
state.state = ParserState::CallExpressionFinish;
state.state = State::CallExpressionFinish;
context.PushState(state);
context.AddNode(ParseNodeKind::CallExpressionStart, context.Consume(),
context.AddNode(NodeKind::CallExpressionStart, context.Consume(),
state.subtree_start, state.has_error);
if (!context.PositionIs(TokenKind::CloseParen)) {
context.PushState(ParserState::CallExpressionParameterFinish);
context.PushState(ParserState::Expression);
context.PushState(State::CallExpressionParameterFinish);
context.PushState(State::Expression);
}
}
auto ParserHandleCallExpressionParameterFinish(ParserContext& context) -> void {
auto HandleCallExpressionParameterFinish(Context& context) -> void {
auto state = context.PopState();
if (state.has_error) {
context.ReturnErrorOnState();
}
if (context.ConsumeListToken(ParseNodeKind::CallExpressionComma,
if (context.ConsumeListToken(NodeKind::CallExpressionComma,
TokenKind::CloseParen, state.has_error) ==
ParserContext::ListTokenKind::Comma) {
context.PushState(ParserState::CallExpressionParameterFinish);
context.PushState(ParserState::Expression);
Context::ListTokenKind::Comma) {
context.PushState(State::CallExpressionParameterFinish);
context.PushState(State::Expression);
}
}
auto ParserHandleCallExpressionFinish(ParserContext& context) -> void {
auto HandleCallExpressionFinish(Context& context) -> void {
auto state = context.PopState();
context.AddNode(ParseNodeKind::CallExpression, context.Consume(),
context.AddNode(NodeKind::CallExpression, context.Consume(),
state.subtree_start, state.has_error);
}
} // namespace Carbon
} // namespace Carbon::Parse