mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-17 11:38:10 +00:00
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.
102 lines
4.0 KiB
C++
102 lines
4.0 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/check/context.h"
|
|
#include "toolchain/check/decl_introducer_state.h"
|
|
#include "toolchain/check/handle.h"
|
|
#include "toolchain/check/modifiers.h"
|
|
#include "toolchain/check/name_component.h"
|
|
#include "toolchain/sem_ir/ids.h"
|
|
#include "toolchain/sem_ir/inst.h"
|
|
#include "toolchain/sem_ir/name_scope.h"
|
|
#include "toolchain/sem_ir/typed_insts.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleParseNode(Context& context, Parse::NamespaceStartId /*node_id*/)
|
|
-> bool {
|
|
// Optional modifiers and the name follow.
|
|
context.decl_introducer_state_stack().Push<Lex::TokenKind::Namespace>();
|
|
context.decl_name_stack().PushScopeAndStartName();
|
|
return true;
|
|
}
|
|
|
|
static auto IsNamespaceScope(Context& context, SemIR::NameScopeId name_scope_id)
|
|
-> bool {
|
|
auto [_, inst] = context.name_scopes().GetInstIfValid(name_scope_id);
|
|
return inst && inst->Is<SemIR::Namespace>();
|
|
}
|
|
|
|
auto HandleParseNode(Context& context, Parse::NamespaceId node_id) -> bool {
|
|
auto name_context = context.decl_name_stack().FinishName(
|
|
PopNameComponentWithoutParams(context, Lex::TokenKind::Namespace));
|
|
|
|
auto introducer =
|
|
context.decl_introducer_state_stack().Pop<Lex::TokenKind::Namespace>();
|
|
LimitModifiersOnDecl(context, introducer, KeywordModifierSet::None);
|
|
|
|
auto namespace_inst = SemIR::Namespace{
|
|
context.GetSingletonType(SemIR::NamespaceType::SingletonInstId),
|
|
SemIR::NameScopeId::None, SemIR::InstId::None};
|
|
auto namespace_id =
|
|
context.AddPlaceholderInst(SemIR::LocIdAndInst(node_id, namespace_inst));
|
|
|
|
auto [existing_inst_id, is_poisoned] =
|
|
context.decl_name_stack().LookupOrAddName(name_context, namespace_id,
|
|
SemIR::AccessKind::Public);
|
|
if (is_poisoned) {
|
|
context.DiagnosePoisonedName(namespace_id);
|
|
} else if (existing_inst_id.has_value()) {
|
|
if (auto existing =
|
|
context.insts().TryGetAs<SemIR::Namespace>(existing_inst_id)) {
|
|
// If there's a name conflict with a namespace, "merge" by using the
|
|
// previous declaration. Otherwise, diagnose the issue.
|
|
|
|
// Point at the other namespace.
|
|
namespace_inst.name_scope_id = existing->name_scope_id;
|
|
|
|
if (context.name_scopes()
|
|
.Get(existing->name_scope_id)
|
|
.is_closed_import()) {
|
|
// The existing name is a package name, so this is a name conflict.
|
|
context.DiagnoseDuplicateName(namespace_id, existing_inst_id);
|
|
|
|
// Treat this as a local namespace name from now on to avoid further
|
|
// diagnostics.
|
|
context.name_scopes()
|
|
.Get(existing->name_scope_id)
|
|
.set_is_closed_import(false);
|
|
} else if (existing->import_id.has_value() &&
|
|
!context.insts().GetLocId(existing_inst_id).has_value()) {
|
|
// When the name conflict is an imported namespace, fill the location ID
|
|
// so that future diagnostics point at this declaration.
|
|
context.SetNamespaceNodeId(existing_inst_id, node_id);
|
|
}
|
|
} else {
|
|
context.DiagnoseDuplicateName(namespace_id, existing_inst_id);
|
|
}
|
|
}
|
|
|
|
// If we weren't able to merge namespaces, add a new name scope. Note this
|
|
// occurs even for duplicates where we discard the namespace, because we want
|
|
// to produce a valid constant.
|
|
if (!namespace_inst.name_scope_id.has_value()) {
|
|
namespace_inst.name_scope_id = context.name_scopes().Add(
|
|
namespace_id, name_context.name_id_for_new_inst(),
|
|
name_context.parent_scope_id);
|
|
if (!IsNamespaceScope(context, name_context.parent_scope_id)) {
|
|
CARBON_DIAGNOSTIC(NamespaceDeclNotAtTopLevel, Error,
|
|
"`namespace` declaration not at top level");
|
|
context.emitter().Emit(node_id, NamespaceDeclNotAtTopLevel);
|
|
}
|
|
}
|
|
|
|
context.ReplaceInstBeforeConstantUse(namespace_id, namespace_inst);
|
|
|
|
context.decl_name_stack().PopScope();
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|