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

Add PushState overload to combine Parse::State change with StateStackEntry (#3485)

Browse Source 
Shortens a common `PushState` pattern
This commit is contained in:
josh11b
2023-12-08 23:58:30 +00:00
committed by GitHub
parent 6e65a30b5d
commit b7d129b88c
17 changed files with 47 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/handle_expr.cpp
+7 -14
View File
@@ -182,26 +182,22 @@ auto HandleExprInPostfixLoop(Context& context) -> void {
switch (context.PositionKind()) {
case Lex::TokenKind::Period: {
context.PushState(state);
state.state = State::PeriodAsExpr;
context.PushState(state);
context.PushState(state, State::PeriodAsExpr);
break;
}
case Lex::TokenKind::MinusGreater: {
context.PushState(state);
state.state = State::ArrowExpr;
context.PushState(state);
context.PushState(state, State::ArrowExpr);
break;
}
case Lex::TokenKind::OpenParen: {
context.PushState(state);
state.state = State::CallExpr;
context.PushState(state);
context.PushState(state, State::CallExpr);
break;
}
case Lex::TokenKind::OpenSquareBracket: {
context.PushState(state);
state.state = State::IndexExpr;
context.PushState(state);
context.PushState(state, State::IndexExpr);
break;
}
default: {
@@ -276,8 +272,7 @@ auto HandleExprLoop(Context& context) -> void {
state.subtree_start, state.has_error);
}
state.state = State::ExprLoopForBinary;
context.PushState(state);
context.PushState(state, State::ExprLoopForBinary);
context.PushStateForExpr(operator_precedence);
} else {
context.AddNode(NodeKind::PostfixOperator, state.token, state.subtree_start,
@@ -292,9 +287,8 @@ auto HandleExprLoopForBinary(Context& context) -> void {
context.AddNode(NodeKind::InfixOperator, state.token, state.subtree_start,
state.has_error);
state.state = State::ExprLoop;
state.has_error = false;
context.PushState(state);
context.PushState(state, State::ExprLoop);
}
auto HandleExprLoopForPrefix(Context& context) -> void {
@@ -302,9 +296,8 @@ auto HandleExprLoopForPrefix(Context& context) -> void {
context.AddNode(NodeKind::PrefixOperator, state.token, state.subtree_start,
state.has_error);
state.state = State::ExprLoop;
state.has_error = false;
context.PushState(state);
context.PushState(state, State::ExprLoop);
}
auto HandleIfExprFinishCondition(Context& context) -> void {