From 609f0b6f8ab935c08d1fdbf6627c9f49b1967d21 Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Tue, 5 Aug 2014 19:32:40 +0900
Subject: [PATCH] add types::rebind, types::assign

---
 sprout/type/operation.hpp              |  4 ++-
 sprout/type/operation/append_back.hpp  | 33 ++++++------------------
 sprout/type/operation/append_front.hpp | 35 ++++++++------------------
 sprout/type/operation/assign.hpp       | 35 ++++++++++++++++++++++++++
 sprout/type/operation/push_back.hpp    | 27 ++++----------------
 sprout/type/operation/push_front.hpp   | 29 ++++++---------------
 sprout/type/operation/rebind.hpp       | 31 +++++++++++++++++++++++
 sprout/type/type_tuple.hpp             | 19 --------------
 8 files changed, 99 insertions(+), 114 deletions(-)
 create mode 100644 sprout/type/operation/assign.hpp
 create mode 100644 sprout/type/operation/rebind.hpp

diff --git a/sprout/type/operation.hpp b/sprout/type/operation.hpp
index 369826d8..f4823f33 100644
--- a/sprout/type/operation.hpp
+++ b/sprout/type/operation.hpp
@@ -9,7 +9,6 @@
 #define SPROUT_TYPE_OPERATION_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/type/operation/tuple_cat.hpp>
 #include <sprout/type/operation/size.hpp>
 #include <sprout/type/operation/empty.hpp>
 #include <sprout/type/operation/at.hpp>
@@ -21,5 +20,8 @@
 #include <sprout/type/operation/push_front.hpp>
 #include <sprout/type/operation/pop_back.hpp>
 #include <sprout/type/operation/pop_front.hpp>
+#include <sprout/type/operation/tuple_cat.hpp>
+#include <sprout/type/operation/rebind.hpp>
+#include <sprout/type/operation/assign.hpp>
 
 #endif	// #ifndef SPROUT_TYPE_OPERATION_HPP
diff --git a/sprout/type/operation/append_back.hpp b/sprout/type/operation/append_back.hpp
index 5b7502f9..a564dee2 100644
--- a/sprout/type/operation/append_back.hpp
+++ b/sprout/type/operation/append_back.hpp
@@ -9,40 +9,21 @@
 #define SPROUT_TYPE_OPERATION_APPEND_BACK_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/index_tuple/metafunction.hpp>
-#include <sprout/type/tuple.hpp>
-#include <sprout/type/rebind_types.hpp>
-#include <sprout/tuple/indexes.hpp>
+#include <sprout/type/operation/tuple_cat.hpp>
 
 namespace sprout {
 	namespace types {
 		//
 		// append_back
 		//
-		template<typename Tuple, typename InputTuple>
-		struct append_back {
-		private:
-			template<typename IndexTuple1, typename IndexTuple2>
-			struct apply_impl;
-			template<sprout::index_t... Indexes1, sprout::index_t... Indexes2>
-			struct apply_impl<sprout::index_tuple<Indexes1...>, sprout::index_tuple<Indexes2...> >
-				: public sprout::types::rebind_types<
-					Tuple
-				>::template apply<
-					typename sprout::types::tuple_element<Indexes1, Tuple>::type...,
-					typename sprout::types::tuple_element<Indexes2, InputTuple>::type...
-				>
-			{};
-		public:
-			typedef typename apply_impl<
-				typename sprout::tuple_indexes<Tuple>::type,
-				typename sprout::tuple_indexes<InputTuple>::type
-			>::type type;
-		};
+		template<typename Tuple, typename... InputTuples>
+		struct append_back
+			: public sprout::types::tuple_cat<Tuple, InputTuples...>
+		{};
 
 #if SPROUT_USE_TEMPLATE_ALIASES
-		template<typename Tuple, typename InputTuple>
-		using append_back_t = typename sprout::types::append_back<Tuple, InputTuple>::type;
+		template<typename Tuple, typename... InputTuples>
+		using append_back_t = typename sprout::types::append_back<Tuple, InputTuples...>::type;
 #endif	// #if SPROUT_USE_TEMPLATE_ALIASES
 	}	// namespace types
 }	// namespace sprout
diff --git a/sprout/type/operation/append_front.hpp b/sprout/type/operation/append_front.hpp
index e51e59d8..13402105 100644
--- a/sprout/type/operation/append_front.hpp
+++ b/sprout/type/operation/append_front.hpp
@@ -9,40 +9,25 @@
 #define SPROUT_TYPE_OPERATION_APPEND_FRONT_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/index_tuple/metafunction.hpp>
