mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 20:58:15 +00: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.
53 lines
1.8 KiB
C++
53 lines
1.8 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_SEM_IR_INTERFACE_H_
|
|
#define CARBON_TOOLCHAIN_SEM_IR_INTERFACE_H_
|
|
|
|
#include "toolchain/sem_ir/entity_with_params_base.h"
|
|
#include "toolchain/sem_ir/ids.h"
|
|
|
|
namespace Carbon::SemIR {
|
|
|
|
// Interface-specific fields.
|
|
struct InterfaceFields {
|
|
// The following members are set at the `{` of the interface definition.
|
|
|
|
// The interface scope.
|
|
NameScopeId scope_id = NameScopeId::None;
|
|
// The first block of the interface body.
|
|
// TODO: Handle control flow in the interface body, such as if-expressions.
|
|
InstBlockId body_block_id = InstBlockId::None;
|
|
// The implicit `Self` parameter. This is a BindSymbolicName instruction.
|
|
InstId self_param_id = InstId::None;
|
|
|
|
// The following members are set at the `}` of the interface definition.
|
|
InstBlockId associated_entities_id = InstBlockId::None;
|
|
};
|
|
|
|
// An interface. See EntityWithParamsBase regarding the inheritance here.
|
|
struct Interface : public EntityWithParamsBase,
|
|
public InterfaceFields,
|
|
public Printable<Interface> {
|
|
auto Print(llvm::raw_ostream& out) const -> void {
|
|
out << "{";
|
|
PrintBaseFields(out);
|
|
out << "}";
|
|
}
|
|
|
|
// Determines whether this interface has been fully defined. This is false
|
|
// until we reach the `}` of the interface definition.
|
|
auto is_defined() const -> bool { return associated_entities_id.has_value(); }
|
|
|
|
// Determines whether we're currently defining the interface. This is true
|
|
// between the braces of the interface.
|
|
auto is_being_defined() const -> bool {
|
|
return has_definition_started() && !is_defined();
|
|
}
|
|
};
|
|
|
|
} // namespace Carbon::SemIR
|
|
|
|
#endif // CARBON_TOOLCHAIN_SEM_IR_INTERFACE_H_
|