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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/handle_impl.cpp
+6 -6
View File
@@ -11,25 +11,25 @@ static auto ExpectAsOrTypeExpression(Context& context) -> void {
if (context.PositionIs(Lex::TokenKind::As)) {
// as <expression> ...
context.AddLeafNode(NodeKind::DefaultSelfImplAs, context.Consume());
context.PushState(State::Expr);
context.PushState(StateKind::Expr);
} else {
// <expression> as <expression>...
context.PushState(State::ImplBeforeAs);
context.PushState(StateKind::ImplBeforeAs);
context.PushStateForExpr(PrecedenceGroup::ForImplAs());
}
}
auto HandleImplAfterIntroducer(Context& context) -> void {
auto state = context.PopState();
state.state = State::DeclOrDefinitionAsImpl;
state.kind = StateKind::DeclOrDefinitionAsImpl;
context.PushState(state);
if (context.PositionIs(Lex::TokenKind::Forall)) {
// forall [<implicit parameter list>] ...
context.PushState(State::ImplAfterForall);
context.PushState(StateKind::ImplAfterForall);
context.AddLeafNode(NodeKind::Forall, context.Consume());
if (context.PositionIs(Lex::TokenKind::OpenSquareBracket)) {
context.PushState(State::PatternListAsImplicit);
context.PushState(StateKind::PatternListAsImplicit);
} else {
CARBON_DIAGNOSTIC(ImplExpectedAfterForall, Error,
"expected `[` after `forall` in `impl` declaration");
@@ -63,7 +63,7 @@ auto HandleImplBeforeAs(Context& context) -> void {
auto state = context.PopState();
if (auto as = context.ConsumeIf(Lex::TokenKind::As)) {
context.AddNode(NodeKind::TypeImplAs, *as, state.has_error);
context.PushState(State::Expr);
context.PushState(StateKind::Expr);
} else {
if (!state.has_error) {
CARBON_DIAGNOSTIC(ImplExpectedAs, Error,