carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 21:30:12 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Restrict the Cpp package name (#4618)

Browse Source 
We're looking at using this for imports, and it gets awkward if we allow
users to declare entries.
This commit is contained in:
Jon Ross-Perkins
2024-12-03 20:47:19 +00:00
committed by GitHub
parent 7005f39162
commit 48a84ca55d
4 changed files with 165 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/check.cpp
+16 -5
View File
@@ -545,11 +545,12 @@ static auto GetImportKey(UnitInfo& unit_info, IdentifierId file_package_id,
return {package_name, library_name};
}
static constexpr llvm::StringLiteral ExplicitMainName = "Main";
static constexpr llvm::StringLiteral CppPackageName = "Cpp";
static constexpr llvm::StringLiteral MainPackageName = "Main";
static auto RenderImportKey(ImportKey import_key) -> std::string {
if (import_key.first.empty()) {
import_key.first = ExplicitMainName;
import_key.first = MainPackageName;
}
if (import_key.second.empty()) {
return import_key.first.str();
@@ -573,7 +574,7 @@ static auto TrackImport(Map<ImportKey, UnitInfo*>& api_map,
// True if the import has `Main` as the package name, even if it comes from
// the file's packaging (diagnostics may differentiate).
bool is_explicit_main = import_key.first == ExplicitMainName;
bool is_explicit_main = import_key.first == MainPackageName;
// Explicit imports need more validation than implicit ones. We try to do
// these in an order of imports that should be removed, followed by imports
@@ -688,6 +689,11 @@ static auto TrackImport(Map<ImportKey, UnitInfo*>& api_map,
} else {
// The imported api is missing.
package_imports.has_load_error = true;
if (!explicit_import_map && import_key.first == CppPackageName) {
// Don't diagnose the implicit import in `impl package Cpp`, because we'll
// have diagnosed the use of `Cpp` in the declaration.
return;
}
CARBON_DIAGNOSTIC(LibraryApiNotFound, Error,
"corresponding API for '{0}' not found", std::string);
CARBON_DIAGNOSTIC(ImportNotFound, Error, "imported API '{0}' not found",
@@ -714,9 +720,9 @@ static auto BuildApiMapAndDiagnosePackaging(
// Construct a boring key for Main//default.
: ImportKey{"", ""};
// Diagnose explicit `Main` uses before they become marked as possible
// Diagnose restricted package names before they become marked as possible
// APIs.
if (import_key.first == ExplicitMainName) {
if (import_key.first == MainPackageName) {
CARBON_DIAGNOSTIC(ExplicitMainPackage, Error,
"`Main//default` must omit `package` declaration");
CARBON_DIAGNOSTIC(
@@ -726,6 +732,11 @@ static auto BuildApiMapAndDiagnosePackaging(
import_key.second.empty() ? ExplicitMainPackage
: ExplicitMainLibrary);
continue;
} else if (import_key.first == CppPackageName) {
CARBON_DIAGNOSTIC(CppPackageDeclaration, Error,
"`Cpp` cannot be used by a `package` declaration");
unit_info.emitter.Emit(packaging->names.node_id, CppPackageDeclaration);
continue;
}
bool is_impl = packaging && packaging->is_impl;