Files
carbon-lang/toolchain/check/handle_name.cpp
T
Jon Ross-Perkins 6b5eb1a101 Id::Invalid -> Id::None (#4834)
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.
2025-01-22 23:15:00 +00:00

247 lines
9.6 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/generic.h"
#include "toolchain/check/handle.h"
#include "toolchain/check/member_access.h"
#include "toolchain/check/name_component.h"
#include "toolchain/check/pointer_dereference.h"
#include "toolchain/lex/token_kind.h"
#include "toolchain/sem_ir/inst.h"
#include "toolchain/sem_ir/typed_insts.h"
namespace Carbon::Check {
auto HandleParseNode(Context& context, Parse::MemberAccessExprId node_id)
-> bool {
auto node_kind = context.node_stack().PeekNodeKind();
if (node_kind == Parse::NodeKind::ParenExpr) {
auto member_expr_id = context.node_stack().PopExpr();
auto base_id = context.node_stack().PopExpr();
auto member_id =
PerformCompoundMemberAccess(context, node_id, base_id, member_expr_id);
context.node_stack().Push(node_id, member_id);
} else if (node_kind == Parse::NodeKind::IntLiteral) {
auto index_inst_id = context.node_stack().PopExpr();
auto tuple_inst_id = context.node_stack().PopExpr();
auto tuple_value_inst_id =
PerformTupleAccess(context, node_id, tuple_inst_id, index_inst_id);
context.node_stack().Push(node_id, tuple_value_inst_id);
} else {
SemIR::NameId name_id = context.node_stack().PopName();
auto base_id = context.node_stack().PopExpr();
auto member_id = PerformMemberAccess(context, node_id, base_id, name_id);
context.node_stack().Push(node_id, member_id);
}
return true;
}
auto HandleParseNode(Context& context, Parse::PointerMemberAccessExprId node_id)
-> bool {
auto diagnose_not_pointer = [&context,
&node_id](SemIR::TypeId not_pointer_type_id) {
// TODO: Pass in the expression we're trying to dereference to produce a
// better diagnostic.
CARBON_DIAGNOSTIC(ArrowOperatorOfNonPointer, Error,
"cannot apply `->` operator to non-pointer type {0}",
SemIR::TypeId);
auto builder = context.emitter().Build(
TokenOnly(node_id), ArrowOperatorOfNonPointer, not_pointer_type_id);
builder.Emit();
};
auto node_kind = context.node_stack().PeekNodeKind();
if (node_kind == Parse::NodeKind::ParenExpr) {
auto member_expr_id = context.node_stack().PopExpr();
auto base_id = context.node_stack().PopExpr();
auto deref_base_id = PerformPointerDereference(context, node_id, base_id,
diagnose_not_pointer);
auto member_id = PerformCompoundMemberAccess(context, node_id,
deref_base_id, member_expr_id);
context.node_stack().Push(node_id, member_id);
} else if (node_kind == Parse::NodeKind::IntLiteral) {
auto index_inst_id = context.node_stack().PopExpr();
auto tuple_pointer_inst_id = context.node_stack().PopExpr();
auto tuple_inst_id = PerformPointerDereference(
context, node_id, tuple_pointer_inst_id, diagnose_not_pointer);
auto tuple_value_inst_id =
PerformTupleAccess(context, node_id, tuple_inst_id, index_inst_id);
context.node_stack().Push(node_id, tuple_value_inst_id);
} else {
SemIR::NameId name_id = context.node_stack().PopName();
auto base_id = context.node_stack().PopExpr();
auto deref_base_id = PerformPointerDereference(context, node_id, base_id,
diagnose_not_pointer);
auto member_id =
PerformMemberAccess(context, node_id, deref_base_id, name_id);
context.node_stack().Push(node_id, member_id);
}
return true;
}
static auto GetIdentifierAsName(Context& context, Parse::NodeId node_id)
-> std::optional<SemIR::NameId> {
auto token = context.parse_tree().node_token(node_id);
if (context.tokens().GetKind(token) != Lex::TokenKind::Identifier) {
CARBON_CHECK(context.parse_tree().node_has_error(node_id));
return std::nullopt;
}
return SemIR::NameId::ForIdentifier(context.tokens().GetIdentifier(token));
}
// Handle a name that is used as an expression by performing unqualified name
// lookup.
static auto HandleNameAsExpr(Context& context, Parse::NodeId node_id,
SemIR::NameId name_id) -> SemIR::InstId {
auto result = context.LookupUnqualifiedName(node_id, name_id);
auto value = context.insts().Get(result.inst_id);
auto type_id = SemIR::GetTypeInSpecific(context.sem_ir(), result.specific_id,
value.type_id());
CARBON_CHECK(type_id.has_value(), "Missing type for {0}", value);
// If the named entity has a constant value that depends on its specific,
// store the specific too.
if (result.specific_id.has_value() &&
context.constant_values().Get(result.inst_id).is_symbolic()) {
result.inst_id = context.AddInst<SemIR::SpecificConstant>(
node_id, {.type_id = type_id,
.inst_id = result.inst_id,
.specific_id = result.specific_id});
}
return context.AddInst<SemIR::NameRef>(
node_id,
{.type_id = type_id, .name_id = name_id, .value_id = result.inst_id});
}
static auto HandleIdentifierName(Context& context,
Parse::AnyNonExprIdentifierNameId node_id)
-> bool {
// The parent is responsible for binding the name.
auto name_id = GetIdentifierAsName(context, node_id);
CARBON_CHECK(name_id,
"Unreachable until we support checking error parse nodes");
context.node_stack().Push(node_id, *name_id);
return true;
}
auto HandleParseNode(Context& context,
Parse::IdentifierNameNotBeforeParamsId node_id) -> bool {
return HandleIdentifierName(context, node_id);
}
auto HandleParseNode(Context& context,
Parse::IdentifierNameBeforeParamsId node_id) -> bool {
// Push a pattern block stack entry to handle the parameter pattern.
context.pattern_block_stack().Push();
context.full_pattern_stack().PushFullPattern();
return HandleIdentifierName(context, node_id);
}
auto HandleParseNode(Context& context, Parse::IdentifierNameExprId node_id)
-> bool {
auto name_id = GetIdentifierAsName(context, node_id);
CARBON_CHECK(name_id,
"Unreachable until we support checking error parse nodes");
context.node_stack().Push(node_id,
HandleNameAsExpr(context, node_id, *name_id));
return true;
}
auto HandleParseNode(Context& context, Parse::BaseNameId node_id) -> bool {
context.node_stack().Push(node_id, SemIR::NameId::Base);
return true;
}
auto HandleParseNode(Context& context, Parse::SelfTypeNameId node_id) -> bool {
context.node_stack().Push(node_id, SemIR::NameId::SelfType);
return true;
}
auto HandleParseNode(Context& context, Parse::SelfTypeNameExprId node_id)
-> bool {
context.node_stack().Push(
node_id, HandleNameAsExpr(context, node_id, SemIR::NameId::SelfType));
return true;
}
auto HandleParseNode(Context& context, Parse::SelfValueNameId node_id) -> bool {
context.node_stack().Push(node_id, SemIR::NameId::SelfValue);
return true;
}
auto HandleParseNode(Context& context, Parse::SelfValueNameExprId node_id)
-> bool {
context.node_stack().Push(
node_id, HandleNameAsExpr(context, node_id, SemIR::NameId::SelfValue));
return true;
}
auto HandleParseNode(Context& context,
Parse::NameQualifierWithParamsId /*node_id*/) -> bool {
context.decl_name_stack().ApplyNameQualifier(PopNameComponent(context));
return true;
}
auto HandleParseNode(Context& context,
Parse::NameQualifierWithoutParamsId /*node_id*/) -> bool {
context.decl_name_stack().ApplyNameQualifier(PopNameComponent(context));
return true;
}
auto HandleParseNode(Context& context, Parse::DesignatorExprId node_id)
-> bool {
SemIR::NameId name_id = context.node_stack().PopName();
if (name_id == SemIR::NameId::SelfType) {
// Look up `.Self`.
SemIR::InstId period_self_id =
HandleNameAsExpr(context, node_id, SemIR::NameId::PeriodSelf);
context.node_stack().Push(node_id, period_self_id);
} else {
// Otherwise this is `.Member`, so look up `.Self` and then `Member` in
// `.Self`.
SemIR::InstId period_self_id = SemIR::InstId::None;
{
// TODO: Instead of annotating the diagnostic, should change
// `HandleNameAsExpr` to optionally allow us to produce the diagnostic
// instead so we can generate a "name `.Self` implicitly referenced by
// designated expression, but not found" diagnostic instead of adding a
// note to the current "name `.Self` not found" message.
DiagnosticAnnotationScope annotate_diagnostics(
&context.emitter(), [&](auto& builder) {
CARBON_DIAGNOSTIC(
NoPeriodSelfForDesignator, Note,
"designator may only be used when `.Self` is in scope");
builder.Note(SemIR::LocId::None, NoPeriodSelfForDesignator);
});
period_self_id =
HandleNameAsExpr(context, node_id, SemIR::NameId::PeriodSelf);
}
auto member_id =
PerformMemberAccess(context, node_id, period_self_id, name_id);
context.node_stack().Push(node_id, member_id);
}
return true;
}
auto HandleParseNode(Context& context, Parse::PackageExprId node_id) -> bool {
context.AddInstAndPush<SemIR::NameRef>(
node_id, {.type_id = context.GetSingletonType(
SemIR::NamespaceType::SingletonInstId),
.name_id = SemIR::NameId::PackageNamespace,
.value_id = SemIR::Namespace::PackageInstId});
return true;
}
} // namespace Carbon::Check