[Boost-commit] svn:boost r70386 - in sandbox/assign_v2/boost/assign/v2: detail/functor optional put/pipe

Subject: [Boost-commit] svn:boost r70386 - in sandbox/assign_v2/boost/assign/v2: detail/functor optional put/pipe
From: erwann.rogard_at_[hidden]
Date: 2011-03-22 12:39:50

Author: e_r
Date: 2011-03-22 12:39:48 EDT (Tue, 22 Mar 2011)
New Revision: 70386
URL: http://svn.boost.org/trac/boost/changeset/70386

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp |     1                                         
   sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp          |     4 --                                      
   sandbox/assign_v2/boost/assign/v2/put/pipe/arg_list.hpp          |    62 ++++++++++++++++++++--------------------
   sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp           |     2                                         
   sandbox/assign_v2/boost/assign/v2/put/pipe/modulo_traits.hpp     |    50 -------------------------------         
   5 files changed, 34 insertions(+), 85 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/detail/functor/constructor.hpp	2011-03-22 12:39:48 EDT (Tue, 22 Mar 2011)
@@ -11,6 +11,7 @@
 #define BOOST_ASSIGN_V2_DETAIL_FUNCTOR_CONSTRUCTOR_ER_2010_HPP
 #include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
 #include <boost/assign/v2/detail/keyword/nil.hpp>
+#include <boost/assign/v2/detail/pp/ignore.hpp>
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
 #include <utility>
 #else

Modified: sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp	2011-03-22 12:39:48 EDT (Tue, 22 Mar 2011)
@@ -162,10 +162,6 @@
 /**/
 #endif
 
-// The default
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(standard_modifier)    
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(standard_modifier, Arg)
-
 }// v2
 }// assign
 }// boost

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 12:39:48 EDT (Tue, 22 Mar 2011)
@@ -12,7 +12,7 @@
 #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/modulo_traits.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>
@@ -32,24 +32,24 @@
 
     typedef ref::array_aux::size_type arg_list_size_type;
 
-    template<typename Pars, arg_list_size_type N, typename U>
+    template<typename OptionList, arg_list_size_type N, typename U>
     struct arg_list/*<-*/
     {
         typedef boost::use_default tag2_;
-        typedef modulo_traits<Pars> modulo_traits_;
-        typedef typename modulo_traits_::cont_ par_list_cont_type;
+        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(par_list_cont_type const& a, arg_list_cont_type const& b)
-            : par_list_cont_( a ), arg_list_cont_( b ){}
+        arg_list(option_list_cont_type const& a, arg_list_cont_type const& b)
+            : option_list_cont_( a ), arg_list_cont_( b ){}
 
-        par_list_cont_type const& par_list_cont()const 
+        option_list_cont_type const& option_list_cont()const 
         {
-            return this->par_list_cont_;
+            return this->option_list_cont_;
         }
 
         arg_list_cont_type const& arg_list_cont() const
@@ -58,60 +58,60 @@
         }
 
         protected:
-        par_list_cont_type par_list_cont_;
+        option_list_cont_type option_list_cont_;
         arg_list_cont_type arg_list_cont_;
 
     }/*->*/;
 
-    template<typename ParList/*<-*/ = ::boost::mpl::vector0<> /*->*/>
+    template<typename OptionList/*<-*/ = ::boost::mpl::vector0<> /*->*/>
     class arg_list_generator/*<-*/
     {
 
         typedef ::boost::mpl::na na_;
-        typedef modulo_traits<ParList> modulo_traits_;
+        typedef option_traits<OptionList> option_traits_;
 
         public:
 
-        typedef typename modulo_traits_::size par_list_size;
-        typedef typename modulo_traits_::cont_ par_list_cont_type;
+        typedef typename option_traits_::size option_list_size;
+        typedef typename option_traits_::cont_ option_list_cont_type;
 
         arg_list_generator(){}
-        explicit arg_list_generator(par_list_cont_type const& p)
-            : par_list_cont_( p ){}
+        explicit arg_list_generator(option_list_cont_type const& p)
+            : option_list_cont_( p ){}
 
         template<typename P>
-        struct modulo_result
+        struct option_result
         {
-            typedef typename modulo_traits_:: template next_par_list<
+            typedef typename option_traits_:: template next_option_list<
                 P
-            >::type par_list_;
-            typedef arg_list_generator<par_list_> type;
+            >::type option_list_;
+            typedef arg_list_generator<option_list_> type;
         };
 
-        template<typename P>
-        typename modulo_result<P>::type
-        operator%(P const& p)const
+        template<typename O>
+        typename option_result<O>::type
+        operator%(O const& option)const
         {
-            typedef typename modulo_result<P>::type result_;
-            return result_( this->par_list_cont()( p ) );
+            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<ParList, N, U> type;
+            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
+    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->par_list_cont(),
+            this->option_list_cont(),
             ref::csv_array( t, args... )
         );
     }
@@ -149,7 +149,7 @@
 
 #define BOOST_ASSIGN_V2_MACRO1(N, U)\
     return result_( \
-        this->par_list_cont(), \
+        this->option_list_cont(), \
         ref::csv_array<U>( BOOST_PP_ENUM_PARAMS(N, _) ) \
     );\
 /**/
@@ -181,13 +181,13 @@
 
 #endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
 
-        par_list_cont_type const& par_list_cont()const
+        option_list_cont_type const& option_list_cont()const
         {
-            return this->par_list_cont_;
+            return this->option_list_cont_;
         }
 
         protected:
-        par_list_cont_type par_list_cont_;
+        option_list_cont_type option_list_cont_;
 
     }/*->*/;
 

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 12:39:48 EDT (Tue, 22 Mar 2011)
@@ -32,7 +32,7 @@
         v2::ref::as_arg_list(
             v2::ref::as_modulo_list<ParList>( 
                 put( cont ), 
-                arg_list.par_list_cont() 
+                arg_list.option_list_cont() 
             ),
             arg_list.arg_list_cont()
         );

Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/modulo_traits.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/modulo_traits.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/modulo_traits.hpp	2011-03-22 12:39:48 EDT (Tue, 22 Mar 2011)
@@ -1,49 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-//  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_MODULO_TRAITS_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_PIPE_MODULO_TRAITS_ER_2010_HPP
-#include <boost/assign/v2/ref/aux_/list/as_modulo_list.hpp>
-#include <boost/assign/v2/ref/aux_/list/list.hpp>
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/push_back.hpp>
-#include <boost/mpl/size.hpp>
-#include <boost/mpl/vector/vector0.hpp>
-
-namespace boost{
-    struct use_default;
-namespace assign{
-namespace v2{
-namespace aux{
-
-    typedef ::boost::mpl::vector0<> empty_par_list_; 
-
-    typedef ref::list_aux::size_type modulo_size_type;
-
-    template<typename ParList>
-    struct modulo_traits
-    {
-        typedef ref::nth_result_of::list<use_default> meta_;
-        typedef typename ::boost::mpl::apply1<meta_, ParList>::type cont_;
-        typedef typename ::boost::mpl::size<ParList>::type size;
-
-        template<typename P>
-        struct next_par_list : ::boost::mpl::push_back<
-            ParList, 
-            P const&
-        >{};
-
-    };
-
-}// aux
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_PUT_PIPE_MODULO_TRAITS_ER_2010_HPP
+// TODO remove file
\ No newline at end of file