carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 07:54:41 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Handle missing curlies after match_first without crashing in parse (#7480)

Browse Source
This commit is contained in:
Dana Jansens
2026-07-11 00:03:31 +00:00
committed by GitHub
parent 783f1601fd
commit bf106c3b4b
5 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/context.cpp
+16
View File
@@ -52,6 +52,22 @@ auto Context::ReplacePlaceholderNode(int32_t position, NodeKind kind,
*node_impl = Tree::NodeImpl(kind, has_error, token);
}
auto Context::ConsumeAndAddOpenCurlyBrace(Lex::TokenIndex default_token,
NodeKind start_kind)
-> std::optional<Lex::TokenIndex> {
if (auto open_curly = ConsumeIf(Lex::TokenKind::OpenCurlyBrace)) {
AddLeafNode(start_kind, *open_curly, /*has_error=*/false);
return open_curly;
} else {
CARBON_DIAGNOSTIC(ExpectedCurlyBraceAfter, Error,
"expected `{` after `{0}`", Lex::TokenKind);
emitter_.Emit(*position_, ExpectedCurlyBraceAfter,
tokens().GetKind(default_token));
AddLeafNode(start_kind, default_token, /*has_error=*/true);
return std::nullopt;
}
}
auto Context::ConsumeAndAddOpenParen(Lex::TokenIndex default_token,
NodeKind start_kind)
-> std::optional<Lex::TokenIndex> {