feat: add scan_module_decl() fallback for conditional module declarations (#373)
## Summary - Add `scan_module_decl()` — a lightweight preprocessor-based fallback that resolves module declarations inside `#if`/`#ifdef` conditionals. When `scan()` detects `need_preprocess=true`, this function runs clang's preprocessor to evaluate conditions and extract the actual module name. It stops lexing as soon as the module declaration is found, making it much cheaper than `scan_precise()`. - Integrate the fallback into `scan_dependency_graph()` for wave 0 source files, so conditional module declarations (e.g. `#ifdef USE_MODULES / export module M; / #endif`) are correctly registered in the dependency graph. - Add comprehensive test cases covering all C++20 module declaration forms from cppreference, including `scan_module_decl()` tests for conditional resolution and `scan_precise()` tests for module import semantics. ## Test plan - [x] All 310 unit tests pass (0 failures, 9 skipped) - [x] `scan()` tests cover: primary interface, implementation, dotted names, partitions, GMF, conditional module declarations, private module fragment - [x] `scan_module_decl()` tests cover: basic, conditional with `-D`, conditional with `#if` expression, GMF with conditional, implementation unit, dotted name, partition, no-module file - [x] `scan_precise()` tests cover: named import, multiple imports, dotted import, partition import, export-import, export-import partition, implementation import, GMF with import, mixed includes/imports, no-module file 🤖 Generated with [Claude Code](https://claude.com/claude-code) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Improved detection of module declarations hidden by conditional compilation via a lightweight fallback scan. Resolved module vs. interface classification is cached to avoid repeated work and is used consistently in dependency mapping. * Better handling and classification of module imports, partitions, and global-fragment includes when building module relationships. * **Tests** * Added comprehensive unit tests covering module declaration extraction, fallback resolution under preprocessor guards, imports, partitions, includes, and macro-driven cases. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
ykiko
285
tests/unit/syntax/module_import_tests.cpp
Normal file
285
tests/unit/syntax/module_import_tests.cpp
Normal file
@@ -0,0 +1,285 @@
|
||||
#include "module_scan_fixture.h"
|
||||
#include "test/test.h"
|
||||
#include "syntax/scan.h"
|
||||
|
||||
namespace clice::testing {
|
||||
namespace {
|
||||
|
||||
// =============================================================================
|
||||
// scan_precise() — module import semantics
|
||||
// =============================================================================
|
||||
|
||||
TEST_SUITE(ModuleImportScan) {
|
||||
|
||||
TEST_CASE(NamedImport) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
import other;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
EXPECT_TRUE(result.is_interface_unit);
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "other");
|
||||
}
|
||||
|
||||
TEST_CASE(MultipleImports) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
import alpha;
|
||||
import beta;
|
||||
import gamma;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
ASSERT_EQ(result.modules.size(), 3u);
|
||||
EXPECT_EQ(result.modules[0], "alpha");
|
||||
EXPECT_EQ(result.modules[1], "beta");
|
||||
EXPECT_EQ(result.modules[2], "gamma");
|
||||
}
|
||||
|
||||
TEST_CASE(DottedModuleImport) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
import std.io;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "std.io");
|
||||
}
|
||||
|
||||
// Partition import: clang returns the fully-qualified name "mylib:core"
|
||||
// (owning module + ':' + partition name) as a single ModuleIdPath entry.
|
||||
TEST_CASE(PartitionImport) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
import :core;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "mylib:core");
|
||||
}
|
||||
|
||||
// Export-import of a named module.
|
||||
TEST_CASE(ExportImport) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
export import other;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "other");
|
||||
}
|
||||
|
||||
// Export-import of a partition.
|
||||
TEST_CASE(ExportImportPartition) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
export import :core;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "mylib:core");
|
||||
}
|
||||
|
||||
// Implementation unit importing a named module.
|
||||
TEST_CASE(ImplementationImport) {
|
||||
ModuleScanFixture f("impl.cpp", R"(
|
||||
module mylib;
|
||||
import other;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
EXPECT_FALSE(result.is_interface_unit);
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "other");
|
||||
}
|
||||
|
||||
// Implementation unit importing a partition of the same module.
|
||||
TEST_CASE(ImplementationPartitionImport) {
|
||||
ModuleScanFixture f("impl.cpp", R"(
|
||||
module mylib;
|
||||
import :utils;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "mylib:utils");
|
||||
}
|
||||
|
||||
// Multiple partition imports.
|
||||
TEST_CASE(MultiplePartitionImports) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
export import :core;
|
||||
import :utils;
|
||||
import :io;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
ASSERT_EQ(result.modules.size(), 3u);
|
||||
EXPECT_EQ(result.modules[0], "mylib:core");
|
||||
EXPECT_EQ(result.modules[1], "mylib:utils");
|
||||
EXPECT_EQ(result.modules[2], "mylib:io");
|
||||
}
|
||||
|
||||
// Mixed named module imports and partition imports.
|
||||
TEST_CASE(MixedNamedAndPartitionImports) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
import other;
|
||||
export import :core;
|
||||
import another.lib;
|
||||
import :utils;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
ASSERT_EQ(result.modules.size(), 4u);
|
||||
EXPECT_EQ(result.modules[0], "other");
|
||||
EXPECT_EQ(result.modules[1], "mylib:core");
|
||||
EXPECT_EQ(result.modules[2], "another.lib");
|
||||
EXPECT_EQ(result.modules[3], "mylib:utils");
|
||||
}
|
||||
|
||||
// NOTE: Header unit imports (import <header>; / import "header";) are not
|
||||
// tested here because they require actual header unit compilation support
|
||||
// which clang's PreprocessOnlyAction doesn't provide in a VFS-only context.
|
||||
// These would hang trying to resolve system headers.
|
||||
|
||||
// GMF with imports.
|
||||
TEST_CASE(GMFWithImport) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
module;
|
||||
#include "config.h"
|
||||
export module mylib;
|
||||
import dep;
|
||||
)");
|
||||
f.add_file("config.h", "// config\n");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
EXPECT_TRUE(result.is_interface_unit);
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "dep");
|
||||
}
|
||||
|
||||
// Mixed includes (from GMF) and imports (after module decl).
|
||||
TEST_CASE(MixedIncludesAndImports) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
module;
|
||||
#include "legacy.h"
|
||||
export module mylib;
|
||||
import dep_a;
|
||||
import dep_b;
|
||||
export int f();
|
||||
)");
|
||||
f.add_file("legacy.h", "int legacy_func();\n");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
ASSERT_GE(result.includes.size(), 1u);
|
||||
ASSERT_EQ(result.modules.size(), 2u);
|
||||
EXPECT_EQ(result.modules[0], "dep_a");
|
||||
EXPECT_EQ(result.modules[1], "dep_b");
|
||||
}
|
||||
|
||||
// No module — plain C++ file.
|
||||
TEST_CASE(NoModule) {
|
||||
ModuleScanFixture f("main.cpp", R"(
|
||||
#include "header.h"
|
||||
int main() { return 0; }
|
||||
)");
|
||||
f.add_file("header.h", "int x;\n");
|
||||
auto result = f.precise();
|
||||
EXPECT_TRUE(result.module_name.empty());
|
||||
EXPECT_FALSE(result.is_interface_unit);
|
||||
EXPECT_TRUE(result.modules.empty());
|
||||
}
|
||||
|
||||
// Partition interface unit declaring and importing another partition.
|
||||
TEST_CASE(PartitionInterfaceImportingPartition) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib:ui;
|
||||
import :core;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib:ui");
|
||||
EXPECT_TRUE(result.is_interface_unit);
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "mylib:core");
|
||||
}
|
||||
|
||||
// Partition implementation importing another partition.
|
||||
TEST_CASE(PartitionImplImportingPartition) {
|
||||
ModuleScanFixture f("impl.cpp", R"(
|
||||
module mylib:detail;
|
||||
import :core;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib:detail");
|
||||
EXPECT_FALSE(result.is_interface_unit);
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "mylib:core");
|
||||
}
|
||||
|
||||
// Import target is a macro-expanded name.
|
||||
// C++20 forbids object-like macros in module DECLARATIONS (export module M;),
|
||||
// but clang's preprocessor expands macros in import declarations.
|
||||
TEST_CASE(ImportMacroExpandedName) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
#define OTHER_MOD other
|
||||
import OTHER_MOD;
|
||||
)");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "other");
|
||||
}
|
||||
|
||||
// Import target from a macro defined on the command line.
|
||||
TEST_CASE(ImportMacroFromCommandLine) {
|
||||
ModuleScanFixture f("main.cppm",
|
||||
R"(
|
||||
export module mylib;
|
||||
import DEP_MOD;
|
||||
)",
|
||||
{"-DDEP_MOD=dependency"});
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "dependency");
|
||||
}
|
||||
|
||||
// Import target from a macro defined in GMF header.
|
||||
TEST_CASE(ImportMacroFromGMFHeader) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
module;
|
||||
#include "deps.h"
|
||||
export module mylib;
|
||||
import MY_DEP;
|
||||
)");
|
||||
f.add_file("deps.h", "#define MY_DEP some_lib\n");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "some_lib");
|
||||
}
|
||||
|
||||
// Import target from a macro defined in a header #included AFTER the module
|
||||
// declaration (not in GMF). C++20 allows #include after module declarations —
|
||||
// the preprocessor still processes them and any macros they define are visible
|
||||
// to subsequent import declarations.
|
||||
TEST_CASE(ImportMacroFromPostDeclInclude) {
|
||||
ModuleScanFixture f("main.cppm", R"(
|
||||
export module mylib;
|
||||
#include "imports.h"
|
||||
import MY_IMPORT;
|
||||
)");
|
||||
f.add_file("imports.h", "#define MY_IMPORT dep\n");
|
||||
auto result = f.precise();
|
||||
EXPECT_EQ(result.module_name, "mylib");
|
||||
ASSERT_EQ(result.modules.size(), 1u);
|
||||
EXPECT_EQ(result.modules[0], "dep");
|
||||
}
|
||||
|
||||
}; // TEST_SUITE(ModuleImportScan)
|
||||
|
||||
} // namespace
|
||||
} // namespace clice::testing
|
||||
Reference in New Issue
Block a user