From ec03e6f9c08b729fdaaacff4a7382fbdc27f125a Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Thu, 21 Aug 2014 23:33:13 +0900
Subject: [PATCH] fix type operation implementation

---
 sprout/type.hpp                               |   2 +
 sprout/type/algorithm/transform.hpp           |  16 +--
 sprout/type/functional/arithmetic.hpp         |   2 +
 .../type/functional/detail/arithmetic_op.hpp  |  34 +++++
 sprout/type/functional/divides.hpp            |   5 +
 sprout/type/functional/equal_to.hpp           |   4 +
 sprout/type/functional/greater.hpp            |   4 +
 sprout/type/functional/greater_equal.hpp      |   4 +
 sprout/type/functional/less.hpp               |   4 +
 sprout/type/functional/less_equal.hpp         |   4 +
 sprout/type/functional/minus.hpp              |   5 +
 sprout/type/functional/modulus.hpp            |   5 +
 sprout/type/functional/multiplies.hpp         |   5 +
 sprout/type/functional/negate.hpp             |  21 +++
 sprout/type/functional/not_equal_to.hpp       |   4 +
 sprout/type/functional/posite.hpp             |  21 +++
 sprout/type/map_types.hpp                     | 125 ++++++++++++++++++
 sprout/type/operation.hpp                     |   1 +
 sprout/type/operation/map.hpp                 |  32 +++++
 sprout/type/operation/pop_front.hpp           |  23 +---
 sprout/type/pop_front_types.hpp               | 123 +++++++++++++++++
 sprout/type/rebind_types.hpp                  |   1 -
 22 files changed, 411 insertions(+), 34 deletions(-)
 create mode 100644 sprout/type/functional/negate.hpp
 create mode 100644 sprout/type/functional/posite.hpp
 create mode 100644 sprout/type/map_types.hpp
 create mode 100644 sprout/type/operation/map.hpp
 create mode 100644 sprout/type/pop_front_types.hpp

diff --git a/sprout/type.hpp b/sprout/type.hpp
index 1ea86eb1..d0437103 100644
--- a/sprout/type.hpp
+++ b/sprout/type.hpp
@@ -18,7 +18,9 @@
 #include <sprout/type/string.hpp>
 #include <sprout/type/uniform_types.hpp>
 #include <sprout/type/rebind_types.hpp>
+#include <sprout/type/map_types.hpp>
 #include <sprout/type/joint_types.hpp>
+#include <sprout/type/pop_front_types.hpp>
 #include <sprout/type/functional.hpp>
 #include <sprout/type/algorithm.hpp>
 #include <sprout/type/seq/algorithm.hpp>
diff --git a/sprout/type/algorithm/transform.hpp b/sprout/type/algorithm/transform.hpp
index 37d8c611..ce6399dd 100644
--- a/sprout/type/algorithm/transform.hpp
+++ b/sprout/type/algorithm/transform.hpp
@@ -14,20 +14,11 @@
 #include <sprout/type/apply.hpp>
 #include <sprout/type/tuple.hpp>
 #include <sprout/type/rebind_types.hpp>
