mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 04:38:13 +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>
81 lines
2.8 KiB
C++
81 lines
2.8 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/parser_context.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
auto HandleParenExpression(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// Advance past the open paren.
|
|
context.AddLeafNode(NodeKind::ParenExpressionOrTupleLiteralStart,
|
|
context.ConsumeChecked(TokenKind::OpenParen));
|
|
|
|
if (context.PositionIs(TokenKind::CloseParen)) {
|
|
state.state = State::ParenExpressionFinishAsTuple;
|
|
context.PushState(state);
|
|
} else {
|
|
state.state = State::ParenExpressionFinishAsNormal;
|
|
context.PushState(state);
|
|
context.PushState(State::ParenExpressionParameterFinishAsUnknown);
|
|
context.PushState(State::Expression);
|
|
}
|
|
}
|
|
|
|
// Handles ParenExpressionParameterFinishAs(Unknown|Tuple).
|
|
static auto HandleParenExpressionParameterFinish(Context& context,
|
|
bool as_tuple) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto list_token_kind = context.ConsumeListToken(
|
|
NodeKind::TupleLiteralComma, TokenKind::CloseParen, state.has_error);
|
|
if (list_token_kind == Context::ListTokenKind::Close) {
|
|
return;
|
|
}
|
|
|
|
// If this is the first item and a comma was found, switch to tuple handling.
|
|
// Note this could be `(expr,)` so we may not reuse the current state, but
|
|
// it's still necessary to switch the parent.
|
|
if (!as_tuple) {
|
|
state.state = State::ParenExpressionParameterFinishAsTuple;
|
|
|
|
auto finish_state = context.PopState();
|
|
CARBON_CHECK(finish_state.state == State::ParenExpressionFinishAsNormal)
|
|
<< "Unexpected parent state, found: " << finish_state.state;
|
|
finish_state.state = State::ParenExpressionFinishAsTuple;
|
|
context.PushState(finish_state);
|
|
}
|
|
|
|
// On a comma, push another expression handler.
|
|
if (list_token_kind == Context::ListTokenKind::Comma) {
|
|
context.PushState(state);
|
|
context.PushState(State::Expression);
|
|
}
|
|
}
|
|
|
|
auto HandleParenExpressionParameterFinishAsUnknown(Context& context) -> void {
|
|
HandleParenExpressionParameterFinish(context, /*as_tuple=*/false);
|
|
}
|
|
|
|
auto HandleParenExpressionParameterFinishAsTuple(Context& context) -> void {
|
|
HandleParenExpressionParameterFinish(context, /*as_tuple=*/true);
|
|
}
|
|
|
|
auto HandleParenExpressionFinishAsNormal(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNode(NodeKind::ParenExpression, context.Consume(),
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
|
|
auto HandleParenExpressionFinishAsTuple(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNode(NodeKind::TupleLiteral, context.Consume(),
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|