Merge pull request #2623 from Arthapz/cxx20-modules-support

[Draft] Improve C++20 modules support

7 files changed, 48 insertions, 0 deletions

diff --git a/tests/projects/c++/modules/stl_headerunit/src/hello.mpp b/tests/projects/c++/modules/stl_headerunit/src/hello.mpp
new file mode 100644
index 000000000..d45c5759e
--- /dev/null
+++ b/tests/projects/c++/modules/stl_headerunit/src/hello.mpp
@@ -0,0 +1,11 @@
+module;
+
+export module hello;
+
+import <iostream>;
+
+export namespace hello {
+    void say(const char* str) {
+        std::cout << str << std::endl;
+    }
+}
diff --git a/tests/projects/c++/modules/stl_headerunit/src/main.cpp b/tests/projects/c++/modules/stl_headerunit/src/main.cpp
new file mode 100644
index 000000000..1e5cc698f
--- /dev/null
+++ b/tests/projects/c++/modules/stl_headerunit/src/main.cpp
@@ -0,0 +1,6 @@
+import hello;
+
+int main() {
+    hello::say("hello module!");
+    return 0;
+}
diff --git a/tests/projects/c++/modules/stl_headerunit/xmake.lua b/tests/projects/c++/modules/stl_headerunit/xmake.lua
new file mode 100644
index 000000000..e85378c46
--- /dev/null
+++ b/tests/projects/c++/modules/stl_headerunit/xmake.lua
@@ -0,0 +1,4 @@
+set_languages("c++20")
+target("stl_headerunit")
+    set_kind("binary")
+    add_files("src/*.cpp", "src/*.mpp")
diff --git a/tests/projects/c++/modules/user_headerunit/src/header.hpp b/tests/projects/c++/modules/user_headerunit/src/header.hpp
new file mode 100644
index 000000000..15e522e15
--- /dev/null
+++ b/tests/projects/c++/modules/user_headerunit/src/header.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+namespace hello {
+    extern constexpr auto FOO = "Hello";
+}
diff --git a/tests/projects/c++/modules/user_headerunit/src/hello.mpp b/tests/projects/c++/modules/user_headerunit/src/hello.mpp
new file mode 100644
index 000000000..5b2f434ad
--- /dev/null
+++ b/tests/projects/c++/modules/user_headerunit/src/hello.mpp
@@ -0,0 +1,10 @@
+module;
+#include <cstdio>
+
+export module hello;
+
+export namespace hello {
+    void say(const char *arg) {
+        printf("%s\n", arg);
+    }
+}
diff --git a/tests/projects/c++/modules/user_headerunit/src/main.cpp b/tests/projects/c++/modules/user_headerunit/src/main.cpp
new file mode 100644
index 000000000..ad786367e
--- /dev/null
+++ b/tests/projects/c++/modules/user_headerunit/src/main.cpp
@@ -0,0 +1,7 @@
+import hello;
+import "header.hpp";
+
+int main() {
+    hello::say(hello::FOO);
+    return 0;
+}
diff --git a/tests/projects/c++/modules/user_headerunit/xmake.lua b/tests/projects/c++/modules/user_headerunit/xmake.lua
new file mode 100644
index 000000000..dae91d11f
--- /dev/null
+++ b/tests/projects/c++/modules/user_headerunit/xmake.lua
@@ -0,0 +1,5 @@
+set_languages("c++20")
+target("user_headerunit")
+    set_kind("binary")
+    add_headerfiles("src/*.hpp")
+    add_files("src/*.cpp", "src/*.mpp")