-#include <sprout/type/tuple.hpp>
 #include <sprout/type/rebind_types.hpp>
-#include <sprout/tuple/indexes.hpp>
+#include <sprout/type/operation/tuple_cat.hpp>
 
 namespace sprout {
 	namespace types {
 		//
 		// append_front
 		//
-		template<typename Tuple, typename InputTuple>
-		struct append_front {
-		private:
-			template<typename IndexTuple1, typename IndexTuple2>
-			struct apply_impl;
-			template<sprout::index_t... Indexes1, sprout::index_t... Indexes2>
-			struct apply_impl<sprout::index_tuple<Indexes1...>, sprout::index_tuple<Indexes2...> >
-				: public sprout::types::rebind_types<
-					Tuple
-				>::template apply<
-					typename sprout::types::tuple_element<Indexes2, InputTuple>::type...,
-					typename sprout::types::tuple_element<Indexes1, Tuple>::type...
-				>
-			{};
-		public:
-			typedef typename apply_impl<
-				typename sprout::tuple_indexes<Tuple>::type,
-				typename sprout::tuple_indexes<InputTuple>::type
-			>::type type;
-		};
+		template<typename Tuple, typename... InputTuples>
+		struct append_front
+			: public sprout::types::tuple_cat<
+				typename sprout::types::rebind_types<Tuple>::template apply<>::type,
+				InputTuples..., Tuple
+			>
+		{};
 
 #if SPROUT_USE_TEMPLATE_ALIASES
-		template<typename Tuple, typename InputTuple>
-		using append_front_t = typename sprout::types::append_front<Tuple, InputTuple>::type;
+		template<typename Tuple, typename... InputTuples>
+		using append_front_t = typename sprout::types::append_front<Tuple, InputTuples...>::type;
 #endif	// #if SPROUT_USE_TEMPLATE_ALIASES
 	}	// namespace types
 }	// namespace sprout
