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

Split if expressions out of handle_expr (#4292)

Browse Source 
Just a small factoring thing. The `if` logic is sizeable, and there's no
need for it to be in handle_expr (we do also have handle_brace_expr,
handle_index_expr, etc)
This commit is contained in:
Jon Ross-Perkins
2024-09-10 22:57:32 +00:00
committed by GitHub
parent d4c7743d18
commit 19f6cd2023
2 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/handle_expr.cpp
+1 -64
View File
@@ -396,6 +396,7 @@ auto HandleExprLoopForPrefixOperator(Context& context) -> void {
auto HandleExprLoopForShortCircuitOperatorAsAnd(Context& context) -> void {
auto state = context.PopState();
HandleExprLoopForOperator(context, state, NodeKind::ShortCircuitOperatorAnd);
}
@@ -405,70 +406,6 @@ auto HandleExprLoopForShortCircuitOperatorAsOr(Context& context) -> void {
HandleExprLoopForOperator(context, state, NodeKind::ShortCircuitOperatorOr);
}
auto HandleIfExprFinishCondition(Context& context) -> void {
auto state = context.PopState();
context.AddNode(NodeKind::IfExprIf, state.token, state.has_error);
if (context.PositionIs(Lex::TokenKind::Then)) {
context.PushState(State::IfExprFinishThen);
context.ConsumeChecked(Lex::TokenKind::Then);
context.PushStateForExpr(*PrecedenceGroup::ForLeading(Lex::TokenKind::If));
} else {
// TODO: Include the location of the `if` token.
CARBON_DIAGNOSTIC(ExpectedThenAfterIf, Error,
"Expected `then` after `if` condition.");
if (!state.has_error) {
context.emitter().Emit(*context.position(), ExpectedThenAfterIf);
}
// Add placeholders for `IfExprThen` and final `Expr`.
context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
/*has_error=*/true);
context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
/*has_error=*/true);
context.ReturnErrorOnState();
}
}
auto HandleIfExprFinishThen(Context& context) -> void {
auto state = context.PopState();
context.AddNode(NodeKind::IfExprThen, state.token, state.has_error);
if (context.PositionIs(Lex::TokenKind::Else)) {
context.PushState(State::IfExprFinishElse);
context.ConsumeChecked(Lex::TokenKind::Else);
context.PushStateForExpr(*PrecedenceGroup::ForLeading(Lex::TokenKind::If));
} else {
// TODO: Include the location of the `if` token.
CARBON_DIAGNOSTIC(ExpectedElseAfterIf, Error,
"Expected `else` after `if ... then ...`.");
if (!state.has_error) {
context.emitter().Emit(*context.position(), ExpectedElseAfterIf);
}
// Add placeholder for the final `Expr`.
context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
/*has_error=*/true);
context.ReturnErrorOnState();
}
}
auto HandleIfExprFinishElse(Context& context) -> void {
auto else_state = context.PopState();
// Propagate the location of `else`.
auto if_state = context.PopState();
if_state.token = else_state.token;
if_state.has_error |= else_state.has_error;
context.PushState(if_state);
}
auto HandleIfExprFinish(Context& context) -> void {
auto state = context.PopState();
context.AddNode(NodeKind::IfExprElse, state.token, state.has_error);
}
auto HandleExprStatementFinish(Context& context) -> void {
auto state = context.PopState();