+#include <sprout/type/map_types.hpp>
 
 namespace sprout {
 	namespace types {
 		namespace detail {
-			template<typename Tuple, typename UnaryOp, typename IndexTuple>
-			struct transform_impl;
-			template<typename Tuple, typename UnaryOp, sprout::index_t... Indexes>
-			struct transform_impl<Tuple, UnaryOp, sprout::index_tuple<Indexes...> >
-				: public sprout::types::apply<
-					sprout::types::rebind_types<Tuple>,
-					typename sprout::types::apply<UnaryOp, typename sprout::types::tuple_element<Indexes, Tuple>::type>::type...
-				>
-			{};
-
 			template<typename Tuple1, typename Tuple2, typename BinaryOp, typename IndexTuple>
 			struct transform2_impl;
 			template<typename Tuple1, typename Tuple2, typename BinaryOp, sprout::index_t... Indexes>
@@ -54,10 +45,7 @@ namespace sprout {
 		{};
 		template<typename Tuple, typename UnaryOp>
 		struct transform<Tuple, UnaryOp, void>
-			: public sprout::types::detail::transform_impl<
-				Tuple, UnaryOp,
-				typename sprout::tuple_indexes<Tuple>::type
-			>
+			: public sprout::types::apply<sprout::types::map_types<Tuple>, UnaryOp>
 		{};
 
 #if SPROUT_USE_TEMPLATE_ALIASES
diff --git a/sprout/type/functional/arithmetic.hpp b/sprout/type/functional/arithmetic.hpp
index 7fd14386..c7b1e95c 100644
--- a/sprout/type/functional/arithmetic.hpp
+++ b/sprout/type/functional/arithmetic.hpp
@@ -14,5 +14,7 @@
 #include <sprout/type/functional/multiplies.hpp>
 #include <sprout/type/functional/divides.hpp>
 #include <sprout/type/functional/modulus.hpp>
+#include <sprout/type/functional/posite.hpp>
+#include <sprout/type/functional/negate.hpp>
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_ARITHMETIC_HPP
diff --git a/sprout/type/functional/detail/arithmetic_op.hpp b/sprout/type/functional/detail/arithmetic_op.hpp
index 56990eed..1174438f 100644
--- a/sprout/type/functional/detail/arithmetic_op.hpp
+++ b/sprout/type/functional/detail/arithmetic_op.hpp
@@ -47,4 +47,38 @@ namespace sprout { \
 #	define SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_BINARY_OP_VT_DECL(NAME)
 #endif	// #if SPROUT_USE_VARIABLE_TEMPLATES
 
+#define SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_UNARY_OP_DECL(NAME, OP) \
+namespace sprout { \
+	namespace types { \
+		template<typename T, typename Result = void> \
+		struct NAME \
+			: public sprout::integral_constant<Result, (OP T::value)> \
+		{}; \
+		template<typename T> \
+		struct NAME<T, void> \
+			: public sprout::integral_constant< \
+				typename sprout::arithmetic_promote<typename T::value_type>::type, \
+				(OP T::value) \
+			> \
+		{}; \
+		template<typename Result = void> \
+		struct SPROUT_PP_CAT(NAME, _mf) { \
+		public: \
+			template<typename T> \
+			struct apply \
+				: public sprout::types::NAME<T, Result> \
+			{}; \
+		}; \
+		typedef sprout::types::SPROUT_PP_CAT(NAME, _mf)<> SPROUT_PP_CAT(NAME, _); \
+		SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_UNARY_OP_VT_DECL(NAME) \
+	} \
+}
+#if SPROUT_USE_VARIABLE_TEMPLATES
+#	define SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_UNARY_OP_VT_DECL(NAME) \
+		template<typename T, typename Result = void> \
+		SPROUT_STATIC_CONSTEXPR typename sprout::types::NAME<T, Result>::value_type SPROUT_PP_CAT(NAME, _v) = sprout::types::NAME<T, Result>::value;
+#else	// #if SPROUT_USE_VARIABLE_TEMPLATES
+#	define SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_UNARY_OP_VT_DECL(NAME)
+#endif	// #if SPROUT_USE_VARIABLE_TEMPLATES
+
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_DETAIL_ARITHMETIC_OP_HPP
diff --git a/sprout/type/functional/divides.hpp b/sprout/type/functional/divides.hpp
index a3ac5d58..ad3a78da 100644
--- a/sprout/type/functional/divides.hpp
+++ b/sprout/type/functional/divides.hpp
@@ -11,6 +11,11 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/arithmetic_op.hpp>
 
+//
+// divides
+// divides_mf
+// divides_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_BINARY_OP_DECL(divides, /)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_DIVIDES_HPP
diff --git a/sprout/type/functional/equal_to.hpp b/sprout/type/functional/equal_to.hpp
index 586b5608..ea36a343 100644
--- a/sprout/type/functional/equal_to.hpp
+++ b/sprout/type/functional/equal_to.hpp
@@ -11,6 +11,10 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/comparison_op.hpp>
 
+//
+// equal_to
+// equal_to_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_COMPARISON_OP_DECL(equal_to, ==)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_EQUAL_TO_HPP
diff --git a/sprout/type/functional/greater.hpp b/sprout/type/functional/greater.hpp
index 74e9819e..4f55166c 100644
--- a/sprout/type/functional/greater.hpp
+++ b/sprout/type/functional/greater.hpp
@@ -11,6 +11,10 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/comparison_op.hpp>
 
+//
+// greater
+// greater_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_COMPARISON_OP_DECL(greater, >)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_GREATER_HPP
diff --git a/sprout/type/functional/greater_equal.hpp b/sprout/type/functional/greater_equal.hpp
index d3ac2751..2f355375 100644
--- a/sprout/type/functional/greater_equal.hpp
+++ b/sprout/type/functional/greater_equal.hpp
@@ -11,6 +11,10 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/comparison_op.hpp>
 
+//
+// greater_equal
+// greater_equal_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_COMPARISON_OP_DECL(greater_equal, >=)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_GREATER_EQUAL_HPP
diff --git a/sprout/type/functional/less.hpp b/sprout/type/functional/less.hpp
index 22e6861d..c48843fb 100644
--- a/sprout/type/functional/less.hpp
+++ b/sprout/type/functional/less.hpp
@@ -11,6 +11,10 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/comparison_op.hpp>
 
+//
+// less
+// less_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_COMPARISON_OP_DECL(less, <)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_LESS_HPP
diff --git a/sprout/type/functional/less_equal.hpp b/sprout/type/functional/less_equal.hpp
index 97452149..e438ec8e 100644
--- a/sprout/type/functional/less_equal.hpp
+++ b/sprout/type/functional/less_equal.hpp
@@ -11,6 +11,10 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/comparison_op.hpp>
 
+//
+// less_equal
+// less_equal_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_COMPARISON_OP_DECL(less_equal, <=)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_LESS_EQUAL_HPP
diff --git a/sprout/type/functional/minus.hpp b/sprout/type/functional/minus.hpp
index 18cfd83f..996f125e 100644
--- a/sprout/type/functional/minus.hpp
+++ b/sprout/type/functional/minus.hpp
@@ -11,6 +11,11 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/arithmetic_op.hpp>
 
+//
+// minus
+// minus_mf
+// minus_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_BINARY_OP_DECL(minus, -)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_MINUS_HPP
diff --git a/sprout/type/functional/modulus.hpp b/sprout/type/functional/modulus.hpp
index 87775ea7..89c10c40 100644
--- a/sprout/type/functional/modulus.hpp
+++ b/sprout/type/functional/modulus.hpp
@@ -11,6 +11,11 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/arithmetic_op.hpp>
 
+//
+// modulus
+// modulus_mf
+// modulus_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_BINARY_OP_DECL(modulus, %)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_MODULUS_HPP
diff --git a/sprout/type/functional/multiplies.hpp b/sprout/type/functional/multiplies.hpp
index e66621e8..3d9891aa 100644
--- a/sprout/type/functional/multiplies.hpp
+++ b/sprout/type/functional/multiplies.hpp
@@ -11,6 +11,11 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/arithmetic_op.hpp>
 
+//
+// multiplies
+// multiplies_mf
+// multiplies_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_BINARY_OP_DECL(multiplies, *)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_MULTIPLIES_HPP
diff --git a/sprout/type/functional/negate.hpp b/sprout/type/functional/negate.hpp
new file mode 100644
index 00000000..ee11e245
--- /dev/null
+++ b/sprout/type/functional/negate.hpp
@@ -0,0 +1,21 @@
+/*=============================================================================
+  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_FUNCTIONAL_NEGATE_HPP
+#define SPROUT_TYPE_FUNCTIONAL_NEGATE_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/type/functional/detail/arithmetic_op.hpp>
+
+//
+// negate
+// negate_mf
+// negate_
+//
+SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_UNARY_OP_DECL(negate, -)
+
+#endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_NEGATE_HPP
diff --git a/sprout/type/functional/not_equal_to.hpp b/sprout/type/functional/not_equal_to.hpp
index 9ea8b135..61e45dae 100644
--- a/sprout/type/functional/not_equal_to.hpp
+++ b/sprout/type/functional/not_equal_to.hpp
@@ -11,6 +11,10 @@
 #include <sprout/config.hpp>
 #include <sprout/type/functional/detail/comparison_op.hpp>
 
+//
+// not_equal_to
+// not_equal_to_
+//
 SPROUT_TYPES_DETAIL_FUNCTIONAL_COMPARISON_OP_DECL(not_equal_to, !=)
 
 #endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_NOT_EQUAL_TO_HPP
diff --git a/sprout/type/functional/posite.hpp b/sprout/type/functional/posite.hpp
new file mode 100644
index 00000000..040850e8
--- /dev/null
+++ b/sprout/type/functional/posite.hpp
@@ -0,0 +1,21 @@
+/*=============================================================================
+  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_FUNCTIONAL_POSITE_HPP
+#define SPROUT_TYPE_FUNCTIONAL_POSITE_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/type/functional/detail/arithmetic_op.hpp>
+
+//
+// posite
+// posite_mf
+// posite_
+//
+SPROUT_TYPES_DETAIL_FUNCTIONAL_ARITHMETIC_UNARY_OP_DECL(posite, +)
+
+#endif	// #ifndef SPROUT_TYPE_FUNCTIONAL_POSITE_HPP
diff --git a/sprout/type/map_types.hpp b/sprout/type/map_types.hpp
new file mode 100644
index 00000000..240e7e2f
--- /dev/null
+++ b/sprout/type/map_types.hpp
@@ -0,0 +1,125 @@
+/*=============================================================================
+  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_MAP_TYPES_HPP
+#define SPROUT_TYPE_MAP_TYPES_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
+#include <sprout/type_traits/identity.hpp>
+#include <sprout/index_tuple/index_tuple.hpp>
+#include <sprout/tuple/indexes.hpp>
+#include <sprout/type/apply.hpp>
+#include <sprout/type/rebind_types.hpp>
+
+namespace sprout {
+	namespace types {
+		namespace detail {
+			template<typename Tuple>
+			struct map_types_default {
+			private:
+				template<typename Op, typename IndexTuple>
+				struct apply_impl;
+				template<typename Op, sprout::index_t... Indexes>
+				struct apply_impl<Op, sprout::index_tuple<Indexes...> >
+					: public sprout::types::apply<
+						sprout::types::rebind_types<Tuple>,
+						typename sprout::types::apply<Op, typename sprout::types::tuple_element<Indexes, Tuple>::type>::type...
+					>
+				{};
+			public:
+				template<typename Op>
+				struct apply
+					: public apply_impl<Op, typename sprout::tuple_indexes<Tuple>::type>
+				{};
+			};
+			template<template<typename...> class TupleClass, typename... Ts>
+			struct map_types_default<TupleClass<Ts...> > {
+			public:
+				template<typename Op>
+				struct apply
+					: public sprout::identity<TupleClass<typename sprout::types::apply<Op, Ts>::type...> >
+				{};
+			};
+			template<template<typename VT, VT...> class IntegerSequenceClass, typename T, T... Vs>
+			struct map_types_default<IntegerSequenceClass<T, Vs...> > {
+			public:
+				template<typename Op>
+				struct apply
+					: public sprout::identity<IntegerSequenceClass<T, sprout::types::apply<Op, sprout::integral_constant<T, Vs> >::type::value...> >
+				{};
+			};
+
+#define SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(TYPE) \
+			template<template<TYPE...> class IndexTupleClass, TYPE... Vs> \
+			struct map_types_default<IndexTupleClass<Vs...> > { \
+			public: \
+				template<typename Op> \
+				struct apply \
+					: public sprout::identity<IndexTupleClass<sprout::types::apply<Op, sprout::integral_constant<TYPE, Vs> >::type::value...> > \
+				{}; \
+			}
+
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(bool);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(char);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(signed char);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned char);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(char16_t);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(char32_t);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(wchar_t);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(short);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned short);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(int);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned int);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(long);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned long);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(long long);
+			SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned long long);
+
+#undef SPROUT_TYPES_DETAIL_MAP_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL
+		}	// namespace detail
+
+		//
+		// map_types
+		//
+		template<typename Tuple>
+		struct map_types
+			: public sprout::types::detail::map_types_default<Tuple>
+		{};
+
+		template<typename Tuple>
+		struct map_types<Tuple const> {
+		public:
+			template<typename Op>
+			struct apply
+				: public sprout::identity<typename sprout::types::apply<sprout::types::map_types<Tuple>, Op>::type const>
+			{};
+		};
+
+		template<typename Tuple>
+		struct map_types<Tuple volatile> {
+		public:
+			template<typename Op>
+			struct apply
+				: public sprout::identity<typename sprout::types::apply<sprout::types::map_types<Tuple>, Op>::type volatile>
+			{};
+		};
+
+		template<typename Tuple>
+		struct map_types<Tuple const volatile> {
+		public:
+			template<typename Op>
+			struct apply
+				: public sprout::identity<typename sprout::types::apply<sprout::types::map_types<Tuple>, Op>::type const volatile>
+			{};
+		};
+	}	// namespace types
+
+	using sprout::types::map_types;
+}	// namespace sprout
+
+#endif	// #ifndef SPROUT_TYPE_MAP_TYPES_HPP
diff --git a/sprout/type/operation.hpp b/sprout/type/operation.hpp
index f4823f33..b748f9a4 100644
--- a/sprout/type/operation.hpp
+++ b/sprout/type/operation.hpp
@@ -22,6 +22,7 @@
 #include <sprout/type/operation/pop_front.hpp>
 #include <sprout/type/operation/tuple_cat.hpp>
 #include <sprout/type/operation/rebind.hpp>
+#include <sprout/type/operation/map.hpp>
 #include <sprout/type/operation/assign.hpp>
 
 #endif	// #ifndef SPROUT_TYPE_OPERATION_HPP
diff --git a/sprout/type/operation/map.hpp b/sprout/type/operation/map.hpp
new file mode 100644
index 00000000..24a6500f
--- /dev/null
+++ b/sprout/type/operation/map.hpp
@@ -0,0 +1,32 @@
+/*=============================================================================
+  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_MAP_HPP
+#define SPROUT_TYPE_OPERATION_MAP_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/type/apply.hpp>
+#include <sprout/type/map_types.hpp>
+
+namespace sprout {
+	namespace types {
+		//
+		// map
+		//
+		template<typename Tuple, typename Op>
+		struct map
+			: public sprout::types::apply<sprout::types::map_types<Tuple>, Op>
+		{};
+
+#if SPROUT_USE_TEMPLATE_ALIASES
+		template<typename Tuple, typename Op>
+		using map_t = typename sprout::types::map<Tuple, Op>::type;
+#endif	// #if SPROUT_USE_TEMPLATE_ALIASES
+	}	// namespace types
+}	// namespace sprout
+
+#endif	// #ifndef SPROUT_TYPE_OPERATION_MAP_HPP
diff --git a/sprout/type/operation/pop_front.hpp b/sprout/type/operation/pop_front.hpp
index ccfd418f..f0961db4 100644
--- a/sprout/type/operation/pop_front.hpp
+++ b/sprout/type/operation/pop_front.hpp
@@ -9,10 +9,8 @@
 #define SPROUT_TYPE_OPERATION_POP_FRONT_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/index_tuple/metafunction.hpp>
 #include <sprout/type/apply.hpp>
-#include <sprout/type/tuple.hpp>
-#include <sprout/type/rebind_types.hpp>
+#include <sprout/type/pop_front_types.hpp>
 
 namespace sprout {
 	namespace types {
@@ -20,22 +18,9 @@ namespace sprout {
 		// pop_front
 		//
 		template<typename Tuple>
-		struct pop_front {
-		private:
-			template<typename IndexTuple>
-			struct apply_impl;
-			template<sprout::index_t... Indexes>
-			struct apply_impl<sprout::index_tuple<Indexes...> >
-				: public sprout::types::apply<
-					sprout::types::rebind_types<Tuple>,
-					typename sprout::types::tuple_element<Indexes, Tuple>::type...
-				>
-			{};
-		public:
-			typedef typename apply_impl<
-				typename sprout::index_range<1, sprout::types::tuple_size<Tuple>::value>::type
-			>::type type;
-		};
+		struct pop_front
+			: public sprout::types::apply<sprout::types::pop_front_types<Tuple> >
+		{};
 
 #if SPROUT_USE_TEMPLATE_ALIASES
 		template<typename Tuple>
diff --git a/sprout/type/pop_front_types.hpp b/sprout/type/pop_front_types.hpp
new file mode 100644
index 00000000..653403fd
--- /dev/null
+++ b/sprout/type/pop_front_types.hpp
@@ -0,0 +1,123 @@
+/*=============================================================================
+  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_POP_FRONT_TYPES_HPP
+#define SPROUT_TYPE_POP_FRONT_TYPES_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/index_tuple/metafunction.hpp>
+#include <sprout/type_traits/identity.hpp>
+#include <sprout/type/apply.hpp>
+#include <sprout/type/tuple.hpp>
+#include <sprout/type/rebind_types.hpp>
+
+namespace sprout {
+	namespace types {
+		namespace detail {
+			template<typename Tuple>
+			struct pop_front_types_default {
+				template<typename IndexTuple>
+				struct apply_impl;
+				template<sprout::index_t... Indexes>
+				struct apply_impl<sprout::index_tuple<Indexes...> >
+					: public sprout::types::apply<
+						sprout::types::rebind_types<Tuple>,
+						typename sprout::types::tuple_element<Indexes, Tuple>::type...
+					>
+				{};
+			public:
+				template<typename = void>
+				struct apply
+					: public apply_impl<typename sprout::index_range<1, sprout::types::tuple_size<Tuple>::value>::type>
+				{};
+			};
+			template<template<typename...> class TupleClass, typename Head, typename... Tail>
+			struct pop_front_types_default<TupleClass<Head, Tail...> > {
+			public:
+				template<typename = void>
+				struct apply
+					: public sprout::identity<TupleClass<Tail...> >
+				{};
+			};
+			template<template<typename VT, VT...> class IntegerSequenceClass, typename T, T Head, T... Tail>
+			struct pop_front_types_default<IntegerSequenceClass<T, Head, Tail...> > {
+			public:
+				template<typename = void>
+				struct apply
+					: public sprout::identity<IntegerSequenceClass<T, Tail...> >
+				{};
+			};
+
+#define SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(TYPE) \
+			template<template<TYPE...> class IndexTupleClass, TYPE Head, TYPE... Tail> \
+			struct pop_front_types_default<IndexTupleClass<Head, Tail...> > { \
+			public: \
+				template<typename = void> \
+				struct apply \
+					: public sprout::identity<IndexTupleClass<Tail...> > \
+				{}; \
+			}
+
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(bool);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(char);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(signed char);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned char);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(char16_t);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(char32_t);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(wchar_t);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(short);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned short);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(int);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned int);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(long);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned long);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(long long);
+			SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL(unsigned long long);
+
+#undef SPROUT_TYPES_DETAIL_POP_FRONT_TYPES_DEFAULT_INTEGER_SEQUENCE_LIKE_DECL
+		}	// namespace detail
+
+		//
+		// pop_front_types
+		//
+		template<typename Tuple>
+		struct pop_front_types
+			: public sprout::types::detail::pop_front_types_default<Tuple>
+		{};
+
+		template<typename Tuple>
+		struct pop_front_types<Tuple const> {
+		public:
+			template<typename... Types>
+			struct apply
+				: public sprout::identity<typename sprout::types::apply<sprout::types::pop_front_types<Tuple>, Types...>::type const>
+			{};
+		};
+
+		template<typename Tuple>
+		struct pop_front_types<Tuple volatile> {
+		public:
+			template<typename... Types>
+			struct apply
+				: public sprout::identity<typename sprout::types::apply<sprout::types::pop_front_types<Tuple>, Types...>::type volatile>
+			{};
+		};
+
+		template<typename Tuple>
+		struct pop_front_types<Tuple const volatile> {
+		public:
+			template<typename... Types>
+			struct apply
+				: public sprout::identity<typename sprout::types::apply<sprout::types::pop_front_types<Tuple>, Types...>::type const volatile>
+			{};
+		};
+	}	// namespace types
+
+	using sprout::types::pop_front_types;
+}	// namespace sprout
+
+#endif	// #ifndef SPROUT_TYPE_POP_FRONT_TYPES_HPP
diff --git a/sprout/type/rebind_types.hpp b/sprout/type/rebind_types.hpp
index 0d6ad463..c5fd0362 100644
--- a/sprout/type/rebind_types.hpp
+++ b/sprout/type/rebind_types.hpp
@@ -10,7 +10,6 @@
 
 #include <sprout/config.hpp>
 #include <sprout/type_traits/identity.hpp>
-#include <sprout/index_tuple/index_t.hpp>
 #include <sprout/type/apply.hpp>
 
 namespace sprout {