cli: refactoring

3 files changed, 23 insertions, 0 deletions

diff --git a/nihil.util/CMakeLists.txt b/nihil.util/CMakeLists.txt
index 109e4d4..2fb5111 100644
--- a/nihil.util/CMakeLists.txt
+++ b/nihil.util/CMakeLists.txt
@@ -12,6 +12,7 @@ target_sources(nihil.util
 	nihil.util.ccm
 
 	capture_stream.ccm
+	construct.ccm
 	ctype.ccm
 	parse_size.ccm
 	next_word.ccm
diff --git a/nihil.util/construct.ccm b/nihil.util/construct.ccm
new file mode 100644
index 0000000..0a0d85d
--- /dev/null
+++ b/nihil.util/construct.ccm
@@ -0,0 +1,21 @@
+// This source code is released into the public domain.
+export module nihil.util:construct;
+
+import nihil.std;
+
+namespace nihil {
+
+// A functor that constructs objects of an arbitrary type.
+// Useful for std::views::transform.
+template <typename T>
+struct construct_fn {
+	auto operator()(this construct_fn const &, auto &&...args) -> T
+	{
+		return T(std::forward<decltype(args)>(args)...);
+	}
+};
+
+export template<typename T>
+inline constexpr auto construct = construct_fn<T>{};
+
+}
diff --git a/nihil.util/nihil.util.ccm b/nihil.util/nihil.util.ccm
index d8628a4..132978e 100644
--- a/nihil.util/nihil.util.ccm
+++ b/nihil.util/nihil.util.ccm
@@ -2,6 +2,7 @@
 export module nihil.util;
 
 export import :capture_stream;
+export import :construct;
 export import :ctype;
 export import :parse_size;
 export import :next_word;