diff --git a/sprout/type/operation/assign.hpp b/sprout/type/operation/assign.hpp
new file mode 100644
index 00000000..0b1cfa81
--- /dev/null
+++ b/sprout/type/operation/assign.hpp
@@ -0,0 +1,35 @@
+/*=============================================================================
+  Copyright (c) 2011-2014 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_OPERATION_ASSIGN_HPP
+#define SPROUT_TYPE_OPERATION_ASSIGN_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/type/rebind_types.hpp>
+#include <sprout/type/operation/tuple_cat.hpp>
+
+namespace sprout {
+	namespace types {
+		//
+		// assign
+		//
+		template<typename Tuple, typename InputTuple>
+		struct assign
+			: public sprout::types::tuple_cat<
+				typename sprout::types::rebind_types<Tuple>::template apply<>::type,
+				InputTuple
+			>
+		{};
+
+#if SPROUT_USE_TEMPLATE_ALIASES
+		template<typename Tuple, typename InputTuple>
+		using assign_t = typename sprout::types::assign<Tuple, InputTuple>::type;
+#endif	// #if SPROUT_USE_TEMPLATE_ALIASES
+	}	// namespace types
+}	// namespace sprout
+
+#endif	// #ifndef SPROUT_TYPE_OPERATION_ASSIGN_HPP
diff --git a/sprout/type/operation/push_back.hpp b/sprout/type/operation/push_back.hpp
index 1cbb0d6a..96119ce6 100644
--- a/sprout/type/operation/push_back.hpp
+++ b/sprout/type/operation/push_back.hpp
@@ -9,10 +9,8 @@
 #define SPROUT_TYPE_OPERATION_PUSH_BACK_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/index_tuple/metafunction.hpp>
-#include <sprout/type/tuple.hpp>
-#include <sprout/type/rebind_types.hpp>
-#include <sprout/tuple/indexes.hpp>
+#include <sprout/type/type_tuple.hpp>
+#include <sprout/type/operation/tuple_cat.hpp>
 
 namespace sprout {
 	namespace types {
@@ -20,24 +18,9 @@ namespace sprout {
 		// push_back
 		//
 		template<typename Tuple, typename... Ts>
-		struct push_back {
-		private:
-			template<typename IndexTuple>
-			struct apply_impl;
-			template<sprout::index_t... Indexes>
-			struct apply_impl<sprout::index_tuple<Indexes...> >
-				: public sprout::types::rebind_types<
-					Tuple
-				>::template apply<
-					typename sprout::types::tuple_element<Indexes, Tuple>::type...,
-					Ts...
-				>
-			{};
-		public:
-			typedef typename apply_impl<
-				typename sprout::tuple_indexes<Tuple>::type
-			>::type type;
-		};
+		struct push_back
+			: public sprout::types::tuple_cat<Tuple, sprout::types::type_tuple<Ts...> >
+		{};
 
 #if SPROUT_USE_TEMPLATE_ALIASES
 		template<typename Tuple, typename... Ts>
diff --git a/sprout/type/operation/push_front.hpp b/sprout/type/operation/push_front.hpp
index 34bc4396..2a8447ea 100644
--- a/sprout/type/operation/push_front.hpp
+++ b/sprout/type/operation/push_front.hpp
@@ -9,10 +9,9 @@
 #define SPROUT_TYPE_OPERATION_PUSH_FRONT_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/index_tuple/metafunction.hpp>
-#include <sprout/type/tuple.hpp>
 #include <sprout/type/rebind_types.hpp>
-#include <sprout/tuple/indexes.hpp>
+#include <sprout/type/type_tuple.hpp>
+#include <sprout/type/operation/tuple_cat.hpp>
 
 namespace sprout {
 	namespace types {
@@ -20,24 +19,12 @@ namespace sprout {
 		// push_front
 		//
 		template<typename Tuple, typename... Ts>
-		struct push_front {
-		private:
-			template<typename IndexTuple>
-			struct apply_impl;
-			template<sprout::index_t... Indexes>
-			struct apply_impl<sprout::index_tuple<Indexes...> >
-				: public sprout::types::rebind_types<
-					Tuple
-				>::template apply<
-					Ts...,
-					typename sprout::types::tuple_element<Indexes, Tuple>::type...
-				>
-			{};
-		public:
-			typedef typename apply_impl<
-				typename sprout::tuple_indexes<Tuple>::type
-			>::type type;
-		};
+		struct push_front
+			: public sprout::types::tuple_cat<
+				typename sprout::types::rebind_types<Tuple>::template apply<>::type,
+				sprout::types::type_tuple<Ts...>, Tuple
+			>
+		{};
 
 #if SPROUT_USE_TEMPLATE_ALIASES
 		template<typename Tuple, typename... Ts>
diff --git a/sprout/type/operation/rebind.hpp b/sprout/type/operation/rebind.hpp
new file mode 100644
index 00000000..4cbd89ce
--- /dev/null
+++ b/sprout/type/operation/rebind.hpp
@@ -0,0 +1,31 @@
+/*=============================================================================
+  Copyright (c) 2011-2014 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_OPERATION_REBIND_HPP
+#define SPROUT_TYPE_OPERATION_REBIND_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/type/rebind_types.hpp>
+
+namespace sprout {
+	namespace types {
+		//
+		// rebind
+		//
+		template<typename Tuple, typename... Ts>
+		struct rebind
+			: public sprout::types::rebind_types<Tuple>::template apply<Ts...>
+		{};
+
+#if SPROUT_USE_TEMPLATE_ALIASES
+		template<typename Tuple, typename... Ts>
+		using rebind_t = typename sprout::types::rebind<Tuple, Ts...>::type;
+#endif	// #if SPROUT_USE_TEMPLATE_ALIASES
+	}	// namespace types
+}	// namespace sprout
+
+#endif	// #ifndef SPROUT_TYPE_OPERATION_REBIND_HPP
diff --git a/sprout/type/type_tuple.hpp b/sprout/type/type_tuple.hpp
index afa8e67d..9449baf3 100644
--- a/sprout/type/type_tuple.hpp
+++ b/sprout/type/type_tuple.hpp
@@ -218,25 +218,6 @@ namespace sprout {
 		struct pop_front<sprout::types::type_tuple<Head, Tail...> >
 			: public sprout::identity<sprout::types::type_tuple<Tail...> >
 		{};
-
-		//
-		// append_back
-		//
-		template<typename Tuple, typename InputTuple>
-		struct append_back;
-		template<typename Tuple, typename... InputTypes>
-		struct append_back<Tuple, sprout::types::type_tuple<InputTypes...> >
-			: public sprout::types::push_back<Tuple, InputTypes...>
-		{};
-		//
-		// append_front
-		//
-		template<typename Tuple, typename InputTuple>
-		struct append_front;
-		template<typename Tuple, typename... InputTypes>
-		struct append_front<Tuple, sprout::types::type_tuple<InputTypes...> >
-			: public sprout::types::push_front<InputTypes..., Tuple>
-		{};
 	}	// namespace types
 }	// namespace sprout