mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
47e551141f
Instead of naming the root namespace `package` (because it's accessed by the `package` keyword), change it to use the current package name. Note, buried in the checksum changes, `toolchain/check/testdata/package_expr/fail_not_found.carbon`: ``` - // CHECK:STDERR: fail_not_found.carbon:[[@LINE+4]]:16: error: member name `x` not found in `package` [MemberNameNotFoundInInstScope] + // CHECK:STDERR: fail_not_found.carbon:[[@LINE+4]]:16: error: member name `x` not found in `Main` [MemberNameNotFoundInInstScope] ``` for: ``` // CHECK:STDERR: var y: i32 = package.x; // CHECK:STDERR: ^~~~~~~~~ ``` I'll leave it to you if you prefer this; the alternative I see is to just rename `IsCorePackage` to `IsImportedCorePackage`, and/or change it to a helper that takes a `Context` and does the right thing with `parse_tree` (which, I need for `Destroy`-related reasons and was my default approach).
71 lines
2.4 KiB
C++
71 lines
2.4 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/sem_ir/name.h"
|
|
|
|
#include "llvm/ADT/StringSwitch.h"
|
|
|
|
namespace Carbon::SemIR {
|
|
|
|
// Get the spelling to use for a special name.
|
|
static auto GetSpecialName(NameId name_id, bool for_ir) -> llvm::StringRef {
|
|
if (name_id == NameId::None) {
|
|
return for_ir ? "" : "<none>";
|
|
}
|
|
|
|
auto special_name_id = name_id.AsSpecialNameId();
|
|
CARBON_CHECK(special_name_id, "Not a special name");
|
|
switch (*special_name_id) {
|
|
case NameId::SpecialNameId::Base:
|
|
return "base";
|
|
case NameId::SpecialNameId::ChoiceDiscriminant:
|
|
return "discriminant";
|
|
case NameId::SpecialNameId::Core:
|
|
return "Core";
|
|
case NameId::SpecialNameId::Cpp:
|
|
return "Cpp";
|
|
case NameId::SpecialNameId::CppDestructor:
|
|
return for_ir ? "cpp_destructor" : "<C++ destructor>";
|
|
case NameId::SpecialNameId::CppOperator:
|
|
return for_ir ? "cpp_operator" : "<C++ operator>";
|
|
case NameId::SpecialNameId::MainPackage:
|
|
return "Main";
|
|
case NameId::SpecialNameId::PackageKeyword:
|
|
return "package";
|
|
case NameId::SpecialNameId::PeriodSelf:
|
|
return ".Self";
|
|
case NameId::SpecialNameId::ReturnSlot:
|
|
return for_ir ? "return" : "<return slot>";
|
|
case NameId::SpecialNameId::SelfType:
|
|
return "Self";
|
|
case NameId::SpecialNameId::SelfValue:
|
|
return "self";
|
|
case NameId::SpecialNameId::Underscore:
|
|
return "_";
|
|
case NameId::SpecialNameId::Vptr:
|
|
return for_ir ? "vptr" : "<vptr>";
|
|
}
|
|
}
|
|
|
|
auto NameStoreWrapper::GetFormatted(NameId name_id) const -> llvm::StringRef {
|
|
// If the name is an identifier name with a keyword spelling, format it with
|
|
// an `r#` prefix. Format any other identifier name as just the identifier.
|
|
if (auto string_name = GetAsStringIfIdentifier(name_id)) {
|
|
return llvm::StringSwitch<llvm::StringRef>(*string_name)
|
|
#define CARBON_KEYWORD_TOKEN(Name, Spelling) .Case(Spelling, "r#" Spelling)
|
|
#include "toolchain/lex/token_kind.def"
|
|
.Default(*string_name);
|
|
}
|
|
return GetSpecialName(name_id, /*for_ir=*/false);
|
|
}
|
|
|
|
auto NameStoreWrapper::GetIRBaseName(NameId name_id) const -> llvm::StringRef {
|
|
if (auto string_name = GetAsStringIfIdentifier(name_id)) {
|
|
return *string_name;
|
|
}
|
|
return GetSpecialName(name_id, /*for_ir=*/true);
|
|
}
|
|
|
|
} // namespace Carbon::SemIR
|