From 9374ef4055bffcdd6e3da53ecf7e964725d7475a Mon Sep 17 00:00:00 2001
From: Denis Blank <denis.blank@outlook.com>
Date: Wed, 1 Jul 2015 20:26:59 +0200
Subject: [PATCH] some changes

---
 include/Continuable.h | 54 +++++++++++++++++++++++++++++++++++--------
 test.cpp              | 10 +++++---
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/include/Continuable.h b/include/Continuable.h
index bc556b3..6df8baf 100644
--- a/include/Continuable.h
+++ b/include/Continuable.h
@@ -303,6 +303,15 @@ namespace detail
         typedef fu::identity<Left..., Right...> type;
     };
 
+    template<typename Left, typename Right>
+    struct concat_identities_as_pack;
+
+    template<typename... Left, typename... Right>
+    struct concat_identities_as_pack<fu::identity<Left...>, fu::identity<Right...>>
+    {
+        typedef fu::identity<Left..., std::tuple<Right...>> type;
+    };
+
     template<typename... _CTy>
     struct multiple_chainer_test
     {
@@ -425,24 +434,49 @@ namespace detail
             return remove_void_trait(box_continuable_trait(std::forward<_CTy>(functional)));
         }
 
-        template<typename Current, typename... Rest>
+        template<typename Args, typename Pack, typename... Rest>
         struct multiple_result_maker;
 
-        template<typename Previous, typename Next>
-        struct multiple_result_maker<Previous, Next>
+        template<typename... Args, typename... Pack>
+        struct multiple_result_maker<fu::identity<Args...>, fu::identity<Pack...>>
         {
-            typedef typename concat_identities<
-                Previous, typename unary_chainer_t<Next, _ATy...>::callback_arguments_t
-            >::type arguments_t;
+            typedef fu::identity<Args...> arguments_t;
+
+            typedef fu::identity<Pack...> arguments_storage_t;
         };
 
-        template<typename Previous, typename Next, typename... Rest>
-        struct multiple_result_maker<Previous, Next, Rest...>
+        template<typename Args, typename Pack, typename Next>
+        struct multiple_result_maker<Args, Pack, Next>
             : public multiple_result_maker<
                 typename concat_identities<
-                Previous, typename unary_chainer_t<Next, _ATy...>::callback_arguments_t
+                    Args,
+                    typename unary_chainer_t<Next, _ATy...>::callback_arguments_t
                 >::type,
-                Rest...> { };
+                typename concat_identities_as_pack<
+                    Pack,
+                    // typename wrap_in_tuple<
+                        typename unary_chainer_t<Next, _ATy...>::callback_arguments_t
+                    // >::type
+                >::type
+              > { }
+
+        template<typename Args, typename Pack, typename Next, typename... Rest>
+        struct multiple_result_maker<Args, Pack, Next, Rest...>
+            : public multiple_result_maker<
+                typename concat_identities<
+                    Args,
+                    typename unary_chainer_t<Next, _ATy...>::callback_arguments_t
+                >::type,
+                typename concat_identities_as_pack <
+                    Pack,
+                    typename unary_chainer_t<Next, _ATy...>::callback_arguments_t
+                >::type,
+                Rest...
+            > { };
+
+        template<typename... Args>
+        using result_maker_of_t =
+            multiple_result_maker<fu::identity<>, fu::identity<>, Args...>;
     };
 }
 
diff --git a/test.cpp b/test.cpp
index 43280a3..9224fc6 100644
--- a/test.cpp
+++ b/test.cpp
@@ -232,20 +232,24 @@ int main(int /*argc*/, char** /*argv*/)
 
     detail::unary_chainer_t<std::function<Continuable<bool>()>>::callback_arguments_t args213987;
 
-    detail::functional_traits<>::multiple_result_maker<
-        fu::identity<>,
+    typedef detail::result_maker_of_t<
 
         std::function<Continuable<bool>()>,
         decltype(CastSpellPromise(2)),
         decltype(TrivialPromise()),
         std::function<Continuable<float, double>()>
 
-    >::arguments_t test282;
+    > maker;
+    
+    maker::arguments_t test282_args;
+    maker::arguments_storage_t test282_pack;
 
     // static_assert(std::is_same<>::value,
     
     detail::concat_identities<fu::identity<int, bool, char>, fu::identity<float, double>>::type myt;
 
+    std::tuple<int, std::vector<int>> tup;
+
     std::cout << "ok" << std::endl;
     return 0;
 }