Skip to content

Commit 5173269

Browse files
committed
fix: convert ALL raw string literals with import to regular strings
clang-scan-deps on Windows false-positives on import statements inside R"(...)" raw string literals. Convert all test module source strings in test_modgraph.cpp to regular string concatenation. Fixes bar.pcm, x.pcm, and partition import false positives.
1 parent 1289736 commit 5173269

1 file changed

Lines changed: 20 additions & 18 deletions

File tree

‎tests/unit/test_modgraph.cpp‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ TEST(Scanner, PartitionImportFromPrimaryInterface) {
5050
// Primary module interface: `export module foo;` → logicalName = "foo".
5151
// `import :tls;` resolves to "foo:tls".
5252
auto dir = make_tempdir("mcpp-scanner");
53-
write(dir / "src" / "foo.cppm", R"(export module foo;
54-
import :tls;
55-
)");
53+
write(dir / "src" / "foo.cppm",
54+
"export module foo;\n"
55+
"import :tls;\n");
5656
auto u = scan_file(dir / "src" / "foo.cppm", "pkg");
5757
ASSERT_TRUE(u.has_value()) << u.error().format();
5858
ASSERT_EQ(u->requires_.size(), 1u);
@@ -65,10 +65,10 @@ TEST(Scanner, PartitionImportFromAnotherPartition) {
6565
// `import :tls;` must resolve to "foo:tls" (the sibling partition),
6666
// NOT "foo:http:tls" (which is what a naive prepend produces).
6767
auto dir = make_tempdir("mcpp-scanner");
68-
write(dir / "src" / "http.cppm", R"(export module foo:http;
69-
import :tls;
70-
import :socket;
71-
)");
68+
write(dir / "src" / "http.cppm",
69+
"export module foo:http;\n"
70+
"import :tls;\n"
71+
"import :socket;\n");
7272
auto u = scan_file(dir / "src" / "http.cppm", "pkg");
7373
ASSERT_TRUE(u.has_value()) << u.error().format();
7474
ASSERT_TRUE(u->provides.has_value());
@@ -83,9 +83,9 @@ TEST(Scanner, PartitionImportWithDottedModuleName) {
8383
// Dotted module names (xpkg-style, e.g. `mcpplibs.tinyhttps:http`)
8484
// — only the colon-prefixed partition suffix is what we strip.
8585
auto dir = make_tempdir("mcpp-scanner");
86-
write(dir / "src" / "http.cppm", R"(export module mcpplibs.tinyhttps:http;
87-
import :tls;
88-
)");
86+
write(dir / "src" / "http.cppm",
87+
"export module mcpplibs.tinyhttps:http;\n"
88+
"import :tls;\n");
8989
auto u = scan_file(dir / "src" / "http.cppm", "pkg");
9090
ASSERT_TRUE(u.has_value()) << u.error().format();
9191
ASSERT_EQ(u->requires_.size(), 1u);
@@ -95,11 +95,12 @@ import :tls;
9595

9696
TEST(Scanner, RejectsConditionalImport) {
9797
auto dir = make_tempdir("mcpp-scanner");
98-
write(dir / "main.cpp", R"(import std;
99-
#ifdef WANT_X
100-
import x;
101-
#endif
102-
int main(){})");
98+
write(dir / "main.cpp",
99+
"import std;\n"
100+
"#ifdef WANT_X\n"
101+
"import x;\n"
102+
"#endif\n"
103+
"int main(){}");
103104
auto r = scan_file(dir / "main.cpp", "pkg");
104105
EXPECT_FALSE(r.has_value());
105106
EXPECT_NE(r.error().message.find("conditional"), std::string::npos);
@@ -108,9 +109,10 @@ int main(){})");
108109

109110
TEST(Scanner, RejectsHeaderUnit) {
110111
auto dir = make_tempdir("mcpp-scanner");
111-
write(dir / "main.cpp", R"(import std;
112-
import "x.h";
113-
int main(){})");
112+
write(dir / "main.cpp",
113+
"import std;\n"
114+
"import \"x.h\";\n"
115+
"int main(){}");
114116
auto r = scan_file(dir / "main.cpp", "pkg");
115117
EXPECT_FALSE(r.has_value());
116118
EXPECT_NE(r.error().message.find("header units"), std::string::npos);

0 commit comments

Comments
 (0)