[Boost-commit] svn:boost r70379 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque boost/assign/v2/include boost/assign/v2/include/optional boost/assign/v2/interpreter boost/assign/v2/optional boost/assign/v2/put boost/assign/v2/ref/array boost/assign/v2/ref/wrapper libs/assign/v2/test libs/assign/v2/test/optional libs/assign/v2/test/put/pipe libs/assign/v2/test/put/pipe/optional

Subject: [Boost-commit] svn:boost r70379 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque boost/assign/v2/include boost/assign/v2/include/optional boost/assign/v2/interpreter boost/assign/v2/optional boost/assign/v2/put boost/assign/v2/ref/array boost/assign/v2/ref/wrapper libs/assign/v2/test libs/assign/v2/test/optional libs/assign/v2/test/put/pipe libs/assign/v2/test/put/pipe/optional
From: erwann.rogard_at_[hidden]
Date: 2011-03-21 18:35:12

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

Log:
assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/deque/deque.hpp                   |     8 ++++----                                
   sandbox/assign_v2/boost/assign/v2/include/optional.hpp              |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/include/optional/lookup.hpp       |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp       |    21 ++++++++++-----------                   
   sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp              |    16 ++++++++--------                        
   sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp              |    15 +++++++--------                         
   sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp          |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp |     8 ++++----                                
   sandbox/assign_v2/boost/assign/v2/optional.hpp                      |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/optional/data.hpp                 |    26 ++++++++++++++------------              
   sandbox/assign_v2/boost/assign/v2/optional/lookup.hpp               |    10 +++++-----                              
   sandbox/assign_v2/boost/assign/v2/optional/modifier.hpp             |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/put/put.hpp                       |     6 +++---                                  
   sandbox/assign_v2/boost/assign/v2/ref/array/array.hpp               |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp           |     2 +-                                      
   sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp         |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/optional.cpp                  |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp           |    28 ++++++++++++++--------------            
   sandbox/assign_v2/libs/assign/v2/test/optional/lookup.h             |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.cpp         |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp  |    14 +++++++-------                          
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.h    |     4 ++--                                    
   22 files changed, 92 insertions(+), 92 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:35:09 EDT (Mon, 21 Mar 2011)
@@ -35,7 +35,7 @@
 namespace aux{
 
     template<typename T>
-    struct /*<<Meta-function>>*/deque_impl{ typedef /*<-*/std::deque<T> BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified /*<-*/)/*->*/type; };
+    struct /*<<Metafunction>>*/deque_impl{ typedef /*<-*/std::deque<T> BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified /*<-*/)/*->*/type; };
 
     template<typename T, typename F, typename Tag>
     class deque_adapter 
@@ -132,14 +132,14 @@
     };
 
     template<typename T, typename F, typename Tag>
-    struct /*<<Meta-function class>>*/replace_fun< deque_adapter<T, F, Tag> >/*<-*/
+    struct /*<<Metafunction class>>*/replace_fun< deque_adapter<T, F, Tag> >/*<-*/
     {
         template<typename F1>
         struct apply{ typedef deque_adapter<T, F1, Tag> type; };
     }/*->*/;
 
     template<typename T, typename F, typename Tag>
-    struct /*<<Meta-function class>>*/replace_modifier_tag< deque_adapter<T, F, Tag> >/*<-*/
+    struct /*<<Metafunction class>>*/replace_modifier_tag< deque_adapter<T, F, Tag> >/*<-*/
     {
         template<typename Tag1>
         struct apply{ typedef deque_adapter<T, F, Tag1> type; };
@@ -178,7 +178,7 @@
 namespace result_of{
 
     template<typename T>
-    struct /*<<Meta-function>>*/deque/*<-*/ 
+    struct /*<<Metafunction>>*/deque/*<-*/ 
         : aux::result_of::deque<T>
     {}/*->*/;
 

Modified: sandbox/assign_v2/boost/assign/v2/include/optional.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/optional.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/optional.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -12,7 +12,7 @@
 #include <boost/assign/v2/include/optional/data.hpp>
 #include <boost/assign/v2/include/optional/insert.hpp>
 #include <boost/assign/v2/include/optional/iterate.hpp>
-#include <boost/assign/v2/include/optional/lookup.hpp>
+#include <boost/assign/v2/include/optional/mapped.hpp>
 #include <boost/assign/v2/include/optional/push.hpp>
 #include <boost/assign/v2/include/optional/push_back.hpp>
 #include <boost/assign/v2/include/optional/push_front.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/include/optional/lookup.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/optional/lookup.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/include/optional/lookup.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -9,6 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #ifndef BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_LOOKUP_ER_2010_HPP
 #define BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_LOOKUP_ER_2010_HPP
-#include <boost/assign/v2/optional/lookup.hpp>
+#include <boost/assign/v2/optional/mapped.hpp>
 
 #endif // BOOST_ASSIGN_V2_INCLUDE_OPTIONAL_LOOKUP_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -16,10 +16,11 @@
 namespace boost{
 namespace assign{
 namespace v2{
+//[syntax_interpreter_as_arg_list
 namespace aux{    
 
-    template<typename R>
-    class as_arg_list_adapter
+    template<typename /*<<Range>>*/R>
+    class as_arg_list_adapter/*<-*/
     {
 
         typedef typename boost::range_iterator<R>::type ri_;
@@ -40,16 +41,15 @@
         as_arg_list_adapter();
         ir_ ir;
 
-    };
+    }/*->*/;
 
-//[syntax_interpreter_as_arg_list
 namespace result_of{
 
     template<typename R>
-    struct as_arg_list
+    struct /*<<Metafunction>>*/as_arg_list/*<-*/
     {
-        typedef/*<-*/ BOOST_ASSIGN_V2_IGNORE(/*->*/ unspecified /*<-*/) as_arg_list_adapter<R> /*->*/type;
-    };
+        typedef as_arg_list_adapter<R> type;
+    }/*->*/;
 
 }// result_of
 
@@ -57,7 +57,6 @@
     typename result_of::as_arg_list<R>::type
     as_arg_list(R& range)/*<-*/
     {
-
         return typename result_of::as_arg_list<R>::type( range );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
@@ -68,17 +67,17 @@
         return typename result_of::as_arg_list<R const>::type( range );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
-//]
 }// aux
     using aux::as_arg_list;
 namespace result_of{
 
     template<typename R>
-    struct as_arg_list
+    struct as_arg_list/*<-*/
         : aux::result_of::as_arg_list<R>
-    {};
+    {}/*->*/;
 
 }// result_of
+//]
 }// v2
 }// assign
 }// boost

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -39,12 +39,12 @@
 namespace aux{
 
     template<typename F>
-    struct fun_holder{
+    struct data_gen_holder{
 
         typedef F fun_type;
 
-        fun_holder(){}
-        fun_holder(fun_type const& f) : fun( f ){}
+        data_gen_holder(){}
+        data_gen_holder(fun_type const& f) : fun( f ){}
 
         fun_type fun;
 
@@ -133,10 +133,10 @@
 
     };
 
-    template<typename /*<<Container>>*/C, typename /*<<Functor>>*/F, typename /*<<Modifier tag>>*/Tag, typename /*<<Derived type>>*/D>
+    template<typename /*<<Container>>*/C, typename /*<<Data generator>>*/F, typename /*<<Modifier tag>>*/Tag, typename /*<<Derived type>>*/D>
     class interpreter_crtp
 //<-
-        : public fun_holder<F>
+        : public data_gen_holder<F>
         , public modifier_holder<Tag>
 #if !BOOST_ASSIGN_V2_ENABLE_CPP0X
         , public functor_aux::crtp_unary_and_up<
@@ -153,7 +153,7 @@
 
         protected:
 
-        typedef fun_holder<F> fun_holder_;
+        typedef data_gen_holder<F> data_gen_holder_;
         typedef modifier_holder<Tag> modifier_holder_;
 //->
 
@@ -163,9 +163,9 @@
         modifier_type;
 
         interpreter_crtp(){}
-        explicit interpreter_crtp( F const& f )/*<-*/ : fun_holder_( f ){}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
+        explicit interpreter_crtp( F const& f )/*<-*/ : data_gen_holder_( f ){}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
         explicit interpreter_crtp( F const& f, modifier_type const& m )/*<-*/
-            : fun_holder_( f ), modifier_holder_( m ){}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
+            : data_gen_holder_( f ), modifier_holder_( m ){}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
 
         typedef D const& result_type;
 

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:35:09 EDT (Mon, 21 Mar 2011)
@@ -21,14 +21,14 @@
 namespace boost{
 namespace assign{
 namespace v2{
-//[syntax_interpreter_fun
+//[syntax_interpreter_data
 namespace aux{
 
     template<typename C>
     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_data_generator_pointer/*<-*/
+    struct /*<<Metafunction>>*/ deduce_ptr_generator/*<-*/
     {
         typedef typename v2::ptr_container_aux::to_value_container<
             PtrC
@@ -37,18 +37,17 @@
     }/*->*/;
 
     template<typename /*<<Value-container>>*/C>
-    struct /*<<Meta-function mapping `C`'s value-type to a factory thereof>>*/ deduce_data_generator_value/*<-*/
+    struct /*<<Metafunction>>*/ deduce_value_generator/*<-*/
     {
-//        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_data_generator/*<-*/
+    template<typename /*<<Value or pointer-container>>*/C>
+    struct /*<<Metafunction>>*/deduce_data_generator/*<-*/
         :  boost::mpl::eval_if<
             ptr_container_aux::is_ptr_container<C>,
-            deduce_data_generator_pointer<C>,
-            deduce_data_generator_value<C>
+            deduce_ptr_generator<C>,
+            deduce_value_generator<C>
         >
     {}/*->*/;
 

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -34,7 +34,7 @@
     struct /*<<Specialize on Tag>>*/ adapter_modifier{};
 
     template<typename C>
-    struct /*<<Meta-function returning a modifier-tag>>*/deduce_modifier_tag;
+    struct /*<<Metafunction returning a modifier-tag>>*/deduce_modifier_tag;
 
 }// aux
 namespace put_concept{

Modified: sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -18,14 +18,14 @@
 //[syntax_put_adapter_replace_parameter
 namespace aux{
                 
-    template<typename /*<<Inherits crtp\<\> >>*/D> 
-    struct /*<<Meta-function class to be specialized on D>>*/replace_fun{
+    template<typename /*<<Inherits interpreter_crtp\<\> >>*/D> 
+    struct /*<<Metafunction class to be specialized on D>>*/replace_fun{
         template<typename F> 
         struct /*<<Transforms D by replacing D::fun_type with F>>*/apply{};
     };
 
-    template<typename /*<<Inherits crtp\<\> >>*/ D> 
-    struct /*<<Meta-function class to be specialized on D>>*/ replace_modifier_tag{
+    template<typename /*<<Inherits interpreter_crtp\<\> >>*/ D> 
+    struct /*<<Metafunction class to be specialized on D>>*/ replace_modifier_tag{
         template<typename Tag> 
         struct /*<<Transforms D by replacing Tag D::modifier_tag with Tag>>*/ apply{};
     };

Modified: sandbox/assign_v2/boost/assign/v2/optional.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/optional.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -10,7 +10,7 @@
 #ifndef BOOST_ASSIGN_V2_OPTIONAL_ER_2010_HPP
 #define BOOST_ASSIGN_V2_OPTIONAL_ER_2010_HPP
 #include <boost/assign/v2/optional/iterate.hpp>
-#include <boost/assign/v2/optional/lookup.hpp>
+#include <boost/assign/v2/optional/mapped.hpp>
 #include <boost/assign/v2/optional/modifier.hpp>
 #include <boost/assign/v2/optional/repeat.hpp>
 #include <boost/assign/v2/optional/standard.hpp>

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:35:09 EDT (Mon, 21 Mar 2011)
@@ -9,8 +9,8 @@
 //////////////////////////////////////////////////////////////////////////////
 #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/detail/pp/ignore.hpp>
 #include <boost/assign/v2/interpreter/fwd.hpp>
 #include <boost/assign/v2/interpreter/replace_parameter.hpp>
 #include <boost/mpl/apply.hpp>
@@ -18,11 +18,12 @@
 namespace boost{
 namespace assign{
 namespace v2{
+//[syntax_optional_data
 namespace aux{
 namespace result_of{
 
     template<typename D>
-    struct data_generator{
+    struct /*<<Metafunction class>>*/data_generator/*<-*/{
 
         typedef aux::replace_fun<D> meta_;
 
@@ -33,8 +34,8 @@
 
 }// result_of
 
-    template<typename F = keyword_aux::ignore>
-    struct data_generator
+    template<typename F/*<-*/= keyword_aux::ignore/*->*/>
+    struct data_generator/*<-*/
     {
         data_generator(){}
         data_generator(F f) : f_( f ){}
@@ -43,38 +44,39 @@
 
         private:
         F f_;
-    };
+    }/*->*/;
 
     template<typename C, typename F, typename Tag, typename D, typename F1>
     typename ::boost::mpl::apply1<result_of::data_generator<D>, F1>::type
     operator%(
         interpreter_crtp<C, F, Tag, D> const& lhs,
         data_generator<F1> const& rhs
-    )
+    )/*<-*/
     {
         typedef result_of::data_generator<D> meta_;
         typedef typename ::boost::mpl::apply1<meta_, F1>::type result_;
         return result_( lhs.container(), rhs.fun(), lhs.modifier );
-    }
+    }/*<-*/BOOST_ASSIGN_V2_IGNORE(/*<-*/;/*->*/)/*->*/
 
-    struct keyword_data_generator{
+    struct keyword_data_generator
+    /*<-*/{
 
         template<typename F>
         data_generator<F> operator=(F const& f)const{
             return data_generator<F>( f );
         }
 
-    };
+    }/*->*/;
 
 }// aux
 namespace{
-    const aux::keyword_data_generator _data = aux::keyword_data_generator();
+    const aux::keyword_data_generator _data/*<-*/ 
+    	= aux::keyword_data_generator()/*->*/;
 }
-//[syntax_put_fun_modulo
 namespace result_of{
 
     template<typename D>
-    struct data_generator/*<-*/
+    struct /*<<Metafunction class>>*/data_generator/*<-*/
         : aux::result_of::data_generator<D>
     {}/*->*/;
 

Modified: sandbox/assign_v2/boost/assign/v2/optional/lookup.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/lookup.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/optional/lookup.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -21,13 +21,13 @@
 namespace v2{
 namespace modifier_tag{ 
 
-    template<typename Arg> struct lookup; 
+    template<typename Arg> struct mapped; 
 
 }// modifier_tag
 namespace aux{
                 
     template<typename Arg>
-    class adapter_modifier<modifier_tag::lookup<Arg> >
+    class adapter_modifier<modifier_tag::mapped<Arg> >
     {
 
         typedef Arg arg_;
@@ -70,9 +70,9 @@
 }// boost
 
 #include <boost/assign/v2/optional/modifier.hpp>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(lookup)
-#define BOOST_ASSIGN_V2_TAG modifier_tag::lookup<Arg>
-BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(lookup, BOOST_ASSIGN_V2_TAG)
+BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_KEYWORD(mapped)
+#define BOOST_ASSIGN_V2_TAG modifier_tag::mapped<Arg>
+BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_META_MODIFIER_TAG(mapped, BOOST_ASSIGN_V2_TAG)
 #undef BOOST_ASSIGN_V2_TAG
 
 #endif // BOOST_ASSIGN_V2_OPTIONAL_LOOKUP_ER_2010_HPP

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-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -50,7 +50,7 @@
     };
 
     template<typename Keyword, typename Arg>
-    struct /*<<Meta-function class to be specialized on Keyword>>*/ meta_modifier_tag
+    struct /*<<Metafunction class to be specialized on Keyword>>*/ meta_modifier_tag
     {
         template<typename /*<<Inherits `interpreter_crtp<>` >>*/ D> 
         struct /*<<Returns a modifier-tag>>*/ apply;

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:35:09 EDT (Mon, 21 Mar 2011)
@@ -62,13 +62,13 @@
     };
 
     template<typename C, typename F, typename Tag>
-    struct /*<<Meta-function class>>*/replace_fun< aux::container_adapter<C, F, Tag> >{/*<-*/
+    struct /*<<Metafunction class>>*/replace_fun< aux::container_adapter<C, F, Tag> >{/*<-*/
         template<typename F1>
         struct apply{ typedef aux::container_adapter<C, F1, Tag> type; };
     /*->*/};
 
     template<typename C, typename F, typename Tag>
-    struct /*<<Meta-function class>>*/replace_modifier_tag< aux::container_adapter<C, F, Tag> >{/*<-*/
+    struct /*<<Metafunction class>>*/replace_modifier_tag< aux::container_adapter<C, F, Tag> >{/*<-*/
         template<typename Tag1>
         struct apply{ typedef aux::container_adapter<C, F, Tag1> type; };
     /*->*/};
@@ -77,7 +77,7 @@
 namespace result_of{
 
     template<typename C>
-    struct /*<<Meta-function>>*/put{/*<-*/
+    struct /*<<Metafunction>>*/put{/*<-*/
         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;

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/array.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -41,7 +41,7 @@
 namespace nth_result_of{
 
     template<array_size_type N, typename /*<<U& has to be a reference>>*/U>
-    struct /*<<Meta-function>>*/array/*<-*/
+    struct /*<<Metafunction>>*/array/*<-*/
         : array_aux::recursive_result<N, U>
     {}/*->*/;
 

Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -35,7 +35,7 @@
 namespace nth_result_of{
 
     template<array_size_type N, typename /*<<U& has to be a reference>>*/U>
-    struct /*<<Meta-function>>*/csv_array/*<-*/
+    struct /*<<Metafunction>>*/csv_array/*<-*/
     {
         typedef array_aux::instant_alloc<N, U> type;
     }/*->*/;

Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/range_get.hpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -34,7 +34,7 @@
 namespace result_of{
 
     template<typename /*<<Range of reference-wrappers>>*/R>
-    struct /*<<Meta-function>>*/range_get/*<-*/{
+    struct /*<<Metafunction>>*/range_get/*<-*/{
 
         typedef ref::get_functor f_;
         #ifdef BOOST_MSVC

Modified: sandbox/assign_v2/libs/assign/v2/test/optional.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional.cpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #include <libs/assign/v2/test/optional/data.h>
 #include <libs/assign/v2/test/optional/iterate.h>
-#include <libs/assign/v2/test/optional/lookup.h>
+#include <libs/assign/v2/test/optional/mapped.h>
 #include <libs/assign/v2/test/optional/repeat.h>
 #include <libs/assign/v2/test/optional/standard.h>
 #include <libs/assign/v2/test/optional.h>
@@ -20,7 +20,7 @@
     void test(){
         xxx_fun::test();
         xxx_iterate::test();
-        xxx_lookup::test();
+        xxx_mapped::test();
         xxx_repeat::test();
         xxx_standard::test();
     }

Modified: sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -15,18 +15,18 @@
 #include <boost/assign/v2/deque.hpp>
 // Options come next
 #include <boost/assign/v2/optional/data.hpp>
-#include <boost/assign/v2/optional/lookup.hpp> 
+#include <boost/assign/v2/optional/mapped.hpp> 
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/typeof/typeof.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <libs/assign/v2/test/optional/lookup.h>
+#include <libs/assign/v2/test/optional/mapped.h>
 
 namespace test_assign_v2{
 namespace xxx_optional{
-namespace xxx_lookup{
+namespace xxx_mapped{
 
     void test()
     {
@@ -34,28 +34,28 @@
         using namespace boost;
         namespace as2 = assign::v2;
         {
-            //[test_optional_lookup_meta
+            //[test_optional_mapped_meta
                 using namespace lambda;
             typedef BOOST_TYPEOF(_1) arg_;
-            typedef as2::aux::keyword_lookup keyword_;
+            typedef as2::aux::keyword_mapped keyword_;
             typedef as2::aux::optional_modifier<keyword_, arg_> modulo_;
             typedef std::map<std::string, int> cont_;
             typedef as2::result_of::put<cont_>::type put_;
             typedef as2::result_of::optional_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, arg_>::type result1_;
-            typedef as2::modifier_tag::lookup<arg_> tag1_;
+            typedef as2::modifier_tag::mapped<arg_> tag1_;
             typedef as2::aux::replace_modifier_tag<put_> meta2_;
             typedef ::boost::mpl::apply1<meta2_, tag1_>::type result2_;
             BOOST_MPL_ASSERT((boost::is_same<result1_, result2_>));
             //]
         }
         {
-            //[test_optional_lookup_map
+            //[test_optional_mapped_map
                 using namespace lambda;
             typedef std::string str_; typedef std::map<str_, int> C; C year; 
             ( 
                 as2::put( year )( "feb", 28 )( "apr", 30 )( "jun", 30 )( "sep", 30 )( "nov", 30 ) 
-                    % ( as2::_data = _1 ) %  ( as2::_lookup = ( _1 = 31 ) ) 
+                    % ( as2::_data = _1 ) %  ( as2::_mapped = ( _1 = 31 ) ) 
             )/*<<Calls `year["jan"] = 31` etc.>>*/( "jan" )( "mar" )( "may" )( "jul" )( "aug" )( "oct" )( "dec" );
             
             BOOST_ASSIGN_V2_CHECK( year["jan"] == 31 );
@@ -63,27 +63,27 @@
             //]        
         }
         {
-            //[test_optional_lookup_meta_deque
+            //[test_optional_mapped_meta_deque
                 using namespace lambda;
             typedef BOOST_TYPEOF(_1) arg_;
-            typedef as2::aux::keyword_lookup keyword_;
+            typedef as2::aux::keyword_mapped keyword_;
             typedef as2::aux::optional_modifier<keyword_, arg_> modulo_;
             typedef as2::result_of::deque<int>::type put_;
             typedef as2::result_of::optional_modifier<put_> meta1_;
             typedef ::boost::mpl::apply2<meta1_, keyword_, arg_>::type result1_;
-            typedef as2::modifier_tag::lookup<arg_> tag1_;
+            typedef as2::modifier_tag::mapped<arg_> tag1_;
             typedef as2::aux::replace_modifier_tag<put_> meta2_;
             typedef ::boost::mpl::apply1<meta2_, tag1_>::type result2_;
             BOOST_MPL_ASSERT((boost::is_same<result1_, result2_>));
             //]
         }
         {
-            //[test_optional_lookup_map_deque
+            //[test_optional_mapped_map_deque
                 using namespace lambda;
             BOOST_AUTO(
                 days_in_first_quater,
                 ( 
-                    as2::deque<int>( 31 )( 31 )( 31 ) % ( as2::_lookup = ( _1 -= 3 ) ) 
+                    as2::deque<int>( 31 )( 31 )( 31 ) % ( as2::_mapped = ( _1 -= 3 ) ) 
                 )( 1 ) 
             );
             BOOST_ASSIGN_V2_CHECK( days_in_first_quater[0] == 31 );
@@ -93,6 +93,6 @@
         }
     }
 
-}// xxx_lookup
+}// xxx_mapped
 }// xxx_optional
 }// test_assign_v2

Modified: sandbox/assign_v2/libs/assign/v2/test/optional/lookup.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/lookup.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/lookup.h	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -12,11 +12,11 @@
 
 namespace test_assign_v2{
 namespace xxx_optional{
-namespace xxx_lookup{
+namespace xxx_mapped{
 
     void test();
 
-}// xxx_lookup
+}// xxx_mapped
 }// xxx_optional
 }// xxx_test_assign
 

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional.cpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////////
 #include <libs/assign/v2/test/put/pipe/optional/data.h>
 #include <libs/assign/v2/test/put/pipe/optional/iterate.h>
-#include <libs/assign/v2/test/put/pipe/optional/lookup.h>
+#include <libs/assign/v2/test/put/pipe/optional/mapped.h>
 #include <libs/assign/v2/test/put/pipe/optional/repeat.h>
 #include <libs/assign/v2/test/put/pipe/optional/standard.h>
 #include <libs/assign/v2/test/put/pipe/optional.h>
@@ -23,7 +23,7 @@
     {
         xxx_fun::test();
         xxx_iterate::test();
-        xxx_lookup::test();
+        xxx_mapped::test();
         xxx_repeat::test();
         xxx_standard::test();
     }

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -15,21 +15,21 @@
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 // Options come next
 #include <boost/assign/v2/optional/data.hpp>
-#include <boost/assign/v2/optional/lookup.hpp>
-#include <libs/assign/v2/test/put/pipe/optional/lookup.h>
+#include <boost/assign/v2/optional/mapped.hpp>
+#include <libs/assign/v2/test/put/pipe/optional/mapped.h>
 
 namespace test_assign_v2{
 namespace xxx_put{
 namespace xxx_pipe{
 namespace xxx_optional{
-namespace xxx_lookup{
+namespace xxx_mapped{
 
     void test()
     {
         using namespace boost;
         namespace as2 = assign::v2;
         {
-            //[test_put_pipe_modifier_lookup
+            //[test_put_pipe_modifier_mapped
                 using namespace lambda;
             typedef std::map<std::string, int> C; C cal;
             BOOST_AUTO( _local, ( as2::_data = _1 ) );
@@ -37,8 +37,8 @@
                 (
                     cal 
                         | as2::_csv_put( C::value_type( "feb", 28 ) ) 
-                        | ( as2::_csv_put % _local % ( as2::_lookup = (_1 = 30) ) )( "apr", "jun", "sep", "nov" )
-                        | ( as2::_csv_put % _local % ( as2::_lookup = (_1 = 31) ) )( "jan", "mar", "may", "jul", "aug", "oct", "dec" )
+                        | ( as2::_csv_put % _local % ( as2::_mapped = (_1 = 30) ) )( "apr", "jun", "sep", "nov" )
+                        | ( as2::_csv_put % _local % ( as2::_mapped = (_1 = 31) ) )( "jan", "mar", "may", "jul", "aug", "oct", "dec" )
  
                 )["feb"] == 28
             );
@@ -48,7 +48,7 @@
         }    
     }
 
-}// xxx_lookup
+}// xxx_mapped
 }// xxx_optional
 }// xxx_pipe
 }// xxx_put

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.h	2011-03-21 18:35:09 EDT (Mon, 21 Mar 2011)
@@ -14,11 +14,11 @@
 namespace xxx_put{
 namespace xxx_pipe{
 namespace xxx_optional{
-namespace xxx_lookup{
+namespace xxx_mapped{
 
     void test();
 
-}// xxx_lookup
+}// xxx_mapped
 }// xxx_optional
 }// xxx_pipe
 }// xxx_put