[Boost-commit] svn:boost r70371 - in sandbox/assign_v2/boost/assign/v2: deque include/optional interpreter optional put

Subject: [Boost-commit] svn:boost r70371 - in sandbox/assign_v2/boost/assign/v2: deque include/optional interpreter optional put
From: erwann.rogard_at_[hidden]
Date: 2011-03-21 18:00:38

Author: e_r
Date: 2011-03-21 18:00:37 EDT (Mon, 21 Mar 2011)
New Revision: 70371
URL: http://svn.boost.org/trac/boost/changeset/70371

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/deque/deque.hpp          |     4 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/optional/fun.hpp |     8 +++---                                  
   sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp     |    10 ++++----                                
   sandbox/assign_v2/boost/assign/v2/optional/data.hpp        |    50 ++++++++++++++++++++--------------------
   sandbox/assign_v2/boost/assign/v2/put/put.hpp              |     4 +-                                      
   5 files changed, 38 insertions(+), 38 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/deque/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/deque.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/deque/deque.hpp	2011-03-21 18:00:37 EDT (Mon, 21 Mar 2011)
@@ -11,7 +11,7 @@
 #define BOOST_ASSIGN_V2_DEQUE_DEQUE_ER_2010_HPP
 #include <deque>
 #include <boost/assign/v2/interpreter/crtp.hpp>
-#include <boost/assign/v2/interpreter/fun.hpp>
+#include <boost/assign/v2/interpreter/data.hpp>
 #include <boost/assign/v2/interpreter/modifier.hpp>
 #include <boost/assign/v2/interpreter/replace_parameter.hpp>
 #include <boost/assign/v2/deque/fwd.hpp>
@@ -153,7 +153,7 @@
     {
         typedef typename boost::remove_cv<T>::type t_;
         typedef typename deque_impl<t_>::type impl_;
-        typedef typename deduce_fun<impl_>::type f_;
+        typedef typename deduce_data_generator<impl_>::type f_;
         typedef typename deduce_modifier_tag<impl_>::type modifier_tag_;
         typedef deque_adapter<t_,f_,modifier_tag_> type;
     };

Modified: sandbox/assign_v2/boost/assign/v2/include/optional/fun.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/optional/fun.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/optional/fun.hpp	2011-03-21 18:00:37 EDT (Mon, 21 Mar 2011)
@@ -7,8 +7,8 @@
 //  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_INCLUDE_OPTIONAL_FUN_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_FUN_ER_2010_HPP
-#include <boost/assign/v2/optional/fun.hpp>
+#ifndef BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_DATA_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_DATA_ER_2010_HPP
+#include <boost/assign/v2/optional/data.hpp>
 
-#endif // BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_FUN_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_DATA_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp	2011-03-21 18:00:37 EDT (Mon, 21 Mar 2011)
@@ -28,7 +28,7 @@
     struct container_value{ typedef typename C::value_type type; };
 
     template<typename /*<<Pointer-container>>*/PtrC>
-    struct /*<<Meta-function mapping the `PtrC`'s pointer-type to a factory thereof>>*/ deduce_fun_pointer/*<-*/
+    struct /*<<Meta-function mapping the `PtrC`'s pointer-type to a factory thereof>>*/ deduce_data_generator_pointer/*<-*/
     {
         typedef typename v2::ptr_container_aux::to_value_container<
             PtrC
@@ -37,18 +37,18 @@
     }/*->*/;
 
     template<typename /*<<Value-container>>*/C>
-    struct /*<<Meta-function mapping `C`'s value-type to a factory thereof>>*/ deduce_fun_value/*<-*/
+    struct /*<<Meta-function mapping `C`'s value-type to a factory thereof>>*/ deduce_data_generator_value/*<-*/
     {
 //        typedef typename v2::container_traits::value<C>::type value_type;
         typedef functor_aux::constructor<typename C::value_type> type;
     }/*->*/;
 
     template<typename /*<<Either of a value or pointer-container>>*/C>
-    struct /*<<Meta-function mapping `C`s element-type to a factory thereof>>*/deduce_fun/*<-*/
+    struct /*<<Meta-function mapping `C`s element-type to a factory thereof>>*/deduce_data_generator/*<-*/
         :  boost::mpl::eval_if<
             ptr_container_aux::is_ptr_container<C>,
-            deduce_fun_pointer<C>,
-            deduce_fun_value<C>
+            deduce_data_generator_pointer<C>,
+            deduce_data_generator_value<C>
         >
     {}/*->*/;
 

Modified: sandbox/assign_v2/boost/assign/v2/optional/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/data.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/optional/data.hpp	2011-03-21 18:00:37 EDT (Mon, 21 Mar 2011)
@@ -7,8 +7,8 @@
 //  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_OPTIONAL_FUN_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_FUN_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_OPTIONAL_DATA_ER_2010_HPP
+#define BOOST_ASSIGN_V2_OPTIONAL_DATA_ER_2010_HPP
 #include <boost/assign/v2/detail/pp/ignore.hpp>
 #include <boost/assign/v2/detail/keyword/ignore.hpp>
 #include <boost/assign/v2/interpreter/fwd.hpp>
