mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-22 02:56:41 +00:00
Building on #3636 which handles the general import case, add special casing for namespaces. Namespaces can be combined cross-IR, so it's a little more complex. The implementation adds import_id to the Namespace instruction as a reference to find the original using the normal structure. This is achieved by moving the name_id to NameScope to free up space. --- I considered a few alternatives... I considered adding import_id to NameScope, but: 1. It's more consistent with things such as Function or Class that provide name_id on the info object rather than the instruction. 2. I thought it more likely that there would be more NameScope cases that might want a name_id rather than the import_id, since ImportRef will typically be used. I considered putting the import source (cross-ref IR id + inst id) on the NameScope versus a separate ImportRef, which seems like the strongest argument towards the NameScope approach because it removes an instruction. That just felt inconsistent though, and the overhead of instruction-per-imported-namespace should be low (theoretically few namespaces should be used). Plus I feel a bit odd adding two generally-unused ids to NameScope. A specialized Namespace structure could also have been created to store the import_id, but that would add an indirection to the NameScope.
88 lines
2.6 KiB
Plaintext
88 lines
2.6 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
|
|
|
|
// --- a.carbon
|
|
|
|
package A api;
|
|
|
|
// CHECK:STDERR: a.carbon:[[@LINE+3]]:1: ERROR: Import cannot be used due to a cycle. Cycle must be fixed to import.
|
|
// CHECK:STDERR: import B;
|
|
// CHECK:STDERR: ^~~~~~
|
|
import B;
|
|
|
|
// --- b.carbon
|
|
|
|
package B api;
|
|
|
|
// CHECK:STDERR: b.carbon:[[@LINE+3]]:1: ERROR: Import cannot be used due to a cycle. Cycle must be fixed to import.
|
|
// CHECK:STDERR: import C;
|
|
// CHECK:STDERR: ^~~~~~
|
|
import C;
|
|
|
|
// --- c.carbon
|
|
|
|
package C api;
|
|
|
|
// CHECK:STDERR: c.carbon:[[@LINE+3]]:1: ERROR: Import cannot be used due to a cycle. Cycle must be fixed to import.
|
|
// CHECK:STDERR: import A;
|
|
// CHECK:STDERR: ^~~~~~
|
|
import A;
|
|
|
|
// --- c.impl.carbon
|
|
|
|
// CHECK:STDERR: c.impl.carbon:[[@LINE+3]]:1: ERROR: Import cannot be used due to a cycle. Cycle must be fixed to import.
|
|
// CHECK:STDERR: package C impl;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
package C impl;
|
|
|
|
// --- cycle_child.carbon
|
|
|
|
package CycleChild api;
|
|
|
|
// CHECK:STDERR: cycle_child.carbon:[[@LINE+3]]:1: ERROR: Import cannot be used due to a cycle. Cycle must be fixed to import.
|
|
// CHECK:STDERR: import B;
|
|
// CHECK:STDERR: ^~~~~~
|
|
import B;
|
|
|
|
// CHECK:STDOUT: --- a.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {} [template]
|
|
// CHECK:STDOUT: %import: <namespace> = import ir1, ir1
|
|
// CHECK:STDOUT: %B: <namespace> = bind_name B, %import
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- b.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {} [template]
|
|
// CHECK:STDOUT: %import: <namespace> = import ir1, ir1
|
|
// CHECK:STDOUT: %C: <namespace> = bind_name C, %import
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- c.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {} [template]
|
|
// CHECK:STDOUT: %import: <namespace> = import ir1, ir1
|
|
// CHECK:STDOUT: %A: <namespace> = bind_name A, %import
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- c.impl.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {has_error} [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- cycle_child.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {} [template]
|
|
// CHECK:STDOUT: %import: <namespace> = import ir1, ir1
|
|
// CHECK:STDOUT: %B: <namespace> = bind_name B, %import
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|