From 53cc8033c4b7970afb13e89cb6b79272e71fbfda Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 14 Mar 2024 00:42:43 +0800 Subject: rename .mpp --- .../modules/partitions_implunit/BasicPlane.Figures-Point.ixx | 5 ----- .../partitions_implunit/BasicPlane.Figures-Rectangle.cpp | 7 ------- .../partitions_implunit/BasicPlane.Figures-Rectangle.ixx | 11 ----------- .../c++/modules/partitions_implunit/BasicPlane.Figures.ixx | 4 ---- .../c++/modules/partitions_implunit/ModulesTutorial.cpp | 10 ---------- .../partitions_implunit/src/BasicPlane.Figures-Point.mpp | 5 +++++ .../partitions_implunit/src/BasicPlane.Figures-Rectangle.cpp | 7 +++++++ .../partitions_implunit/src/BasicPlane.Figures-Rectangle.mpp | 11 +++++++++++ .../modules/partitions_implunit/src/BasicPlane.Figures.mpp | 4 ++++ .../c++/modules/partitions_implunit/src/ModulesTutorial.cpp | 10 ++++++++++ tests/projects/c++/modules/partitions_implunit/xmake.lua | 4 ++-- 11 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Point.ixx delete mode 100644 tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Rectangle.cpp delete mode 100644 tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Rectangle.ixx delete mode 100644 tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures.ixx delete mode 100644 tests/projects/c++/modules/partitions_implunit/ModulesTutorial.cpp create mode 100644 tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Point.mpp create mode 100644 tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.cpp create mode 100644 tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.mpp create mode 100644 tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures.mpp create mode 100644 tests/projects/c++/modules/partitions_implunit/src/ModulesTutorial.cpp diff --git a/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Point.ixx b/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Point.ixx deleted file mode 100644 index e693edcc0..000000000 --- a/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Point.ixx +++ /dev/null @@ -1,5 +0,0 @@ -export module BasicPlane.Figures:Point; - -export struct Point { - int x, y; -}; diff --git a/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Rectangle.cpp b/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Rectangle.cpp deleted file mode 100644 index ca05e05a1..000000000 --- a/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Rectangle.cpp +++ /dev/null @@ -1,7 +0,0 @@ -module; - -module BasicPlane.Figures; - -int area(const Rectangle& r) { return width(r) * height(r); } -int height(const Rectangle& r) { return r.ul.y - r.lr.y; } -int width(const Rectangle& r) { return r.lr.x - r.ul.x; } diff --git a/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Rectangle.ixx b/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Rectangle.ixx deleted file mode 100644 index 84467d480..000000000 --- a/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures-Rectangle.ixx +++ /dev/null @@ -1,11 +0,0 @@ -export module BasicPlane.Figures:Rectangle; - -import :Point; - -export struct Rectangle { - Point ul, lr; -}; - -export int area(const Rectangle& r); -export int height(const Rectangle& r); -export int width(const Rectangle& r); diff --git a/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures.ixx b/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures.ixx deleted file mode 100644 index f471e1436..000000000 --- a/tests/projects/c++/modules/partitions_implunit/BasicPlane.Figures.ixx +++ /dev/null @@ -1,4 +0,0 @@ -export module BasicPlane.Figures; - -export import :Point; -export import :Rectangle; diff --git a/tests/projects/c++/modules/partitions_implunit/ModulesTutorial.cpp b/tests/projects/c++/modules/partitions_implunit/ModulesTutorial.cpp deleted file mode 100644 index 130a5778c..000000000 --- a/tests/projects/c++/modules/partitions_implunit/ModulesTutorial.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include - -import BasicPlane.Figures; - -int main(int argc, char** argv) { - Rectangle r{ {1,8}, {11,3} }; - std::cout << "area: " << area(r) << '\n'; - std::cout << "width: " << width(r) << '\n'; - return 0; -} diff --git a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Point.mpp b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Point.mpp new file mode 100644 index 000000000..e693edcc0 --- /dev/null +++ b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Point.mpp @@ -0,0 +1,5 @@ +export module BasicPlane.Figures:Point; + +export struct Point { + int x, y; +}; diff --git a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.cpp b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.cpp new file mode 100644 index 000000000..ca05e05a1 --- /dev/null +++ b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.cpp @@ -0,0 +1,7 @@ +module; + +module BasicPlane.Figures; + +int area(const Rectangle& r) { return width(r) * height(r); } +int height(const Rectangle& r) { return r.ul.y - r.lr.y; } +int width(const Rectangle& r) { return r.lr.x - r.ul.x; } diff --git a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.mpp b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.mpp new file mode 100644 index 000000000..84467d480 --- /dev/null +++ b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures-Rectangle.mpp @@ -0,0 +1,11 @@ +export module BasicPlane.Figures:Rectangle; + +import :Point; + +export struct Rectangle { + Point ul, lr; +}; + +export int area(const Rectangle& r); +export int height(const Rectangle& r); +export int width(const Rectangle& r); diff --git a/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures.mpp b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures.mpp new file mode 100644 index 000000000..f471e1436 --- /dev/null +++ b/tests/projects/c++/modules/partitions_implunit/src/BasicPlane.Figures.mpp @@ -0,0 +1,4 @@ +export module BasicPlane.Figures; + +export import :Point; +export import :Rectangle; diff --git a/tests/projects/c++/modules/partitions_implunit/src/ModulesTutorial.cpp b/tests/projects/c++/modules/partitions_implunit/src/ModulesTutorial.cpp new file mode 100644 index 000000000..130a5778c --- /dev/null +++ b/tests/projects/c++/modules/partitions_implunit/src/ModulesTutorial.cpp @@ -0,0 +1,10 @@ +#include + +import BasicPlane.Figures; + +int main(int argc, char** argv) { + Rectangle r{ {1,8}, {11,3} }; + std::cout << "area: " << area(r) << '\n'; + std::cout << "width: " << width(r) << '\n'; + return 0; +} diff --git a/tests/projects/c++/modules/partitions_implunit/xmake.lua b/tests/projects/c++/modules/partitions_implunit/xmake.lua index 2997ea8b0..a777846e3 100644 --- a/tests/projects/c++/modules/partitions_implunit/xmake.lua +++ b/tests/projects/c++/modules/partitions_implunit/xmake.lua @@ -3,5 +3,5 @@ set_languages("c++20") target("foo") set_kind("static") - add_files("*.cpp") - add_files("*.ixx") + add_files("src/*.cpp") + add_files("src/*.mpp") -- cgit v1.3.1