From 30f4907e596ba6f154fc513eb92c3a74ba720eb0 Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Fri, 26 Jun 2015 20:48:53 +0200
Subject: [PATCH] some work on identity chaining

---
 include/Continuable.h | 29 ++++++++++-------------------
 test.cpp              |  7 +++++--
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/include/Continuable.h b/include/Continuable.h
index 560feba..f62eea1 100644
--- a/include/Continuable.h
+++ b/include/Continuable.h
@@ -277,7 +277,6 @@ inline auto make_continuable()
 
 namespace detail
 {
-
     /// Helper trait for unary chains like `Continuable::then`
     template <typename _CTy, typename... _ATy>
     struct unary_chainer_t
@@ -424,34 +423,26 @@ namespace detail
             return remove_void_trait(box_continuable_trait(std::forward<_CTy>(functional)));
         }
 
-        template<typename Current, typename First, typename... Rest>
+        template<typename Current, typename... Rest>
         struct multiple_result_maker;
 
-        template<typename... Previous, typename Last>
-        struct multiple_result_maker<fu::identity<Previous...>, Last>
+        template<typename Previous, typename Last>
+        struct multiple_result_maker<Previous, Last>
         {
-            // typedef decltype(correct(std::declval<typename std::decay<Last>::type>())) corrected_t;
-
-            /*
             typedef typename concat_identities<
-                fu::identity<Previous...>,
-                fu::argument_type_of_t<Last>
-            > type;
-            */
+                Previous, typename unary_chainer_t<Last, _ATy...>::arguments_t
+            >::type arguments_t;
         };
 
-        template<typename... Previous, typename First, typename... Rest>
-        struct multiple_result_maker<fu::identity<Previous...>, First, Rest...>
+        template<typename Previous, typename Next, typename... Rest>
+        struct multiple_result_maker<Previous, Next, Rest...>
         {
-            /*
             typedef typename multiple_result_maker<
                 typename concat_identities<
-                    fu::identity<Previous...>,
-                    fu::argument_type_of_t<First>
-                >,
+                    Previous, typename unary_chainer_t<Next, _ATy...>::arguments_t
+                >::type,
                 Rest...
-            > type;
-            */
+            >::arguments_t arguments_t;
         };
     };
 }
diff --git a/test.cpp b/test.cpp
index 9494b89..0eace95 100644
--- a/test.cpp
+++ b/test.cpp
@@ -233,9 +233,12 @@ int main(int /*argc*/, char** /*argv*/)
     detail::functional_traits<>::multiple_result_maker<
         fu::identity<>,
 
-        std::function<Continuable<int>>
+        std::function<Continuable<int>()>,
+        std::function<Continuable<float>()>
 
-    > test282;
+    >::arguments_t test282;
+
+    detail::concat_identities<fu::identity<int, bool, char>, fu::identity<float, double>>::type myt;
 
     std::cout << "ok" << std::endl;
     return 0;