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>
57 lines
1.9 KiB
C++
57 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/parser/parser_context.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
// Handles ParenConditionAs(If|While).
|
|
static auto HandleParenCondition(Context& context, NodeKind start_kind,
|
|
State finish_state) -> void {
|
|
auto state = context.PopState();
|
|
|
|
std::optional<TokenizedBuffer::Token> open_paren =
|
|
context.ConsumeAndAddOpenParen(state.token, start_kind);
|
|
if (open_paren) {
|
|
state.token = *open_paren;
|
|
}
|
|
state.state = finish_state;
|
|
context.PushState(state);
|
|
|
|
if (!open_paren && context.PositionIs(TokenKind::OpenCurlyBrace)) {
|
|
// For an open curly, assume the condition was completely omitted.
|
|
// Expression parsing would treat the { as a struct, but instead assume it's
|
|
// a code block and just emit an invalid parse.
|
|
context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
|
|
/*has_error=*/true);
|
|
} else {
|
|
context.PushState(State::Expression);
|
|
}
|
|
}
|
|
|
|
auto HandleParenConditionAsIf(Context& context) -> void {
|
|
HandleParenCondition(context, NodeKind::IfConditionStart,
|
|
State::ParenConditionFinishAsIf);
|
|
}
|
|
|
|
auto HandleParenConditionAsWhile(Context& context) -> void {
|
|
HandleParenCondition(context, NodeKind::WhileConditionStart,
|
|
State::ParenConditionFinishAsWhile);
|
|
}
|
|
|
|
auto HandleParenConditionFinishAsIf(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ConsumeAndAddCloseSymbol(state.token, state, NodeKind::IfCondition);
|
|
}
|
|
|
|
auto HandleParenConditionFinishAsWhile(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ConsumeAndAddCloseSymbol(state.token, state,
|
|
NodeKind::WhileCondition);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|