From c6511790db2276301d1c465a390efe4e957a8dcb Mon Sep 17 00:00:00 2001
From: sha512sum <linuxnyasha@tutanota.com>
Date: Wed, 28 Feb 2024 21:41:01 +0000
Subject: [PATCH] Tuple changes

---
 include/utempl/tuple.hpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/include/utempl/tuple.hpp b/include/utempl/tuple.hpp
index 0087d25..7bd12c5 100644
--- a/include/utempl/tuple.hpp
+++ b/include/utempl/tuple.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <utempl/type_list.hpp>
-
+#include <utempl/overloaded.hpp>
 namespace utempl {
 
 template <auto>
@@ -10,10 +10,6 @@ namespace impl {
 template <auto, typename T>
 struct TupleLeaf {
   T value;
-  template <typename TT>
-  inline constexpr TupleLeaf(TT&& arg) : value(std::forward<TT>(arg)) {};
-  inline constexpr TupleLeaf(const TupleLeaf&) = default;
-  inline constexpr TupleLeaf(TupleLeaf&&) = default;
   inline constexpr bool operator==(const TupleLeaf&) const = default;
 };
 
@@ -64,6 +60,8 @@ struct Tuple : public impl::TupleHelper<std::index_sequence_for<Ts...>, Ts...> {
   template <typename... TTs>
   inline constexpr Tuple(TTs&&... args) : 
     impl::TupleHelper<std::index_sequence_for<Ts...>, Ts...>(std::forward<TTs>(args)...) {};
+  inline constexpr Tuple(Ts... args) :
+    impl::TupleHelper<std::index_sequence_for<Ts...>, Ts...>(std::move(args)...) {};
   inline constexpr Tuple(const Tuple&) = default;
   inline constexpr Tuple(Tuple&&) = default;
   inline constexpr bool operator==(const Tuple&) const = default;
@@ -82,14 +80,24 @@ struct Tuple : public impl::TupleHelper<std::index_sequence_for<Ts...>, Ts...> {
     return Get<I>(*this);
   };
 };
+namespace impl {
+
+template <typename T>
+struct Process {
+  using type = decltype(Overloaded(
+    []<typename TT>(TT&&) -> std::remove_cvref_t<TT> {},
+    []<std::size_t N>(const char(&)[N]) -> const char(&)[N] {}
+  )(std::declval<T>()));
+};
+
+} // namespace impl
 
 template <typename... Ts>
-Tuple(Ts&&...) -> Tuple<std::remove_cvref_t<Ts>...>;
+Tuple(Ts&&...) -> Tuple<typename impl::Process<Ts>::type...>;
 
 template <typename... Ts>
 consteval auto ListFromTuple(Tuple<Ts...>) -> TypeList<Ts...> {
   return {};
 };
 
-
 } // namespace utempl