From 138e4de0a8767636ab1ac4fbf289bd54090e9e4c Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Mon, 22 Jun 2015 00:06:50 +0300
Subject: [PATCH] Add tests for mp_count, mp_count_if.

---
 include/boost/mp11/algorithm.hpp      | 38 ++++++++++++++--
 include/boost/mp11/detail/mp_plus.hpp | 32 +++-----------
 test/Jamfile.v2                       |  4 +-
 test/mp_count.cpp                     | 63 +++++++++++++++++++++++++++
 test/mp_count_if.cpp                  | 59 +++++++++++++++++++++++++
 5 files changed, 164 insertions(+), 32 deletions(-)
 create mode 100644 test/mp_count.cpp
 create mode 100644 test/mp_count_if.cpp

diff --git a/include/boost/mp11/algorithm.hpp b/include/boost/mp11/algorithm.hpp
index 1111370..6a72a52 100644
--- a/include/boost/mp11/algorithm.hpp
+++ b/include/boost/mp11/algorithm.hpp
@@ -96,11 +96,32 @@ namespace detail
 
 template<class L, class V> struct mp_count_impl;
 
+#if !defined( BOOST_NO_CXX11_CONSTEXPR )
+
+constexpr std::size_t cx_plus()
+{
+    return 0;
+}
+
+template<class T1, class... T> constexpr std::size_t cx_plus(T1 t1, T... t)
+{
+    return t1 + cx_plus(t...);
+}
+
 template<template<class...> class L, class... T, class V> struct mp_count_impl<L<T...>, V>
 {
-    using type = mp_plus<std::is_same<T, V>...>;
+    using type = mp_size_t<cx_plus(std::is_same<T, V>::value...)>;
 };
 
+#else
+
+template<template<class...> class L, class... T, class V> struct mp_count_impl<L<T...>, V>
+{
+    using type = mp_size_t<mp_plus<std::is_same<T, V>...>::value>;
+};
+
+#endif
+
 } // namespace detail
 
 template<class L, class V> using mp_count = typename detail::mp_count_impl<L, V>::type;
@@ -111,20 +132,31 @@ namespace detail
 
 template<class L, template<class...> class P> struct mp_count_if_impl;
 
+#if !defined( BOOST_NO_CXX11_CONSTEXPR )
+
+template<template<class...> class L, class... T, template<class...> class P> struct mp_count_if_impl<L<T...>, P>
+{
+    using type = mp_size_t<cx_plus(mp_to_bool<P<T>>::value...)>;
+};
+
+#else
+
 template<template<class...> class L, class... T, template<class...> class P> struct mp_count_if_impl<L<T...>, P>
 {
 #if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
 
     template<class T> struct _f { using type = mp_to_bool<P<T>>; };
-    using type = mp_plus<typename _f<T>::type...>;
+    using type = mp_size_t<mp_plus<typename _f<T>::type...>::value>;
 
 #else
 
-    using type = mp_plus<mp_to_bool<P<T>>...>;
+    using type = mp_size_t<mp_plus<mp_to_bool<P<T>>...>::value>;
 
 #endif
 };
 
+#endif
+
 } // namespace detail
 
 template<class L, template<class...> class P> using mp_count_if = typename detail::mp_count_if_impl<L, P>::type;
diff --git a/include/boost/mp11/detail/mp_plus.hpp b/include/boost/mp11/detail/mp_plus.hpp
index 1b77783..88e34ef 100644
--- a/include/boost/mp11/detail/mp_plus.hpp
+++ b/include/boost/mp11/detail/mp_plus.hpp
@@ -20,45 +20,23 @@ namespace detail
 
 template<class... T> struct mp_plus_impl;
 
-#if defined( BOOST_NO_CXX11_CONSTEXPR )
-
 template<> struct mp_plus_impl<>
 {
-	using type = std::integral_constant<int, 0>;
+    using type = std::integral_constant<int, 0>;
 };
 
 template<class T1, class... T> struct mp_plus_impl<T1, T...>
 {
-	static const/*expr*/ auto _v = T1::value + mp_plus<T...>::value;
-	using type = std::integral_constant< typename std::remove_const<decltype(_v)>::type, _v >;
+    static const/*expr*/ auto _v = T1::value + mp_plus_impl<T...>::type::value;
+    using type = std::integral_constant<typename std::remove_const<decltype(_v)>::type, _v>;
 };
 
 template<class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class... T> struct mp_plus_impl<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T...>
 {
-	static const/*expr*/ auto _v = T1::value + T2::value + T3::value + T4::value + T5::value + T6::value + T7::value + T8::value + T9::value + T10::value + mp_plus<T...>::value;
-	using type = std::integral_constant< typename std::remove_const<decltype(_v)>::type, _v >;
+    static const/*expr*/ auto _v = T1::value + T2::value + T3::value + T4::value + T5::value + T6::value + T7::value + T8::value + T9::value + T10::value + mp_plus_impl<T...>::type::value;
+    using type = std::integral_constant<typename std::remove_const<decltype(_v)>::type, _v>;
 };
 