@@ -22,7 +22,7 @@
 namespace result_of{
 
     template<typename D>
-    struct optional_fun{
+    struct data_generator{
 
         typedef aux::replace_fun<D> meta_;
 
@@ -34,10 +34,10 @@
 }// result_of
 
     template<typename F = keyword_aux::ignore>
-    struct optional_fun
+    struct data_generator
     {
-        optional_fun(){}
-        optional_fun(F f) : f_( f ){}
+        data_generator(){}
+        data_generator(F f) : f_( f ){}
 
         F const& fun()const{ return this->f_; }
 
@@ -46,36 +46,36 @@
     };
 
     template<typename C, typename F, typename Tag, typename D, typename F1>
-    typename ::boost::mpl::apply1<result_of::optional_fun<D>, F1>::type
+    typename ::boost::mpl::apply1<result_of::data_generator<D>, F1>::type
     operator%(
         interpreter_crtp<C, F, Tag, D> const& lhs,
-        optional_fun<F1> const& rhs
+        data_generator<F1> const& rhs
     )
     {
-        typedef result_of::optional_fun<D> meta_;
+        typedef result_of::data_generator<D> meta_;
         typedef typename ::boost::mpl::apply1<meta_, F1>::type result_;
         return result_( lhs.container(), rhs.fun(), lhs.modifier );
     }
 
-    struct keyword_fun{
+    struct keyword_data_generator{
 
         template<typename F>
-        optional_fun<F> operator=(F const& f)const{
-            return optional_fun<F>( f );
+        data_generator<F> operator=(F const& f)const{
+            return data_generator<F>( f );
         }
 
     };
 
 }// aux
 namespace{
-    const aux::keyword_fun _fun = aux::keyword_fun();
+    const aux::keyword_data_generator _data = aux::keyword_data_generator();
 }
 //[syntax_put_fun_modulo
 namespace result_of{
 
     template<typename D>
-    struct optional_fun/*<-*/
-        : aux::result_of::optional_fun<D>
+    struct data_generator/*<-*/
+        : aux::result_of::data_generator<D>
     {}/*->*/;
 
 }// result_of
@@ -88,16 +88,16 @@
 
 #include <boost/preprocessor/cat.hpp>
 
-#define BOOST_ASSIGN_V2_OPTIONAL_FUN_GENERATE(NAME, FUN)\
+#define BOOST_ASSIGN_V2_OPTIONAL_DATA_GENERATE(NAME, FUN)\
 namespace boost{\
 namespace assign{\
 namespace v2{\
 namespace aux{\
 \
     template<typename T>\
-    optional_fun< FUN > NAME()\
+    data_generator< FUN > NAME()\
     {\
-        return ( v2::_fun = FUN() );\
+        return ( v2::_data = FUN() );\
     }\
 \
 }\
@@ -108,27 +108,27 @@
 /**/
 
 #include <boost/assign/v2/detail/functor/constructor.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_FUN_GENERATE(constructor, v2::functor_aux::constructor<T>)
+BOOST_ASSIGN_V2_OPTIONAL_DATA_GENERATE(constructor, v2::functor_aux::constructor<T>)
 
 #include <boost/assign/v2/detail/functor/new.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_FUN_GENERATE(new_ptr, v2::functor_aux::new_<T>)
+BOOST_ASSIGN_V2_OPTIONAL_DATA_GENERATE(new_ptr, v2::functor_aux::new_<T>)
 
 #include <boost/typeof/typeof.hpp>
 #include <boost/type_traits/add_const.hpp>
-#define BOOST_ASSIGN_V2_OPTIONAL_FUN_KEYWORD(NAME, EXPR)\
+#define BOOST_ASSIGN_V2_OPTIONAL_DATA_KEYWORD(NAME, EXPR)\
 namespace boost{\
 namespace assign{\
 namespace v2{\
-    typedef BOOST_TYPEOF( ( _fun = EXPR ) ) BOOST_PP_CAT(type_of,NAME);\
+    typedef BOOST_TYPEOF( ( _data = EXPR ) ) BOOST_PP_CAT(type_of,NAME);\
 namespace{\
 \
-    boost::add_const<BOOST_PP_CAT(type_of,NAME)>::type BOOST_PP_CAT(_,NAME) = ( _fun = EXPR );\
+    boost::add_const<BOOST_PP_CAT(type_of,NAME)>::type BOOST_PP_CAT(_,NAME) = ( _data = EXPR );\
 }\
 }\
 }\
 }\
 
 #include <boost/lambda/lambda.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_FUN_KEYWORD(identity, ::boost::lambda::_1)
+BOOST_ASSIGN_V2_OPTIONAL_DATA_KEYWORD(identity, ::boost::lambda::_1)
 
-#endif // BOOST_ASSIGN_V2_OPTIONAL_FUN_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_OPTIONAL_DATA_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/put.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/put/put.hpp	2011-03-21 18:00:37 EDT (Mon, 21 Mar 2011)
@@ -10,7 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_PUT_PUT_ER_2010_HPP
 #define BOOST_ASSIGN_V2_PUT_PUT_ER_2010_HPP
 #include <boost/assign/v2/interpreter/crtp.hpp>
-#include <boost/assign/v2/interpreter/fun.hpp>
+#include <boost/assign/v2/interpreter/data.hpp>
 #include <boost/assign/v2/interpreter/modifier.hpp>
 #include <boost/assign/v2/interpreter/replace_parameter.hpp>
 #include <boost/assign/v2/detail/pp/ignore.hpp>
@@ -78,7 +78,7 @@
 
     template<typename C>
     struct /*<<Meta-function>>*/put{/*<-*/
-        typedef typename aux::deduce_fun<C>::type f_;
+        typedef typename aux::deduce_data_generator<C>::type f_;
         typedef typename aux::deduce_modifier_tag<C>::type modifier_tag_;
         typedef aux::container_adapter<C, f_, modifier_tag_> type;
     }/*->*/;