[Boost-commit] svn:boost r71774 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/option boost/assign/v2/put boost/assign/v2/ref/aux_/list/holder libs/assign/v2 libs/assign/v2/test/option libs/assign/v2/test/put libs/assign/v2/test/ref

Subject: [Boost-commit] svn:boost r71774 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/option boost/assign/v2/put boost/assign/v2/ref/aux_/list/holder libs/assign/v2 libs/assign/v2/test/option libs/assign/v2/test/put libs/assign/v2/test/ref
From: erwann.rogard_at_[hidden]
Date: 2011-05-06 19:51:12

Author: e_r
Date: 2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
New Revision: 71774
URL: http://svn.boost.org/trac/boost/changeset/71774

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/option/data.hpp               |     1                                         
   sandbox/assign_v2/boost/assign/v2/option/list.hpp               |     2 +                                       
   sandbox/assign_v2/boost/assign/v2/put.hpp                       |     1                                         
   sandbox/assign_v2/boost/assign/v2/put/csv_put.hpp               |    76 --------------------------------------- 
   sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp |     3 -                                       
   sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp         |     1                                         
   sandbox/assign_v2/libs/assign/v2/test/option/row_major.cpp      |     1                                         
   sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp   |     6 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/put/put.cpp               |     4 +                                       
   sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp             |     1                                         
   sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp         |     1                                         
   sandbox/assign_v2/libs/assign/v2/tutorial.cpp                   |     2                                         
   12 files changed, 17 insertions(+), 82 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/option/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/data.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/data.hpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -9,6 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_OPTION_DATA_ER_2011_HPP
 #define BOOST_ASSIGN_V2_OPTION_DATA_ER_2011_HPP
+#include <boost/assign/v2/support/functor/pair.hpp>
 #include <boost/assign/v2/support/functor/value.hpp>
 #include <boost/assign/v2/support/keyword.hpp>
 #include <boost/assign/v2/support/pp/ignore.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/option/list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/list.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/option/list.hpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -41,6 +41,8 @@
         #endif
     };
 
+    struct ignore_option{};
+
     template<typename Head>
     struct list_option_exit 
         : boost::is_same<Head, nil_>

Modified: sandbox/assign_v2/boost/assign/v2/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put.hpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -10,6 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_PUT_ER_2011_HPP
 #define BOOST_ASSIGN_V2_PUT_ER_2011_HPP
 #include <boost/assign/v2/put/csv_put.hpp>
+#include <boost/assign/v2/put/delay_csv_put.hpp>
 #include <boost/assign/v2/put/put.hpp>
 
 #endif // BOOST_ASSIGN_V2_PUT_ER_2011_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/csv_put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/csv_put.hpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -11,13 +11,9 @@
 #define BOOST_ASSIGN_V2_PUT_CSV_PUT_ER_2011_HPP
 #include <boost/assign/v2/support/config/enable_cpp0x.hpp>
 #include <boost/assign/v2/support/pp/ignore.hpp>
-#include <boost/assign/v2/interpreter/as_arg_list.hpp>
 #include <boost/assign/v2/interpreter/csv.hpp>
-#include <boost/assign/v2/put/put.hpp>
 #include <boost/assign/v2/option/data.hpp>
-#include <boost/assign/v2/option/list.hpp>
-#include <boost/config.hpp>
-#include <boost/mpl/bool.hpp>
+#include <boost/assign/v2/put/put.hpp>
 #include <boost/utility/enable_if.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
@@ -145,69 +141,6 @@
 //<-
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 //->
-    template<typename R, typename O = empty_list_option>
-    struct delayed_csv_put/*<-*/
-        : O, as_arg_list_adapter<R>
-    {
-
-        typedef O super1_t;
-        typedef as_arg_list_adapter<R> super2_t;
-
-        explicit delayed_csv_put(R& r)
-            : super2_t( r )
-        {}
-
-        delayed_csv_put(O options, R& r)
-            : super1_t( options ), super2_t( r )
-        {}
-
-        template<typename C>
-        C& apply(C& cont)const
-        {
-            make_csv_ready(
-                put( cont ) % static_cast<super1_t const&>( *this )
-            )(
-                static_cast<super2_t const&>( *this )
-            );
-
-            return cont;
-        }
-
-
-    }/*->*/;
-
-    template<typename C, typename R, typename O>
-    C& operator|(C& cont, delayed_csv_put<R, O> const& rhs)/*<-*/
-    {
-        return rhs.apply( cont );
-
-    }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
-namespace result_of{
-
-    template<typename R, typename O = empty_list_option>
-    struct delay_csv_put/*<-*/
-    {
-        typedef delayed_csv_put<R, O> type;
-    }/*->*/;
-
-}// result_of
-
-    template<typename R>
-    typename result_of::delay_csv_put<R const>::type
-    delay_csv_put(R const& range)/*<-*/
-    {
-        return delayed_csv_put<R const>( range );
-    }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
-    template<typename O, typename R>
-    typename result_of::delay_csv_put<R const, O>::type
-    delay_csv_put(option_crtp<O> const& options, R const& range)/*<-*/
-    {
-        return delayed_csv_put<R const, O>(
-            static_cast<O const&>( options ), range
-        );
-    }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
 }// interpreter_aux
 //<-