-#else
-
-constexpr int cx_plus()
-{
-	return 0;
-}
-
-template<class T1, class... T> constexpr auto cx_plus( T1 t1, T... t ) -> decltype( t1 + cx_plus( t... ) )
-{
-	return t1 + cx_plus( t... );
-}
-
-template<class... T> struct mp_plus_impl
-{
-	static constexpr auto _v = cx_plus( T::value... );
-	using type = std::integral_constant< typename std::remove_const<decltype(_v)>::type, _v >;
-};
-
-#endif
-
 } // namespace detail
 
 template<class... T> using mp_plus = typename detail::mp_plus_impl<T...>::type;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index dc71979..4cd6c40 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -29,8 +29,8 @@ run mp_assign.cpp : : : $(REQ) ;
 run mp_clear.cpp : : : $(REQ) ;
 run mp_transform.cpp : : : $(REQ) ;
 run mp_fill.cpp : : : $(REQ) ;
-#run mp_count.cpp : : : $(REQ) ;
-#run mp_count_if.cpp : : : $(REQ) ;
+run mp_count.cpp : : : $(REQ) ;
+run mp_count_if.cpp : : : $(REQ) ;
 #run mp_contains.cpp : : : $(REQ) ;
 run mp_repeat.cpp : : : $(REQ) ;
 
diff --git a/test/mp_count.cpp b/test/mp_count.cpp
new file mode 100644
index 0000000..15c128a
--- /dev/null
+++ b/test/mp_count.cpp
@@ -0,0 +1,63 @@
+
+//  Copyright 2015 Peter Dimov.
+//
+// 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
+
+
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
+#include <boost/mp11/integral.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
+#include <type_traits>
+#include <tuple>
+#include <utility>
+
+struct X1 {};
+struct X2 {};
+struct X3 {};
+
+int main()
+{
+    using boost::mp_list;
+    using boost::mp_count;
+    using boost::mp_size_t;
+
+    {
+        using L1 = mp_list<>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L1, void>, mp_size_t<0>>));
+
+        using L2 = mp_list<X1, X2, X3, X2, X3, X3>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L2, void>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L2, X1>, mp_size_t<1>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L2, X2>, mp_size_t<2>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L2, X3>, mp_size_t<3>>));
+    }
+
+    {
+        using L3 = std::tuple<>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L3, void>, mp_size_t<0>>));
+
+        using L4 = std::tuple<X1, X2, X3, X2, X3, X3>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L4, void>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L4, X1>, mp_size_t<1>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L4, X2>, mp_size_t<2>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L4, X3>, mp_size_t<3>>));
+    }
+
+    {
+        using L5 = std::pair<X1, X2>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L5, void>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L5, X1>, mp_size_t<1>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count<L5, X2>, mp_size_t<1>>));
+    }
+
+    return boost::report_errors();
+}
diff --git a/test/mp_count_if.cpp b/test/mp_count_if.cpp
new file mode 100644
index 0000000..311cf12
--- /dev/null
+++ b/test/mp_count_if.cpp
@@ -0,0 +1,59 @@
+
+//  Copyright 2015 Peter Dimov.
+//
+// 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
+
+
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
+#include <boost/mp11/integral.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
+#include <type_traits>
+#include <tuple>
+#include <utility>
+
+struct X1 {};
+
+int main()
+{
+    using boost::mp_list;
+    using boost::mp_count_if;
+    using boost::mp_size_t;
+
+    {
+        using L1 = mp_list<>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L1, std::is_const>, mp_size_t<0>>));
+
+        using L2 = mp_list<X1, X1 const, X1*, X1 const, X1*, X1*>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_volatile>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_const>, mp_size_t<2>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_pointer>, mp_size_t<3>>));
+    }
+
+    {
+        using L1 = std::tuple<>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L1, std::is_const>, mp_size_t<0>>));
+
+        using L2 = std::tuple<X1, X1 const, X1*, X1 const, X1*, X1*>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_volatile>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_const>, mp_size_t<2>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_pointer>, mp_size_t<3>>));
+    }
+
+    {
+        using L2 = std::pair<X1 const, X1*>;
+
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_volatile>, mp_size_t<0>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_const>, mp_size_t<1>>));
+        BOOST_TEST_TRAIT_TRUE((std::is_same<mp_count_if<L2, std::is_pointer>, mp_size_t<1>>));
+    }
+
+    return boost::report_errors();
+}