carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 14:41:06 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Improve diagnostics for the case where some or all of the prelude is missing. (#4276)

Browse Source 
Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
Richard Smith
2024-09-05 21:35:53 +00:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent ddfd4ad60d
commit 2d650f7d16
5 changed files with 341 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/context.cpp
+16 -11
View File
@@ -423,18 +423,19 @@ static auto GetCorePackage(Context& context, SemIRLoc loc)
auto core_inst_id = context.LookupNameInExactScope(
loc, core_name_id, SemIR::NameScopeId::Package,
context.name_scopes().Get(SemIR::NameScopeId::Package));
if (!core_inst_id.is_valid()) {
context.DiagnoseNameNotFound(loc, core_name_id);
return SemIR::NameScopeId::Invalid;
if (core_inst_id.is_valid()) {
// We expect it to be a namespace.
if (auto namespace_inst =
context.insts().TryGetAs<SemIR::Namespace>(core_inst_id)) {
// TODO: Decide whether to allow the case where `Core` is not a package.
return namespace_inst->name_scope_id;
}
}
// We expect it to be a namespace.
if (auto namespace_inst =
context.insts().TryGetAs<SemIR::Namespace>(core_inst_id)) {
return namespace_inst->name_scope_id;
}
// TODO: This should really diagnose the name issue.
context.DiagnoseNameNotFound(loc, core_name_id);
CARBON_DIAGNOSTIC(CoreNotFound, Error,
"Package `Core` implicitly referenced here, but not found.",
SemIR::NameId);
context.emitter().Emit(loc, CoreNotFound, core_name_id);
return SemIR::NameScopeId::Invalid;
}
@@ -449,7 +450,11 @@ auto Context::LookupNameInCore(SemIRLoc loc, llvm::StringRef name)
auto inst_id = LookupNameInExactScope(loc, name_id, core_package_id,
name_scopes().Get(core_package_id));
if (!inst_id.is_valid()) {
DiagnoseNameNotFound(loc, name_id);
CARBON_DIAGNOSTIC(
CoreNameNotFound, Error,
"Name `Core.{0}` implicitly referenced here, but not found.",
SemIR::NameId);
emitter_->Emit(loc, CoreNameNotFound, name_id);
return SemIR::InstId::BuiltinError;
}