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>
89 lines
2.7 KiB
C++
89 lines
2.7 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 VarAs(Semicolon|For).
|
|
static auto HandleVar(Context& context, State finish_state) -> void {
|
|
context.PopAndDiscardState();
|
|
|
|
// These will start at the `var`.
|
|
context.PushState(finish_state);
|
|
context.PushState(State::VarAfterPattern);
|
|
|
|
context.AddLeafNode(NodeKind::VariableIntroducer, context.Consume());
|
|
|
|
// This will start at the pattern.
|
|
context.PushState(State::PatternAsVariable);
|
|
}
|
|
|
|
auto HandleVarAsSemicolon(Context& context) -> void {
|
|
HandleVar(context, State::VarFinishAsSemicolon);
|
|
}
|
|
|
|
auto HandleVarAsFor(Context& context) -> void {
|
|
HandleVar(context, State::VarFinishAsFor);
|
|
}
|
|
|
|
auto HandleVarAfterPattern(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (state.has_error) {
|
|
if (auto after_pattern =
|
|
context.FindNextOf({TokenKind::Equal, TokenKind::Semi})) {
|
|
context.SkipTo(*after_pattern);
|
|
}
|
|
}
|
|
|
|
if (auto equals = context.ConsumeIf(TokenKind::Equal)) {
|
|
context.AddLeafNode(NodeKind::VariableInitializer, *equals);
|
|
context.PushState(State::Expression);
|
|
}
|
|
}
|
|
|
|
auto HandleVarFinishAsSemicolon(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto end_token = state.token;
|
|
if (context.PositionIs(TokenKind::Semi)) {
|
|
end_token = context.Consume();
|
|
} else {
|
|
// TODO: Disambiguate between statement and member declaration.
|
|
context.EmitExpectedDeclarationSemi(TokenKind::Var);
|
|
state.has_error = true;
|
|
if (auto semi_token = context.SkipPastLikelyEnd(state.token)) {
|
|
end_token = *semi_token;
|
|
}
|
|
}
|
|
context.AddNode(NodeKind::VariableDeclaration, end_token, state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
auto HandleVarFinishAsFor(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto end_token = state.token;
|
|
if (context.PositionIs(TokenKind::In)) {
|
|
end_token = context.Consume();
|
|
} else if (context.PositionIs(TokenKind::Colon)) {
|
|
CARBON_DIAGNOSTIC(ExpectedInNotColon, Error,
|
|
"`:` should be replaced by `in`.");
|
|
context.emitter().Emit(*context.position(), ExpectedInNotColon);
|
|
state.has_error = true;
|
|
end_token = context.Consume();
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedIn, Error,
|
|
"Expected `in` after loop `var` declaration.");
|
|
context.emitter().Emit(*context.position(), ExpectedIn);
|
|
state.has_error = true;
|
|
}
|
|
|
|
context.AddNode(NodeKind::ForIn, end_token, state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|