carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Unify more invalid declaration recovery. (#3942)

Browse Source 
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.
This commit is contained in:
Jon Ross-Perkins
2024-05-08 22:41:42 +00:00
committed by GitHub
parent 7ef61cd679
commit 5fa341f16a
8 changed files with 65 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/handle_decl_definition.cpp
+4 -16
View File
@@ -13,22 +13,10 @@ static auto HandleDeclOrDefinition(Context& context, NodeKind decl_kind,
State definition_finish_state) -> void {
auto state = context.PopState();
if (state.has_error) {
context.RecoverFromDeclError(state, decl_kind,
/*skip_past_likely_end=*/true);
return;
}
if (auto semi = context.ConsumeIf(Lex::TokenKind::Semi)) {
context.AddNode(decl_kind, *semi, state.subtree_start, state.has_error);
return;
}
if (!context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) {
context.DiagnoseExpectedDeclSemiOrDefinition(
context.tokens().GetKind(state.token));
context.RecoverFromDeclError(state, decl_kind,
/*skip_past_likely_end=*/true);
if (state.has_error || !context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) {
context.AddNodeExpectingDeclSemi(state, decl_kind,
context.tokens().GetKind(state.token),
/*is_def_allowed=*/true);
return;
}