[Boost-commit] svn:boost r70455 - sandbox/assign_v2/boost/assign/v2/put/pipe

Subject: [Boost-commit] svn:boost r70455 - sandbox/assign_v2/boost/assign/v2/put/pipe
From: erwann.rogard_at_[hidden]
Date: 2011-03-22 21:36:45

Author: e_r
Date: 2011-03-22 21:36:44 EDT (Tue, 22 Mar 2011)
New Revision: 70455
URL: http://svn.boost.org/trac/boost/changeset/70455

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp |   201 --------------------------------------- 
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp  |   186 ++++++++++++++++++++++++++++++++++++    
   2 files changed, 182 insertions(+), 205 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp	2011-03-22 21:36:44 EDT (Tue, 22 Mar 2011)
@@ -1,201 +1,2 @@
-//////////////////////////////////////////////////////////////////////////////
-//  Boost.Assign v2                                                         //
-//                                                                          //
-//  Copyright (C) 2003-2004 Thorsten Ottosen                                //
-//  Copyright (C) 2010 Erwann Rogard                                        //
-//  Use, modification and distribution are subject to 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 BOOST_ASSIGN_V2_PUT_PIPE_ARG_LIST_HPP_ER_2010
-#define BOOST_ASSIGN_V2_PUT_PIPE_ARG_LIST_HPP_ER_2010
-#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#include <boost/assign/v2/ref/array/csv_array.hpp>
-#include <boost/assign/v2/ref/wrapper/copy.hpp>
-#include <boost/assign/v2/put/pipe/option_traits.hpp>
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/vector/vector0.hpp>
-#include <boost/mpl/size.hpp>
-#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
-#include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
-#include <boost/mpl/aux_/na.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/repetition.hpp>
-#endif
-
-namespace boost{
-    struct use_default;
-namespace assign{
-namespace v2{
-//[syntax_put_pipe_arg_list
-namespace aux{
-
-    typedef ref::array_aux::size_type arg_list_size_type;
-
-    template<typename OptionList, arg_list_size_type N, typename U>
-    struct arg_list/*<-*/
-    {
-        typedef boost::use_default tag2_;
-        typedef option_traits<OptionList> option_traits;
-        typedef typename option_traits::cont_ option_list_cont_type;
-        typedef typename v2::ref::nth_result_of::csv_array<
-            N,
-            U
-        >::type arg_list_cont_type; //notice it's arg, not args
-
-        arg_list(){}
-        arg_list(option_list_cont_type const& a, arg_list_cont_type const& b)
-            : option_list_cont_( a ), arg_list_cont_( b ){}
-
-        option_list_cont_type const& option_list_cont()const 
-        {
-            return this->option_list_cont_;
-        }
-
-        arg_list_cont_type const& arg_list_cont() const
-        {
-            return this->arg_list_cont_;
-        }
-
-        protected:
-        option_list_cont_type option_list_cont_;
-        arg_list_cont_type arg_list_cont_;
-
-    }/*->*/;
-
-    template<typename OptionList/*<-*/ = ::boost::mpl::vector0<> /*->*/>
-    class arg_list_generator/*<-*/
-    {
-
-        typedef ::boost::mpl::na na_;
-        typedef option_traits<OptionList> option_traits_;
-
-        public:
-
-        typedef typename option_traits_::size option_list_size;
-        typedef typename option_traits_::cont_ option_list_cont_type;
-
-        arg_list_generator(){}
-        explicit arg_list_generator(option_list_cont_type const& p)
-            : option_list_cont_( p ){}
-
-        template<typename P>
-        struct option_result
-        {
-            typedef typename option_traits_:: template next_option_list<
-                P
-            >::type option_list_;
-            typedef arg_list_generator<option_list_> type;
-        };
-
-        template<typename O>
-        typename option_result<O>::type
-        operator%(O const& option)const
-        {
-            typedef typename option_result<O>::type result_;
-            return result_( this->option_list_cont()( option ) );
-        }
-
-        template<std::size_t N, typename U = na_> // size?
-        struct result{
-            typedef aux::arg_list<OptionList, N, U> type;
-        };
- 
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-
-    protected:
-    template<typename T, typename...Args>
-    typename result<sizeof...(Args) + 1, T>::type
-    impl(T& t, Args&...args)const
-    {
-        typedef typename result<sizeof...(Args)+1, T>::type result_;
-        namespace ns = ref::assign_copy;
-        return result_(
-            this->option_list_cont(),
-            ref::csv_array( t, args... )
-        );
-    }
-
-    public:
-
-    template<typename T, typename...Args>
-    typename boost::lazy_disable_if<
-        v2::type_traits::or_const<T, Args...>,
-        result<sizeof...(Args)+1, T>
-    >::type
-    operator()(T& t, Args&...args)const
-    {
-        return this->impl(t, args...);
-    }
-
-    template<typename T, typename...Args>
-    typename result<sizeof...(Args)+1, T const>::type
-    operator()(T const& t, Args const&...args)const
-    {
-        return this->impl(t, args...);
-    }
-
-#else
-
-        typename result<0>::type
-        operator()()const
-        {
-            typedef typename result<0>::type result_;
-            return result_(
-                *this,
-                ref::csv_array<na_>( _nil )
-            );
-        }
-
-#define BOOST_ASSIGN_V2_MACRO1(N, U)\
-    return result_( \
-        this->option_list_cont(), \
-        ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) ) \
-    );\
-/**/
-#define BOOST_ASSIGN_V2_MACRO2(z, N, data)\
-    template<typename T>\
-    typename result<N, T>::type\
-    operator()( BOOST_PP_ENUM_PARAMS(N, T &_) )const \
-    { \
-        typedef typename result<N, T>::type result_;\
-        BOOST_ASSIGN_V2_MACRO1( N, T )\
-    } \
-    template<typename T>\
-    typename result<N, T const>::type\
-    operator()( BOOST_PP_ENUM_PARAMS(N, T const &_) )const \
-    { \
-        typedef typename result<N, T const>::type result_;\
-        BOOST_ASSIGN_V2_MACRO1( N, T const )\
-    } \
-/**/
-
-BOOST_PP_REPEAT_FROM_TO(
-    1,
-    BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
-    BOOST_ASSIGN_V2_MACRO2,
-    ~
-)
-#undef BOOST_ASSIGN_V2_MACRO1
-#undef BOOST_ASSIGN_V2_MACRO2
-
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-
-        option_list_cont_type const& option_list_cont()const
-        {
-            return this->option_list_cont_;
-        }
-
-        protected:
-        option_list_cont_type option_list_cont_;
-
-    }/*->*/;
-
-}// aux
-//]
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_PUT_PIPE_ARG_LIST_HPP_ER_2010
+// TODO remove file
 

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp	2011-03-22 21:36:44 EDT (Tue, 22 Mar 2011)
@@ -7,20 +7,194 @@
 //  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 BOOST_ASSIGN_V2_PUT_PIPE_CSV_PUT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_PIPE_CSV_PUT_ER_2010_HPP
-#include <boost/assign/v2/detail/pp/ignore.hpp>
+#ifndef BOOST_ASSIGN_V2_PUT_PIPE_CSV_PUT_HPP_ER_2010
+#define BOOST_ASSIGN_V2_PUT_PIPE_CSV_PUT_HPP_ER_2010
+#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
 #include <boost/assign/v2/ref/array/as_arg_list.hpp>
+#include <boost/assign/v2/ref/array/csv_array.hpp>
 #include <boost/assign/v2/ref/aux_/list/as_modulo_list.hpp>
+#include <boost/assign/v2/ref/wrapper/copy.hpp>
+#include <boost/assign/v2/put/pipe/option_traits.hpp>
 #include <boost/assign/v2/put/put.hpp>
-#include <boost/assign/v2/put/pipe/arg_list.hpp>
+#include <boost/mpl/apply.hpp>
+#include <boost/mpl/vector/vector0.hpp>
+#include <boost/mpl/size.hpp>
+#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
+#include <boost/assign/v2/detail/config/limit_csv_arity.hpp>
+#include <boost/mpl/aux_/na.hpp>
+#include <boost/preprocessor/arithmetic/inc.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#endif
+
 
 namespace boost{
+    struct use_default;
 namespace assign{
 namespace v2{
 //[syntax_put_pipe_csv_put
 namespace aux{
 
+    typedef ref::array_aux::size_type arg_list_size_type;
+
+    template<typename OptionList, arg_list_size_type N, typename U>
+    struct arg_list/*<-*/
+    {
+        typedef boost::use_default tag2_;
+        typedef option_traits<OptionList> option_traits;
+        typedef typename option_traits::cont_ option_list_cont_type;
+        typedef typename v2::ref::nth_result_of::csv_array<
+            N,
+            U
+        >::type arg_list_cont_type; //notice it's arg, not args
+
+        arg_list(){}
+        arg_list(option_list_cont_type const& a, arg_list_cont_type const& b)
+            : option_list_cont_( a ), arg_list_cont_( b ){}
+
+        option_list_cont_type const& option_list_cont()const 
+        {
+            return this->option_list_cont_;
+        }
+
+        arg_list_cont_type const& arg_list_cont() const
+        {
+            return this->arg_list_cont_;
+        }
+
+        protected:
+        option_list_cont_type option_list_cont_;
+        arg_list_cont_type arg_list_cont_;
+
+    }/*->*/;
+
+    template<typename OptionList/*<-*/ = ::boost::mpl::vector0<> /*->*/>
+    class arg_list_generator/*<-*/
+    {
+
+        typedef ::boost::mpl::na na_;
+        typedef option_traits<OptionList> option_traits_;
+
+        public:
+
+        typedef typename option_traits_::size option_list_size;
+        typedef typename option_traits_::cont_ option_list_cont_type;
+
+        arg_list_generator(){}
+        explicit arg_list_generator(option_list_cont_type const& p)
+            : option_list_cont_( p ){}
+
+        template<typename P>
+        struct option_result
+        {
+            typedef typename option_traits_:: template next_option_list<
+                P
+            >::type option_list_;
+            typedef arg_list_generator<option_list_> type;
+        };
+
+        template<typename O>
+        typename option_result<O>::type
+        operator%(O const& option)const
+        {
+            typedef typename option_result<O>::type result_;
+            return result_( this->option_list_cont()( option ) );
+        }
+
+        template<std::size_t N, typename U = na_> // size?
+        struct result{
+            typedef aux::arg_list<OptionList, N, U> type;
+        };
+ 
+#if BOOST_ASSIGN_V2_ENABLE_CPP0X
+
+    protected:
+    template<typename T, typename...Args>
+    typename result<sizeof...(Args) + 1, T>::type
+    impl(T& t, Args&...args)const
+    {
+        typedef typename result<sizeof...(Args)+1, T>::type result_;
+        namespace ns = ref::assign_copy;
+        return result_(
+            this->option_list_cont(),
+            ref::csv_array( t, args... )
+        );
+    }
+
+    public:
+
+    template<typename T, typename...Args>
+    typename boost::lazy_disable_if<
+        v2::type_traits::or_const<T, Args...>,
+        result<sizeof...(Args)+1, T>
+    >::type
+    operator()(T& t, Args&...args)const
+    {
+        return this->impl(t, args...);
+    }
+
+    template<typename T, typename...Args>
+    typename result<sizeof...(Args)+1, T const>::type
+    operator()(T const& t, Args const&...args)const
+    {
+        return this->impl(t, args...);
+    }
+
+#else
+
+        typename result<0>::type
+        operator()()const
+        {
+            typedef typename result<0>::type result_;
+            return result_(
+                *this,
+                ref::csv_array<na_>( _nil )
+            );
+        }
+
+#define BOOST_ASSIGN_V2_MACRO1(N, U)\
+    return result_( \
+        this->option_list_cont(), \
+        ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) ) \
+    );\
+/**/
+#define BOOST_ASSIGN_V2_MACRO2(z, N, data)\
+    template<typename T>\
+    typename result<N, T>::type\
+    operator()( BOOST_PP_ENUM_PARAMS(N, T &_) )const \
+    { \
+        typedef typename result<N, T>::type result_;\
+        BOOST_ASSIGN_V2_MACRO1( N, T )\
+    } \
+    template<typename T>\
+    typename result<N, T const>::type\
+    operator()( BOOST_PP_ENUM_PARAMS(N, T const &_) )const \
+    { \
+        typedef typename result<N, T const>::type result_;\
+        BOOST_ASSIGN_V2_MACRO1( N, T const )\
+    } \
+/**/
+
+BOOST_PP_REPEAT_FROM_TO(
+    1,
+    BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
+    BOOST_ASSIGN_V2_MACRO2,
+    ~
+)
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO2
+
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
+
+        option_list_cont_type const& option_list_cont()const
+        {
+            return this->option_list_cont_;
+        }
+
+        protected:
+        option_list_cont_type option_list_cont_;
+
+    }/*->*/;
+
     template<typename C,
         typename ParList, arg_list_size_type N, typename U>
     C& operator|(C& cont, aux::arg_list<
@@ -44,6 +218,7 @@
 //<-
 namespace{
 //->
+
     aux::arg_list_generator<> const _csv_put/*<-*/
         = aux::arg_list_generator<>()/*->*/;
 
@@ -55,4 +230,5 @@
 }// assign
 }// boost
 
-#endif // BOOST_ASSIGN_V2_PUT_PIPE_CSV_PUT_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_PUT_PIPE_CSV_PUT_HPP_ER_2010
+