mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 21:51:12 +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.
88 lines
3.1 KiB
C++
88 lines
3.1 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
|
|
|
|
#ifndef CARBON_TOOLCHAIN_CHECK_DECL_INTRODUCER_STATE_H_
|
|
#define CARBON_TOOLCHAIN_CHECK_DECL_INTRODUCER_STATE_H_
|
|
|
|
#include "toolchain/check/keyword_modifier_set.h"
|
|
#include "toolchain/lex/token_kind.h"
|
|
#include "toolchain/parse/node_ids.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
// State stored for each declaration we are introducing: the kind of
|
|
// declaration and the keyword modifiers that apply to that declaration
|
|
// introducer.
|
|
struct DeclIntroducerState {
|
|
auto modifier_node_id(ModifierOrder order) const -> Parse::NodeId {
|
|
return ordered_modifier_node_ids[static_cast<int8_t>(order)];
|
|
}
|
|
auto set_modifier_node_id(ModifierOrder order, Parse::NodeId node_id)
|
|
-> void {
|
|
ordered_modifier_node_ids[static_cast<int8_t>(order)] = node_id;
|
|
}
|
|
|
|
// The token kind of the introducer.
|
|
Lex::TokenKind kind;
|
|
|
|
// Nodes of modifiers on this declaration, in expected order. `None` if no
|
|
// modifier of that kind is present.
|
|
Parse::NodeId
|
|
ordered_modifier_node_ids[static_cast<int8_t>(ModifierOrder::Decl) + 1] =
|
|
{Parse::NodeId::None, Parse::NodeId::None, Parse::NodeId::None};
|
|
|
|
// Invariant: contains just the modifiers represented by `saw_*_modifier`.
|
|
KeywordModifierSet modifier_set = KeywordModifierSet();
|
|
|
|
// If there's an `extern library` in use, the library name.
|
|
SemIR::LibraryNameId extern_library = SemIR::LibraryNameId::None;
|
|
};
|
|
|
|
// Stack of `DeclIntroducerState` values, representing all the declaration
|
|
// introducers we are currently nested within. Commonly size 0 or 1, as nested
|
|
// introducers are rare.
|
|
class DeclIntroducerStateStack {
|
|
private:
|
|
// Returns true for introducer tokens. Supports Push/Pop `requires`.
|
|
template <Lex::TokenKind::RawEnumType Kind>
|
|
static constexpr auto IsDeclIntroducer() -> bool {
|
|
switch (Kind) {
|
|
#define CARBON_TOKEN(...)
|
|
#define CARBON_DECL_INTRODUCER_TOKEN(Name, ...) case Lex::TokenKind::Name:
|
|
#include "toolchain/lex/token_kind.def"
|
|
return true;
|
|
default:
|
|
return false;
|
|
}
|
|
}
|
|
|
|
public:
|
|
// Begins a declaration introducer `Kind`.
|
|
template <Lex::TokenKind::RawEnumType Kind>
|
|
requires(IsDeclIntroducer<Kind>())
|
|
auto Push() -> void {
|
|
stack_.push_back({.kind = Lex::TokenKind::Make(Kind)});
|
|
}
|
|
|
|
// Gets the state of declaration at the top of the stack -- the innermost
|
|
// declaration currently being processed.
|
|
auto innermost() -> DeclIntroducerState& { return stack_.back(); }
|
|
|
|
// Finishes a declaration introducer `Kind` and returns the produced state.
|
|
template <Lex::TokenKind::RawEnumType Kind>
|
|
requires(IsDeclIntroducer<Kind>())
|
|
auto Pop() -> DeclIntroducerState {
|
|
CARBON_CHECK(stack_.back().kind == Kind, "Found: {0} expected: {1}",
|
|
stack_.back().kind, Lex::TokenKind::Make(Kind));
|
|
return stack_.pop_back_val();
|
|
}
|
|
|
|
private:
|
|
llvm::SmallVector<DeclIntroducerState> stack_;
|
|
};
|
|
|
|
} // namespace Carbon::Check
|
|
|
|
#endif // CARBON_TOOLCHAIN_CHECK_DECL_INTRODUCER_STATE_H_
|