mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
5fa341f16a
When we expect a semicolon, we should be able to provide more standard
recovery.
Note this affects a test of `base`, but it looks like a partial
improvement (the prior line was moving too far). Still, it looks like
recovery isn't handling `{}` quite right. I'm not trying to address that
here though -- leaving a TODO.
51 lines
1.7 KiB
C++
51 lines
1.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/lex/token_kind.h"
|
|
#include "toolchain/lex/tokenized_buffer.h"
|
|
#include "toolchain/parse/context.h"
|
|
#include "toolchain/parse/node_kind.h"
|
|
#include "toolchain/parse/state.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
auto HandleAlias(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.PushState(state, State::AliasAfterName);
|
|
context.PushState(State::DeclNameAndParamsAsNone, state.token);
|
|
}
|
|
|
|
auto HandleAliasAfterName(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (state.has_error) {
|
|
context.RecoverFromDeclError(state, NodeKind::Alias,
|
|
/*skip_past_likely_end=*/true);
|
|
return;
|
|
}
|
|
|
|
if (auto equal = context.ConsumeIf(Lex::TokenKind::Equal)) {
|
|
context.AddLeafNode(NodeKind::AliasInitializer, *equal);
|
|
context.PushState(state, State::AliasFinish);
|
|
context.PushState(State::Expr);
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedAliasInitializer, Error,
|
|
"`alias` requires a `=` for the source.");
|
|
context.emitter().Emit(*context.position(), ExpectedAliasInitializer);
|
|
context.RecoverFromDeclError(state, NodeKind::Alias,
|
|
/*skip_past_likely_end=*/true);
|
|
}
|
|
}
|
|
|
|
auto HandleAliasFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNodeExpectingDeclSemi(state, NodeKind::Alias,
|
|
Lex::TokenKind::Alias,
|
|
/*is_def_allowed=*/false);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|