mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-22 18:12:39 +00:00
This revamps the support for cross-package imports, making them look more like a namespace. The planned model is mentioned on [#toolchain](https://discord.com/channels/655572317891461132/655578254970716160/1217586076022210670). This does not implement name lookup into the new namespace structure. A few key changes in this PR (it's a little sprawling) are: - Moves logic for adding package imports from context.* to import.* - Remove SemIR::Import, which was the prior model. This is instead now a SemIR::Namespace with the NameScope getting a new import_ir_scopes field. - Allow SemIR::Namespace to use Parse::ImportDirectiveId in addition to the prior Parse::NamespaceId - The import_ir_scopes field includes a NameScopeId so that as we traverse to child namespaces, we can directly perform name lookup in the other IR. - is_closed_import now tracks whether a namespace comes from a different package. This has a diagnostic implemented in decl_name_stack.
94 lines
2.7 KiB
Plaintext
94 lines
2.7 KiB
Plaintext
// 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
|
|
//
|
|
// AUTOUPDATE
|
|
|
|
// --- api.carbon
|
|
|
|
package Api api;
|
|
|
|
// --- api_lib.carbon
|
|
|
|
package Api library "lib" api;
|
|
|
|
// --- main_lib.carbon
|
|
|
|
library "lib" api;
|
|
|
|
// --- fail_import.carbon
|
|
|
|
import Api;
|
|
// CHECK:STDERR: fail_import.carbon:[[@LINE+6]]:1: ERROR: Library imported more than once.
|
|
// CHECK:STDERR: import Api;
|
|
// CHECK:STDERR: ^~~~~~
|
|
// CHECK:STDERR: fail_import.carbon:[[@LINE-4]]:1: First import here.
|
|
// CHECK:STDERR: import Api;
|
|
// CHECK:STDERR: ^~~~~~
|
|
import Api;
|
|
|
|
import Api library "lib";
|
|
// CHECK:STDERR: fail_import.carbon:[[@LINE+6]]:1: ERROR: Library imported more than once.
|
|
// CHECK:STDERR: import Api library "lib";
|
|
// CHECK:STDERR: ^~~~~~
|
|
// CHECK:STDERR: fail_import.carbon:[[@LINE-4]]:1: First import here.
|
|
// CHECK:STDERR: import Api library "lib";
|
|
// CHECK:STDERR: ^~~~~~
|
|
import Api library "lib";
|
|
|
|
import library "lib";
|
|
// CHECK:STDERR: fail_import.carbon:[[@LINE+6]]:1: ERROR: Library imported more than once.
|
|
// CHECK:STDERR: import library "lib";
|
|
// CHECK:STDERR: ^~~~~~
|
|
// CHECK:STDERR: fail_import.carbon:[[@LINE-4]]:1: First import here.
|
|
// CHECK:STDERR: import library "lib";
|
|
// CHECK:STDERR: ^~~~~~
|
|
import library "lib";
|
|
|
|
// --- fail_default_import.carbon
|
|
|
|
package Api library "not_default" api;
|
|
|
|
import library default;
|
|
// CHECK:STDERR: fail_default_import.carbon:[[@LINE+6]]:1: ERROR: Library imported more than once.
|
|
// CHECK:STDERR: import library default;
|
|
// CHECK:STDERR: ^~~~~~
|
|
// CHECK:STDERR: fail_default_import.carbon:[[@LINE-4]]:1: First import here.
|
|
// CHECK:STDERR: import library default;
|
|
// CHECK:STDERR: ^~~~~~
|
|
import library default;
|
|
|
|
// CHECK:STDOUT: --- api.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- api_lib.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- main_lib.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- fail_import.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Api = %Api
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Api: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- fail_default_import.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|