Rename Parse::State to Parse::StateKind (#5249)

Also renames variables of that type to match. A follow-up PR will rename
`Parse::StateStackEntry` to `Parse::State`. This is more consistent with
the naming of similar enums elsewhere in the toolchain, and with the
prevailing practice of using `state` rather than e.g. `entry` as the
name of a `StateStackEntry`.

See also discussion
[here](https://discord.com/channels/655572317891461132/963846118964350976/1326280585592700990)
This commit is contained in:
Geoff Romer
2025-04-05 04:25:00 +00:00
committed by GitHub
parent 2fa2425ef5
commit 8c113c1241
36 changed files with 347 additions and 328 deletions
+6 -6
View File
@@ -9,20 +9,20 @@ namespace Carbon::Parse {
auto HandleFunctionIntroducer(Context& context) -> void {
auto state = context.PopState();
context.PushState(state, State::FunctionAfterParams);
context.PushState(State::DeclNameAndParams, state.token);
context.PushState(state, StateKind::FunctionAfterParams);
context.PushState(StateKind::DeclNameAndParams, state.token);
}
auto HandleFunctionAfterParams(Context& context) -> void {
auto state = context.PopState();
// Regardless of whether there's a return type, we'll finish the signature.
context.PushState(state, State::FunctionSignatureFinish);
context.PushState(state, StateKind::FunctionSignatureFinish);
// If there is a return type, parse the expression before adding the return
// type node.
if (context.PositionIs(Lex::TokenKind::MinusGreater)) {
context.PushState(State::FunctionReturnTypeFinish);
context.PushState(StateKind::FunctionReturnTypeFinish);
context.ConsumeAndDiscard();
context.PushStateForExpr(PrecedenceGroup::ForType());
}
@@ -47,8 +47,8 @@ auto HandleFunctionSignatureFinish(Context& context) -> void {
context.AddFunctionDefinitionStart(context.Consume(), state.has_error);
// Any error is recorded on the FunctionDefinitionStart.
state.has_error = false;
context.PushState(state, State::FunctionDefinitionFinish);
context.PushState(State::StatementScopeLoop);
context.PushState(state, StateKind::FunctionDefinitionFinish);
context.PushState(StateKind::StatementScopeLoop);
break;
}
case Lex::TokenKind::Equal: {