mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
6b5eb1a101
High level, replacing `Id::Invalid` with `Id::None` and `Id::is_valid` with `Id::has_value` for clarity, as discussed [here](https://discord.com/channels/655572317891461132/655578254970716160/1331664574545395794). The `IntId` refactoring is needed together with `AnyIdBase` because it's also used with `ValueStore`. Note, trying to be careful not to rewrite `EnumBase::InvalidIndex`, or `is_valid` in general (e.g., `IdKind::is_valid`). I've tried to sequence commits here: 1. Automatic replacements: - `((?:Id|Index)(?: |::|\(|Base(?:\(|::)))Invalid((?:Index)?\W)` -> `$1None$2` - `<invalid>` -> `<none>` - `InvalidNodeId` -> `NoneNodeId` - `/\*invalid\*/` -> `/*none*/` - `id((?:_|\(\))(?:\.|->))is_valid` -> `id$1has_value` 2. Manual edits: - In `int.h` and `int_test.cpp` - `IntT` has `is_value`, which I'm renaming to `is_embedded_value`. - Manual edits to comments in this file. - `AnyIdBase` and `IdBase` - Declaration of `is_valid` -> `has_value`, `InvalidIndex` -> `NoneIndex`. - In `ids.h` and `ids.cpp` - `is_valid` -> `has_value` - `// An explicitly invalid ID.` -> `// An ID with no value.`; similar for index - Various math on `InvalidIndex` -> `NoneIndex` - Various mentions of "valid" in comments - In `value_store.h`, for `IdT::Invalid`, plus one comment - In `impl.h` and `tokenized_buffer.h`, we had different initialization of `::None` values (versus `ids.h` syntax) that I fixed manually. - Spot checks to compile - Particularly where `is_valid` replacements didn't catch spots due to different naming. 3. Autoupdate tests 4. verbose.carbon (NOAUTOUPDATE) 5. Comment spot checks Note there are probably other mentions of "Invalid" that should be swept up, but I'd like to argue for merging and separating out remaining cleanup since this is so sweeping (and likely to hit merge conflicts from churn). We'll probably have lingering mentions of "invalid" for a bit regardless, just because there are uses of "invalid" in non-Id APIs.
121 lines
3.9 KiB
C++
121 lines
3.9 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/parse/context.h"
|
|
#include "toolchain/parse/handle.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
// Handles VarAs(Decl|Returned).
|
|
static auto HandleVar(Context& context, State finish_state,
|
|
Lex::TokenIndex returned_token = Lex::TokenIndex::None)
|
|
-> void {
|
|
auto state = context.PopState();
|
|
|
|
// The finished variable declaration will start at the `var` or `returned`.
|
|
context.PushState(state, finish_state);
|
|
|
|
// TODO: is there a cleaner way to give VarAfterPattern access to the `var`
|
|
// token?
|
|
state.token = *(context.position() - 1);
|
|
context.PushState(state, State::VarAfterPattern);
|
|
|
|
if (returned_token.has_value()) {
|
|
context.AddLeafNode(NodeKind::ReturnedModifier, returned_token);
|
|
}
|
|
|
|
context.PushStateForPattern(State::Pattern, /*in_var_pattern=*/true);
|
|
}
|
|
|
|
auto HandleVarAsDecl(Context& context) -> void {
|
|
HandleVar(context, State::VarFinishAsDecl);
|
|
}
|
|
|
|
auto HandleVarAsReturned(Context& context) -> void {
|
|
auto returned_token = context.Consume();
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::Var)) {
|
|
CARBON_DIAGNOSTIC(ExpectedVarAfterReturned, Error,
|
|
"expected `var` after `returned`");
|
|
context.emitter().Emit(*context.position(), ExpectedVarAfterReturned);
|
|
context.AddLeafNode(NodeKind::EmptyDecl,
|
|
context.SkipPastLikelyEnd(returned_token),
|
|
/*has_error=*/true);
|
|
context.PopAndDiscardState();
|
|
return;
|
|
}
|
|
|
|
context.AddLeafNode(NodeKind::VariableIntroducer, context.Consume());
|
|
HandleVar(context, State::VarFinishAsDecl, returned_token);
|
|
}
|
|
|
|
auto HandleVarAsFor(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// The finished variable declaration will start at the `var`.
|
|
context.PushState(state, State::VarFinishAsFor);
|
|
|
|
context.PushState(State::Pattern);
|
|
}
|
|
|
|
auto HandleVarAfterPattern(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (state.has_error) {
|
|
if (auto after_pattern =
|
|
context.FindNextOf({Lex::TokenKind::Equal, Lex::TokenKind::Semi})) {
|
|
context.SkipTo(*after_pattern);
|
|
}
|
|
}
|
|
|
|
context.AddNode(NodeKind::VariablePattern, state.token, state.has_error);
|
|
|
|
if (context.PositionIs(Lex::TokenKind::Equal)) {
|
|
context.AddLeafNode(NodeKind::VariableInitializer,
|
|
context.ConsumeChecked(Lex::TokenKind::Equal));
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleVarFinishAsDecl(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto end_token = state.token;
|
|
if (context.PositionIs(Lex::TokenKind::Semi)) {
|
|
end_token = context.Consume();
|
|
} else {
|
|
// TODO: Disambiguate between statement and member declaration.
|
|
context.DiagnoseExpectedDeclSemi(Lex::TokenKind::Var);
|
|
state.has_error = true;
|
|
end_token = context.SkipPastLikelyEnd(state.token);
|
|
}
|
|
context.AddNode(NodeKind::VariableDecl, end_token, state.has_error);
|
|
}
|
|
|
|
auto HandleVarFinishAsFor(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNode(NodeKind::VariablePattern, state.token, state.has_error);
|
|
|
|
auto end_token = state.token;
|
|
if (context.PositionIs(Lex::TokenKind::In)) {
|
|
end_token = context.Consume();
|
|
} else if (context.PositionIs(Lex::TokenKind::Colon)) {
|
|
CARBON_DIAGNOSTIC(ExpectedInNotColon, Error,
|
|
"`:` should be replaced by `in`");
|
|
context.emitter().Emit(*context.position(), ExpectedInNotColon);
|
|
state.has_error = true;
|
|
end_token = context.Consume();
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedIn, Error,
|
|
"expected `in` after loop `var` declaration");
|
|
context.emitter().Emit(*context.position(), ExpectedIn);
|
|
state.has_error = true;
|
|
}
|
|
|
|
context.AddNode(NodeKind::ForIn, end_token, state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|