@@ -217,13 +150,6 @@
 //<-
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 //->
-    using interpreter_aux::delay_csv_put;
-
-namespace result_of{
-
-    using interpreter_aux::result_of::delay_csv_put;
-
-}// result_of
 //]
 
 }// v2

Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/holder/tail.hpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -27,7 +27,7 @@
     {
         typedef T tail_type;
         typedef ::boost::mpl::plus<
-        	typename T::tail_static_size,
+            typename T::tail_static_size,
             ::boost::mpl::int_<1>
         > tail_static_size;
         typedef T const& result_of_tail_type;
@@ -55,7 +55,6 @@
     template<typename T>
     struct tail_of{ typedef typename T::tail_type type; };
 
-
 }// list_aux
 }// ref
 }// v2

Modified: sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -19,6 +19,7 @@
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/apply.hpp>
+#include <boost/range/algorithm/equal.hpp>
 #include <boost/range/algorithm_ext/iota.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/typeof/typeof.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/row_major.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/row_major.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/row_major.cpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -15,6 +15,7 @@
 #include <boost/assign/v2/option/modifier/row_major.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/multi_array.hpp>
+#include <boost/range/algorithm/equal.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <boost/typeof/typeof.hpp>
 #include <libs/assign/v2/test/option/row_major.h>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -13,13 +13,14 @@
 #include <set>
 #include <string>
 #include <boost/assign/v2/support/config/check.hpp>
+#include <boost/assign/v2/include/delay_csv_put.hpp>
 #include <boost/assign/v2/include/csv_put.hpp>
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/option/modifier/std.hpp>
 #include <boost/circular_buffer.hpp>
+#include <boost/range/algorithm/equal.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/range/algorithm/equal.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/assert.hpp>
@@ -49,13 +50,12 @@
             //]
         }
         {
-            // fully qual boost::begin/end demanded by MSVC - error C2668
             //[test_option_push_front
             boost::circular_buffer<int> cb( 3 ); 
             
             BOOST_ASSIGN_V2_CHECK(
                 boost::range::equal(
-                    cb | as2::delay_csv_put( as2::_push_front, as2::csv_deque( 3, 2, 1 ) ), 
+                    cb | as2::delay_csv_put( as2::_option % as2::_push_front, as2::csv_deque( 3, 2, 1 ) ), 
                     as2::csv_deque( 1, 2, 3 ) 
                 )
             );

Modified: sandbox/assign_v2/libs/assign/v2/test/put/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/put.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/put.cpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -25,11 +25,13 @@
 #define BOOST_ASSIGN_V2_LIMIT_CSV_ARITY 24
 
 #include <boost/assign/v2/include/csv_deque.hpp>
-#include <boost/assign/v2/include/put.hpp>
 #include <boost/assign/v2/include/csv_put.hpp>
+#include <boost/assign/v2/include/delay_csv_put.hpp>
+#include <boost/assign/v2/include/put.hpp>
 #include <boost/circular_buffer.hpp>
 #include <boost/multi_array.hpp>
 #include <boost/numeric/conversion/bounds.hpp>
+#include <boost/range/algorithm/equal.hpp>
 #include <boost/range/algorithm_ext/iota.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/array.cpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -14,6 +14,7 @@
 
 #include <boost/assign/v2/support/config/check.hpp>
 #include <boost/range/algorithm/copy.hpp>
+#include <boost/range/algorithm/equal.hpp>
 #include <boost/assign/v2/include/ref/array.hpp>
 #include <libs/assign/v2/test/ref/array.h>
 

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/csv_array.cpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -11,6 +11,7 @@
 #include <vector>
 #include <boost/range/begin.hpp>
 #include <boost/range/algorithm/copy.hpp>
+#include <boost/range/algorithm/equal.hpp>
 #include <boost/typeof/typeof.hpp>
 #include <boost/assign/v2/support/config/check.hpp>
 #include <boost/assign/v2/ref/array/conversion.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/tutorial.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/tutorial.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/tutorial.cpp	2011-05-06 19:51:11 EDT (Fri, 06 May 2011)
@@ -159,7 +159,7 @@
             
             assert(
                 range::equal(
-                    cb | delay_csv_put( _push_front, csv_deque( 3, 2, 1 ) ), 
+                    cb | delay_csv_put( _option % _push_front, csv_deque( 3, 2, 1 ) ), 
                     csv_deque( 1, 2, 3 ) 
                 )
             );