Merge pull request #239 from denzor200/transform_view_ext

Transform view ext

doc/iterator.qbk

@@ -254,6 +254,7 @@ expressions must be valid:
 * __iterator_range__ iterator (where adapted iterators are __associative_iterator__\ s)
 * __joint_view__ iterator (where adapted sequences are __associative_sequence__\ s and __forward_sequence__\ s)
 * __reverse_view__ iterator (where adapted sequence is an __associative_sequence__ and a __bidirectional_sequence__)
+* __transform_view__ iterator (where adapted sequence is an __associative_sequence__ and a __forward_sequence__)
 
 [endsect]
 

doc/sequence.qbk

@@ -360,6 +360,7 @@ you can use `__result_of_value_at_key__<S, K>`.]
 * __iterator_range__ (where adapted iterators are __associative_iterator__\ s)
 * __joint_view__     (where adapted sequences are __associative_sequence__\ s and __forward_sequence__\ s)
 * __reverse_view__   (where adapted sequence is an __associative_sequence__ and a __bidirectional_sequence__)
+* __transform_view__ (where adapted sequence is an __associative_sequence__ and a __forward_sequence__)
 
 [endsect]
 

doc/view.qbk

@@ -363,6 +363,7 @@ given a binary function object or function pointer.
 * __forward_sequence__, __bidirectional_sequence__ or
 __random_access_sequence__ depending on the traversal characteristics (see
 __traversal_concept__) of its underlying sequence or sequences.
+* __associative_sequence__ if underlying sequence implements the __associative_sequence__ model(available only with unary version of `transform_view`).
 
 [variablelist Notation
     [[`TV`]             [A `transform_view` type]]

include/boost/fusion/view/transform_view/detail/deref_data_impl.hpp

@@ -0,0 +1,66 @@
+/*=============================================================================
+    Copyright (c) 2022 Denis Mikhailov
+    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)
+==============================================================================*/
+
+#if !defined(BOOST_FUSION_TRANSFORM_VIEW_DEREF_DATA_IMPL_JAN_9_2022_0354PM)
+#define BOOST_FUSION_TRANSFORM_VIEW_DEREF_DATA_IMPL_JAN_9_2022_0354PM
+
+#include <boost/fusion/support/config.hpp>
+#include <boost/fusion/iterator/deref.hpp>
+#include <boost/mpl/if.hpp>
+
+namespace boost { namespace fusion
+{
+    struct transform_view_iterator_tag;
+    struct transform_view_iterator2_tag;
+
+    namespace extension
+    {
+        template<typename Tag>
+        struct deref_data_impl;
+
+        // Unary Version
+        template<>
+        struct deref_data_impl<transform_view_iterator_tag>
+        {
+            template <typename Iterator>
+            struct apply
+            {
+                typedef typename
+                    result_of::deref<typename Iterator::first_type>::type
+                value_type;
+
+                typedef typename Iterator::transform_type F;
+                typedef typename boost::result_of<F(value_type)>::type transformed_type;
+                typedef typename boost::remove_reference<transformed_type>::type transformed_type_unref;
+                typedef typename boost::remove_const<transformed_type_unref>::type transformed_type_unconst;
+
+                typedef typename transformed_type_unconst::second_type raw_type;
+                typedef typename
+                    boost::mpl::if_<
+                        is_reference<transformed_type>
+                      , typename boost::mpl::if_<
+                            is_const<transformed_type_unref>
+                            , typename boost::add_reference<typename boost::add_const<raw_type>::type>::type
+                            , typename boost::add_reference<raw_type>::type
+                        >::type
+                      , raw_type
+                    >::type
+                type;
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+                static type
+                call(Iterator const& i)
+                {
+                    return i.f(fusion::deref(i.first)).second;
+                }
+            };
+        };
+
+        // Binary Version is not supported with Associative Sequence
+    }
+}}
+
+#endif

include/boost/fusion/view/transform_view/detail/key_of_impl.hpp

@@ -0,0 +1,47 @@
+/*=============================================================================
+    Copyright (c) 2022 Denis Mikhailov
+    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)
+==============================================================================*/
+
+#if !defined(BOOST_FUSION_TRANSFORM_VIEW_KEY_OF_IMPL_JAN_9_2022_0354PM)
+#define BOOST_FUSION_TRANSFORM_VIEW_KEY_OF_IMPL_JAN_9_2022_0354PM
+
+#include <boost/fusion/support/config.hpp>
+#include <boost/fusion/iterator/deref.hpp>
+#include <boost/utility/result_of.hpp>
+
+namespace boost { namespace fusion
+{
+    struct transform_view_iterator_tag;
+    struct transform_view_iterator2_tag;
+
+    namespace extension
+    {
+        template<typename Tag>
+        struct key_of_impl;
+
+        // Unary Version
+        template<>
+        struct key_of_impl<transform_view_iterator_tag>
+        {
+            template <typename Iterator>
+            struct apply
+            {
+                typedef typename
+                    result_of::deref<typename Iterator::first_type>::type
+                value_type;
+
+                typedef typename Iterator::transform_type F;
+                typedef typename boost::result_of<F(value_type)>::type transformed_type;
+                typedef typename boost::remove_reference<transformed_type>::type transformed_type_unref;
+                typedef typename boost::remove_const<transformed_type_unref>::type transformed_type_unconst;
+
+                typedef typename transformed_type_unconst::first_type type;
+            };
+        };
+
+        // Binary Version is not supported with Associative Sequence
+    }
+}}
+#endif

include/boost/fusion/view/transform_view/detail/value_of_data_impl.hpp

@@ -0,0 +1,47 @@
+/*=============================================================================
+    Copyright (c) 2022 Denis Mikhailov
+    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)
+==============================================================================*/
+
+#if !defined(BOOST_FUSION_TRANSFORM_VIEW_VALUE_OF_IMPL_JAN_9_2022_0354PM)
+#define BOOST_FUSION_TRANSFORM_VIEW_VALUE_OF_IMPL_JAN_9_2022_0354PM
+
+#include <boost/fusion/support/config.hpp>
+#include <boost/fusion/iterator/deref.hpp>
+#include <boost/utility/result_of.hpp>
+
+namespace boost { namespace fusion
+{
+    struct transform_view_iterator_tag;
+    struct transform_view_iterator2_tag;
+
+    namespace extension
+    {
+        template<typename Tag>
+        struct value_of_data_impl;
+
+        // Unary Version
+        template<>
+        struct value_of_data_impl<transform_view_iterator_tag>
+        {
+            template <typename Iterator>
+            struct apply
+            {
+                typedef typename
+                    result_of::deref<typename Iterator::first_type>::type
+                value_type;
+
+                typedef typename Iterator::transform_type F;
+                typedef typename boost::result_of<F(value_type)>::type transformed_type;
+                typedef typename boost::remove_reference<transformed_type>::type transformed_type_unref;
+                typedef typename boost::remove_const<transformed_type_unref>::type transformed_type_unconst;
+
+                typedef typename transformed_type_unconst::second_type type;
+            };
+        };
+
+        // Binary Version is not supported with Associative Sequence
+    }
+}}
+#endif

include/boost/fusion/view/transform_view/transform_view_iterator.hpp

@@ -19,6 +19,9 @@
 #include <boost/fusion/view/transform_view/detail/advance_impl.hpp>
 #include <boost/fusion/view/transform_view/detail/distance_impl.hpp>
 #include <boost/fusion/view/transform_view/detail/equal_to_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/key_of_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/value_of_data_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/deref_data_impl.hpp>
 
 namespace boost { namespace fusion
 {

test/sequence/transform_view.cpp

@@ -1,11 +1,14 @@
 /*=============================================================================
     Copyright (c) 2001-2011 Joel de Guzman
+    Copyright (c) 2022 Denis Mikhailov
 
     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/detail/lightweight_test.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/container/generation/make_map.hpp>
 #include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/container/generation/make_vector.hpp>
@@ -14,15 +17,29 @@
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
+#include <boost/fusion/sequence/intrinsic/at_key.hpp>
+#include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
+#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/prior.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/distance.hpp>
+#include <boost/fusion/iterator/key_of.hpp>
+#include <boost/fusion/iterator/deref_data.hpp>
+#include <boost/fusion/iterator/value_of_data.hpp>
+#include <boost/fusion/support/pair.hpp>
+#include <boost/fusion/support/category_of.hpp>
 
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/assert.hpp>
+#include <boost/mpl/at.hpp>
+#include <boost/mpl/map.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/typeof/typeof.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
 struct square
 {
@@ -60,6 +77,85 @@ struct add
     }
 };
 
+struct abstract
+{
+    virtual void foo() = 0;
+};
+
+struct functor
+{
+    typedef boost::fusion::pair<short, char> pair_0;
+    typedef boost::fusion::pair<double, std::string> pair_1;
+    typedef boost::fusion::pair<abstract, long> pair_2;
+
+    typedef boost::mpl::map<
+        boost::mpl::pair< boost::fusion::pair<int, char> , pair_0>
+      , boost::mpl::pair< pair_1 , pair_1>
+      , boost::mpl::pair< boost::fusion::pair<abstract, int> , pair_2>
+    > m;
+
+    template<typename Sig>
+    struct result;
+
+    template<class F, class T>
+    struct result<F(T)> 
+        : boost::mpl::at<
+              m,
+              typename boost::remove_reference<T>::type
+          >
+    {};
+
+    pair_0 operator() (const boost::fusion::pair<int, char>& arg) const
+    {
+        return pair_0(arg.second);
+    }
+    
+    pair_1 operator() (const pair_1 & arg) const
+    {
+        return pair_1(arg.second + "_transformed");
+    }
+
+    pair_2 operator() (const boost::fusion::pair<abstract, int>& arg) const
+    {
+        return pair_2(arg.second);
+    }
+};
+
+struct simple_identity
+{
+    template<typename Sig>
+    struct result;
+
+    template<typename U>
+    struct result<simple_identity(U)>
+    {
+        typedef U type;
+    };
+
+    template<typename T>
+    T& operator() (T& arg) const 
+    {
+        return arg;
+    }
+};
+
+struct simple_identity_nonref
+{
+    template<typename Sig>
+    struct result;
+
+    template<typename U>
+    struct result<simple_identity_nonref(U)>
+    : boost::remove_reference<U>
+    {};
+
+    template<typename T>
+    T operator() (T arg) const 
+    {
+        return arg;
+    }
+};
+
 int
 main()
 {
@@ -110,6 +206,183 @@ main()
         BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_c<xform_type, 0>::type, int>));
     }
 
+    /// Associative
+    {
+        typedef map<
+            pair<int, char>
+          , pair<double, std::string>
+          , pair<abstract, int> >
+        map_type;
+        typedef transform_view<map_type, functor> transformed_type;
+
+        BOOST_MPL_ASSERT((traits::is_associative<transformed_type>));
+        BOOST_MPL_ASSERT((traits::is_random_access<transformed_type>));
+
+        map_type m(
+            make_pair<int>('X')
+          , make_pair<double>("Men")
+          , make_pair<abstract>(2));
+        transformed_type t(m, functor());
+
+        std::cout << at_key<short>(t) << std::endl;
+        std::cout << at_key<double>(t) << std::endl;
+        std::cout << at_key<abstract>(t) << std::endl;
+
+        BOOST_TEST(at_key<short>(t) == 'X');
+        BOOST_TEST(at_key<double>(t) == "Men_transformed");
+        BOOST_TEST(at_key<abstract>(t) == 2);
+
+        BOOST_STATIC_ASSERT((
+            boost::is_same<boost::fusion::result_of::value_at_key<transformed_type, short>::type, char>::value));
+        BOOST_STATIC_ASSERT((
+            boost::is_same<boost::fusion::result_of::value_at_key<transformed_type, double>::type, std::string>::value));
+        BOOST_STATIC_ASSERT((
+            boost::is_same<boost::fusion::result_of::value_at_key<transformed_type, abstract>::type, long>::value));
+
+        std::cout << t << std::endl;
+
+        BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<transformed_type, short>::value));
+        BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<transformed_type, double>::value));
+        BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<transformed_type, abstract>::value));
+        BOOST_STATIC_ASSERT((!boost::fusion::result_of::has_key<transformed_type, std::string>::value));
+
+        std::cout << deref_data(begin(t)) << std::endl;
+        std::cout << deref_data(boost::fusion::next(begin(t))) << std::endl;
+
+        BOOST_TEST(deref_data(begin(t)) == 'X');
+        BOOST_TEST(deref_data(boost::fusion::next(begin(t))) == "Men_transformed");
+        BOOST_TEST(deref_data(boost::fusion::next(next(begin(t)))) == 2);
+
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::begin<transformed_type>::type>::type, short>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::begin<transformed_type>::type>::type>::type, double>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::next<boost::fusion::result_of::begin<transformed_type>::type>::type>::type>::type, abstract>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::begin<transformed_type>::type>::type, char>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::begin<transformed_type>::type>::type>::type, std::string>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::next<boost::fusion::result_of::begin<transformed_type>::type>::type>::type>::type, long>::value));
+
+        // Test random access interface.
+        pair<short, char> a = at_c<0>(t); (void) a;
+        pair<double, std::string> b = at_c<1>(t);
+        pair<abstract, int> c = at_c<2>(t);
+        (void)c;
+
+        typedef boost::fusion::result_of::begin<transformed_type>::type first;
+        typedef boost::fusion::result_of::next<first>::type second;
+        typedef boost::fusion::result_of::next<second>::type third;
+
+        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of<first>::type, boost::fusion::pair<short, char> >));
+        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of<second>::type, boost::fusion::pair<double, std::string> >));
+        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of<third>::type, boost::fusion::pair<abstract, long> >));
+    }
+
+    {
+        typedef map<
+            pair<int, char>
+          , pair<double, std::string>
+          , pair<abstract, int> >
+        map_type;
+        typedef transform_view<map_type, simple_identity> transformed_type;
+
+        BOOST_MPL_ASSERT((traits::is_associative<transformed_type>));
+        BOOST_MPL_ASSERT((traits::is_random_access<transformed_type>));
+
+        map_type m(
+            make_pair<int>('X')
+          , make_pair<double>("Men")
+          , make_pair<abstract>(2));
+        transformed_type t(m, simple_identity());
+
+        std::cout << at_key<int>(t) << std::endl;
+        std::cout << at_key<double>(t) << std::endl;
+        std::cout << at_key<abstract>(t) << std::endl;
+
+        BOOST_TEST(at_key<int>(t) == 'X');
+        BOOST_TEST(at_key<double>(t) == "Men");
+        BOOST_TEST(at_key<abstract>(t) == 2);
+
+        BOOST_STATIC_ASSERT((
+            boost::is_same<boost::fusion::result_of::value_at_key<transformed_type, int>::type, char>::value));
+        BOOST_STATIC_ASSERT((
+            boost::is_same<boost::fusion::result_of::value_at_key<transformed_type, double>::type, std::string>::value));
+        BOOST_STATIC_ASSERT((
+            boost::is_same<boost::fusion::result_of::value_at_key<transformed_type, abstract>::type, int>::value));
+
+        std::cout << t << std::endl;
+
+        BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<transformed_type, int>::value));
+        BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<transformed_type, double>::value));
+        BOOST_STATIC_ASSERT((boost::fusion::result_of::has_key<transformed_type, abstract>::value));
+        BOOST_STATIC_ASSERT((!boost::fusion::result_of::has_key<transformed_type, std::string>::value));
+
+        std::cout << deref_data(begin(t)) << std::endl;
+        std::cout << deref_data(boost::fusion::next(begin(t))) << std::endl;
+
+        BOOST_TEST(deref_data(begin(t)) == 'X');
+        BOOST_TEST(deref_data(boost::fusion::next(begin(t))) == "Men");
+        BOOST_TEST(deref_data(boost::fusion::next(next(begin(t)))) == 2);
+
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::begin<transformed_type>::type>::type, int>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::begin<transformed_type>::type>::type>::type, double>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::key_of<boost::fusion::result_of::next<boost::fusion::result_of::next<boost::fusion::result_of::begin<transformed_type>::type>::type>::type>::type, abstract>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::begin<transformed_type>::type>::type, char>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::begin<transformed_type>::type>::type>::type, std::string>::value));
+        BOOST_STATIC_ASSERT((boost::is_same<boost::fusion::result_of::value_of_data<boost::fusion::result_of::next<boost::fusion::result_of::next<boost::fusion::result_of::begin<transformed_type>::type>::type>::type>::type, int>::value));
+
+        // Test random access interface.
+        pair<int, char> a = at_c<0>(t); (void) a;
+        pair<double, std::string> b = at_c<1>(t);
+        pair<abstract, int> c = at_c<2>(t);
+        (void)c;
+
+        typedef boost::fusion::result_of::begin<transformed_type>::type first;
+        typedef boost::fusion::result_of::next<first>::type second;
+        typedef boost::fusion::result_of::next<second>::type third;
+
+        // BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of<first>::type, boost::fusion::pair<int, char> >));
+        // BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of<second>::type, boost::fusion::pair<double, std::string> >));
+        // BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_of<third>::type, boost::fusion::pair<abstract, int> >));
+    }
+
+    {
+        // compile test only
+        // make sure result_of::deref_data returns a reference
+        typedef map<pair<float, int> > map_type;
+        typedef transform_view<map_type, simple_identity> transformed_type;
+        typedef boost::fusion::result_of::begin<transformed_type>::type i_type;
+        typedef boost::fusion::result_of::deref_data<i_type>::type r_type;
+        BOOST_STATIC_ASSERT((boost::is_same<r_type, int&>::value));
+    }
+
+    {
+        // compile test only
+        // make sure result_of::deref_data is const correct
+        typedef map<pair<float, int> > const map_type;
+        typedef transform_view<map_type, simple_identity> transformed_type;
+        typedef boost::fusion::result_of::begin<transformed_type>::type i_type;
+        typedef boost::fusion::result_of::deref_data<i_type>::type r_type;
+        BOOST_STATIC_ASSERT((boost::is_same<r_type, int const&>::value));
+    }
+
+    {
+        // compile test only
+        // make sure result_of::deref_data will not return a reference to temp object
+        typedef map<pair<float, int> > const map_type;
+        typedef transform_view<map_type, simple_identity_nonref> transformed_type;
+        typedef boost::fusion::result_of::begin<transformed_type>::type i_type;
+        typedef boost::fusion::result_of::deref_data<i_type>::type r_type;
+        BOOST_STATIC_ASSERT((boost::is_same<r_type, int>::value));
+    }
+
+    {
+        // compile test only
+        // make sure result_of::deref_data will not const for non-constant references
+        typedef map<pair<float, int&> > const map_type;
+        typedef transform_view<map_type, simple_identity> transformed_type;
+        typedef boost::fusion::result_of::begin<transformed_type>::type i_type;
+        typedef boost::fusion::result_of::deref_data<i_type>::type r_type;
+        BOOST_STATIC_ASSERT((boost::is_same<r_type, int&>::value));
+    }
+
     return boost::report_errors();
 }