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

Support indirect imports of namespaces. (#7122)

Browse Source 
When a namespace that was imported from C++ is indirectly imported, find
the corresponding namespace in the current C++ AST and return that
instead. This namespace may have completely different contents than the
one we found before; that's fine. The current file's view of a namespace
depends on what it imported.

Assisted-by: Gemini via Antigravity
This commit is contained in:
Richard Smith
2026-04-28 23:55:18 +00:00
committed by GitHub
parent 7bb86bad66
commit ab0aff91b8
5 changed files with 202 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/interop/cpp/basics/import/import.carbon
Vendored
-35
View File
@@ -10,41 +10,6 @@
// TIP: To dump output, run:
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/interop/cpp/basics/import/import.carbon
// ============================================================================
// Import C++ namespace indirectly
// ============================================================================
// --- namespace.h
namespace MyNamespace {
class MyClass {};
} // namespace MyNamespace
// --- namespace_api.carbon
library "[[@TEST_NAME]]";
import Cpp library "namespace.h";
alias MyNamespaceAlias = Cpp.MyNamespace;
// --- fail_import_namespace_api.carbon
library "[[@TEST_NAME]]";
import library "namespace_api";
fn F() {
// Imports are not implicitly re-exported, so lookup is expected to fail.
// CHECK:STDERR: fail_import_namespace_api.carbon:[[@LINE+4]]:17: error: member name `MyClass` not found in `Cpp.MyNamespace` [MemberNameNotFoundInInstScope]
// CHECK:STDERR: var unused x: MyNamespaceAlias.MyClass;
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
var unused x: MyNamespaceAlias.MyClass;
}
// ============================================================================
// Import C++ struct indirectly
// ============================================================================
toolchain/check/testdata/interop/cpp/namespace/import.carbon
Vendored
+133 -1
View File
@@ -16,7 +16,10 @@
// --- single.h
namespace my_namespace { void foo(); }
namespace my_namespace {
void foo();
void bar();
}
// --- import_single.carbon
@@ -233,6 +236,135 @@ fn Use(y: Cpp.Y) -> i32 {
return y.x.n;
}
// ============================================================================
// Import C++ namespace indirectly
// ============================================================================
// --- namespace_alias.carbon
library "[[@TEST_NAME]]";
import Cpp library "single.h";
alias MyNamespaceAlias = Cpp.my_namespace;
fn CallFoo() {
MyNamespaceAlias.foo();
}
// --- fail_indirect_namespace_no_import.carbon
library "[[@TEST_NAME]]";
// CHECK:STDERR: fail_indirect_namespace_no_import.carbon:[[@LINE+8]]:1: in import [InImport]
// CHECK:STDERR: namespace_alias.carbon:4:1: error: semantics TODO: `indirect import of C++ declaration with no direct Cpp import` [SemanticsTodo]
// CHECK:STDERR: import Cpp library "single.h";
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
// CHECK:STDERR: fail_indirect_namespace_no_import.carbon:[[@LINE+3]]:1: in import [InImport]
// CHECK:STDERR: namespace_alias.carbon: error: semantics TODO: `indirect import of C++ declaration with no direct Cpp import` [SemanticsTodo]
// CHECK:STDERR:
import library "namespace_alias";
fn F() {
// Imports are not implicitly re-exported, so lookup is expected to fail,
// regardless of whether a lookup was performed in the imported file.
// CHECK:STDERR: fail_indirect_namespace_no_import.carbon:[[@LINE+4]]:3: error: member name `foo` not found in `Cpp.my_namespace` [MemberNameNotFoundInInstScope]
// CHECK:STDERR: MyNamespaceAlias.foo();
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
MyNamespaceAlias.foo();
// CHECK:STDERR: fail_indirect_namespace_no_import.carbon:[[@LINE+4]]:3: error: member name `bar` not found in `Cpp.my_namespace` [MemberNameNotFoundInInstScope]
// CHECK:STDERR: MyNamespaceAlias.bar();
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
MyNamespaceAlias.bar();
}
// --- fail_indirect_namespace_no_local_decl.carbon
library "[[@TEST_NAME]]";
// CHECK:STDERR: fail_indirect_namespace_no_local_decl.carbon:[[@LINE+3]]:1: in import [InImport]
// CHECK:STDERR: namespace_alias.carbon: error: semantics TODO: `use of imported C++ declaration with no corresponding local import` [SemanticsTodo]
// CHECK:STDERR:
import library "namespace_alias";
import Cpp;
fn F() {
// Imports are not implicitly re-exported, so name lookup is expected to
// fail, regardless of whether a lookup was performed in the imported file.
// CHECK:STDERR: fail_indirect_namespace_no_local_decl.carbon:[[@LINE+4]]:3: error: member name `foo` not found in `Cpp.my_namespace` [MemberNameNotFoundInInstScope]
// CHECK:STDERR: MyNamespaceAlias.foo();
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
MyNamespaceAlias.foo();
// CHECK:STDERR: fail_indirect_namespace_no_local_decl.carbon:[[@LINE+4]]:3: error: member name `bar` not found in `Cpp.my_namespace` [MemberNameNotFoundInInstScope]
// CHECK:STDERR: MyNamespaceAlias.bar();
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
MyNamespaceAlias.bar();
}
// --- indirect_namespace_same_contents.carbon
library "[[@TEST_NAME]]";
import library "namespace_alias";
import Cpp library "single.h";
fn F() {
// OK, MyNamespaceAlias is an alias for Cpp.my_namespace.
MyNamespaceAlias.foo();
MyNamespaceAlias.bar();
}
// --- fail_indirect_namespace_different_contents_invalid.carbon
library "[[@TEST_NAME]]";
import library "namespace_alias";
import Cpp;
inline Cpp '''
namespace my_namespace {
void bar();
}
''';
fn F() {
// Cpp imports are not implicitly re-exported, so name lookup is expected to
// fail.
// CHECK:STDERR: fail_indirect_namespace_different_contents_invalid.carbon:[[@LINE+4]]:3: error: member name `foo` not found in `Cpp.my_namespace` [MemberNameNotFoundInInstScope]
// CHECK:STDERR: MyNamespaceAlias.foo();
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~
// CHECK:STDERR:
MyNamespaceAlias.foo();
}
// --- indirect_namespace_different_contents.carbon
library "[[@TEST_NAME]]";
import library "namespace_alias";
import Cpp;
inline Cpp '''
namespace my_namespace {
void bar();
void baz();
}
''';
fn F() {
// OK, bar is visible here and is found in MyNamespaceAlias, which is an alias
// for Cpp.my_namespace.
MyNamespaceAlias.bar();
MyNamespaceAlias.baz();
}
// CHECK:STDOUT: --- import_single.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {