|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70487 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque boost/assign/v2/interpreter boost/assign/v2/option boost/assign/v2/option/std_modifier libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/pipe libs/assign/v2/test/pipe/option libs/assign/v2/test/ref
From: erwann.rogard_at_[hidden]
Date: 2011-03-23 22:09:50
Author: e_r
Date: 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
New Revision: 70487
URL: http://svn.boost.org/trac/boost/changeset/70487
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/deque/deque.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp | 8 +++++---
sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp | 31 ++++++++++++++++++-------------
sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp | 21 +++++++++++++--------
sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp | 35 ++++++++++++++++++-----------------
sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp | 24 ++++++++++++++++++------
sandbox/assign_v2/boost/assign/v2/option/iterate.hpp | 6 +++---
sandbox/assign_v2/boost/assign/v2/option/key.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/option/mapped.hpp | 6 +++---
sandbox/assign_v2/boost/assign/v2/option/modifier.hpp | 13 ++++++++-----
sandbox/assign_v2/boost/assign/v2/option/repeat.hpp | 8 ++++----
sandbox/assign_v2/boost/assign/v2/option/std_modifier/modifier.hpp | 6 +++---
sandbox/assign_v2/boost/assign/v2/put.hpp | 12 ++++++------
sandbox/assign_v2/libs/assign/v2/test/option/data.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp | 6 +++---
sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp | 6 +++---
sandbox/assign_v2/libs/assign/v2/test/ref.cpp | 4 ++++
sandbox/assign_v2/libs/assign/v2/test/ref/wrapper.cpp | 2 ++
23 files changed, 119 insertions(+), 85 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-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -49,7 +49,7 @@
typedef impl_ const cimpl_;
typedef interpreter_crtp<impl_, F, Tag, deque_interpreter> put_crtp_;
- typedef interpreter_aux::adapter_modifier<Tag> modifier_;
+ typedef interpreter_aux::interpreter_modifier<Tag> modifier_;
//->
public:
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-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -19,7 +19,9 @@
//[syntax_interpreter_as_arg_list
namespace interpreter_aux{
- template<typename /*<<Range>>*/R>
+ template<
+ typename R // Range
+ >
class as_arg_list_adapter/*<-*/
{
@@ -46,10 +48,10 @@
namespace result_of{
template<typename R>
- struct /*<<Metafunction>>*/as_arg_list/*<-*/
+ struct as_arg_list/*<-*/
{
typedef as_arg_list_adapter<R> type;
- }/*->*/;
+ }/*->*/; // Metafunction
}// result_of
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-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -54,7 +54,7 @@
struct modifier_holder{
typedef Tag modifier_tag;
- typedef interpreter_aux::adapter_modifier<Tag> modifier_type;
+ typedef interpreter_aux::interpreter_modifier<Tag> modifier_type;
modifier_holder(){}
modifier_holder(modifier_type const& m) : modifier( m ){}
@@ -98,14 +98,14 @@
D const& d_;
};
-}//aux
-//[syntax_put_interpreter_crtp
+}// interpreter_aux
+//[syntax_interpreter_crtp
namespace interpreter_aux{
template<typename C, typename D>
- struct ConceptAdapter1{
+ struct ConceptDerivedInterpreter1{
- BOOST_CONCEPT_USAGE(ConceptAdapter1)
+ BOOST_CONCEPT_USAGE(ConceptDerivedInterpreter1)
{
D derived( cont );
C& ref = derived.container();
@@ -117,11 +117,11 @@
};
template<typename C, typename F, typename Tag, typename D>
- struct ConceptAdapter2 : ConceptAdapter1<C, D>{
+ struct ConceptDerivedInterpreter2 : ConceptDerivedInterpreter1<C, D>{
- typedef interpreter_aux::adapter_modifier<Tag> modifier_;
+ typedef interpreter_aux::interpreter_modifier<Tag> modifier_;
- BOOST_CONCEPT_USAGE(ConceptAdapter2)
+ BOOST_CONCEPT_USAGE(ConceptDerivedInterpreter2)
{
D derived( cont, f, m );
}
@@ -133,7 +133,12 @@
};
- template<typename /*<<Container>>*/C, typename /*<<Data generator>>*/F, typename /*<<Modifier tag>>*/Tag, typename /*<<Derived type>>*/D>
+ template<
+ typename C // Container,
+ , typename F // Data generator
+ , typename Tag // Modifier tag
+ , typename D // Derived
+ >
class interpreter_crtp
//<-
: public data_gen_holder<F>
@@ -159,7 +164,7 @@
public:
- typedef /*<-*/ typename modifier_holder_::modifier_type BOOST_ASSIGN_V2_IGNORE(/*->*/ adapter_modifier<Tag> /*<-*/)/*->*/
+ typedef /*<-*/ typename modifier_holder_::modifier_type BOOST_ASSIGN_V2_IGNORE(/*->*/ interpreter_modifier<Tag> /*<-*/)/*->*/
modifier_type;
interpreter_crtp(){}
@@ -234,7 +239,7 @@
template<typename T>
result_type modify(T* t, typename ptr_enabler<T>::type* = 0)const
{
- typedef put_concept::Modifier<Tag, C, T*> concept_;
+ typedef ConceptModifier<Tag, C, T*> concept_;
BOOST_CONCEPT_ASSERT(( concept_ ));
this->modifier.impl( this->derived().container(), t );
return this->derived();
@@ -243,7 +248,7 @@
template<typename T>
void check_modifier( BOOST_ASSIGN_V2_FORWARD_PARAM(T, t) )const
{
- typedef put_concept::Modifier<Tag, C,
+ typedef ConceptModifier<Tag, C,
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
T&&
#else
@@ -259,7 +264,7 @@
result_type modify(T&& t)const
{
check_modifier( t );
- /*<< Instance of interpreter_aux::adapter_modifier<Tag> >>*/this->modifier.impl(
+ /*<< Instance of interpreter_aux::interpreter_modifier<Tag> >>*/this->modifier.impl(
/*<< Reference to C >>*/this->derived().container(),
std::forward<T>( t )
);
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-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -27,11 +27,12 @@
template<typename C>
struct container_value{ typedef typename C::value_type type; };
- template<typename /*<<Pointer-container>>*/PtrC,
- template<typename > class F = container_value
+ template<typename PtrC // Pointer-container
+ ,template<typename > class F = container_value
>
- struct /*<<Metafunction>>*/ deduce_ptr_generator/*<-*/
+ struct deduce_ptr_generator/*<-*/
{
+
typedef typename v2::ptr_container_aux::to_value_container<
PtrC
>::type cont_;
@@ -40,17 +41,21 @@
> type;
}/*->*/;
- template<typename /*<<Value-container>>*/C,
- template<typename > class F = container_value>
- struct /*<<Metafunction>>*/ deduce_value_generator/*<-*/
+ template<
+ typename C // Value-container
+ , template<typename > class F = container_value
+ >
+ struct deduce_value_generator/*<-*/
{
typedef functor_aux::constructor<
typename F<C>::type
> type;
}/*->*/;
- template<typename /*<<Value or pointer-container>>*/C>
- struct /*<<Metafunction>>*/deduce_data_generator/*<-*/
+ template<
+ typename C // Value or pointer-container
+ >
+ struct deduce_data_generator/*<-*/
: boost::mpl::eval_if<
ptr_container_aux::is_ptr_container<C>,
deduce_ptr_generator<C>,
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -18,7 +18,7 @@
template<typename C, typename F, typename Tag, typename D>
class interpreter_crtp;
- template<typename Tag> struct /*<<Specialize on Tag>>*/ adapter_modifier;
+ template<typename Tag> struct /*<<Specialize on Tag>>*/ interpreter_modifier;
}// interpreter_aux
}// v2
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-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -27,34 +27,35 @@
namespace assign{
namespace v2{
//[syntax_interpreter_modifier
-namespace /*<< Template arguments to `aux::adapter_modifier<>` have to be within this `namespace`>>*/modifier_tag{}
-namespace interpreter_aux{
+namespace modifier_tag{
- template<typename Tag>
- struct /*<<Specialize on Tag>>*/ adapter_modifier{};
+ // Namespace in which to declare template arguments of `interpreter_modifier<>`
- template<typename C>
- struct /*<<Metafunction returning a modifier-tag>>*/deduce_modifier_tag;
+}//modifier_tag
+namespace interpreter_aux{
-}// interpreter_aux
-namespace put_concept{
+ template<typename Tag>
+ struct interpreter_modifier
+ {
+ // Specialize on Tag to model ConceptModifier
+ };
- template<typename Tag, /*<<Container>>*/ typename C, /*<<Input>>*/ typename T>
- struct Modifier
+ template<typename Tag, typename C, typename T>
+ struct ConceptModifier
{
- BOOST_CONCEPT_USAGE(Modifier)
+ BOOST_CONCEPT_USAGE(ConceptModifier)
{
m.impl( cont, t );
}
private:
- static interpreter_aux::adapter_modifier<Tag>& m;
+ static interpreter_aux::interpreter_modifier<Tag>& m;
static C& cont;
static T t;
};
-}//put_concept
+}//interpreter_aux
/*<-*/
namespace switch_tag{
@@ -114,7 +115,6 @@
/**/
#endif
-//[example_put_modifier_deduce_switch
#ifdef BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH
#warning
#else
@@ -123,15 +123,16 @@
BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_ADAPTER(2)
BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH_DEFAULT(3)
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_SWITCH
-//]
#endif
/*->*/
namespace interpreter_aux{
- template<typename /*<<Container>>*/C>
- struct /*<<Metafunction>>*/deduce_modifier_tag/*<-*/
+ template<
+ typename C // Container
+ >
+ struct deduce_modifier_tag/*<-*/
: switch_aux::result< switch_tag::deduce_put, C>
{}/*->*/;
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -18,16 +18,28 @@
//[syntax_put_adapter_replace_parameter
namespace interpreter_aux{
- template<typename /*<<Inherits interpreter_crtp\<\> >>*/D>
- struct /*<<Metafunction class to be specialized on D>>*/replace_data_generator{
+ template<
+ typename D // Derives from interpreter_crtp
+ >
+ struct replace_data_generator{
+
+ // Metafunction class specialized on D should return its transformation
+ // by D::fun_type = F
+
template<typename F>
- struct /*<<Transforms D by replacing D::fun_type with F>>*/apply{};
+ struct apply{};
};
- template<typename /*<<Inherits interpreter_crtp\<\> >>*/ D>
- struct /*<<Metafunction class to be specialized on D>>*/ replace_modifier_tag{
+ template<
+ typename D // Derives from interpreter_crtp
+ >
+ struct replace_modifier_tag{
+
+ // Metafunction class specialized on D should return its transformation
+ // by D::modifier_tag = Tag
+
template<typename Tag>
- struct /*<<Transforms D by replacing Tag D::modifier_tag with Tag>>*/ apply{};
+ struct apply{};
};
}// interpreter_aux
Modified: sandbox/assign_v2/boost/assign/v2/option/iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/iterate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/iterate.hpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -52,7 +52,7 @@
namespace interpreter_aux{
template<typename Arg>
- class adapter_modifier< modifier_tag::iterate<Arg> >/*<-*/
+ class interpreter_modifier< modifier_tag::iterate<Arg> >/*<-*/
{
typedef keyword_aux::ignore ignore_;
@@ -62,8 +62,8 @@
public:
- adapter_modifier(): ptr( new arg_() ){}
- explicit adapter_modifier(
+ interpreter_modifier(): ptr( new arg_() ){}
+ explicit interpreter_modifier(
ignore_,
typename boost::call_traits<arg_>::param_type arg
) : ptr( new arg_( arg ) )
Modified: sandbox/assign_v2/boost/assign/v2/option/key.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/key.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/key.hpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -44,7 +44,7 @@
}//result_of
- template<typename C, typename F, typename Tag, typename D>
+ template<typename /*<<Associative container>>*/C, typename F, typename Tag, typename D>
typename result_of::option_key<C, D>::type
operator%/*<<Overrides data generator with a constructor for C::key_type>>*/(
interpreter_crtp<C, F, Tag, D> const& lhs,
Modified: sandbox/assign_v2/boost/assign/v2/option/mapped.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/mapped.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/mapped.hpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -28,7 +28,7 @@
namespace interpreter_aux{
template<typename Arg>
- class adapter_modifier<modifier_tag::mapped<Arg> >/*<-*/
+ class interpreter_modifier<modifier_tag::mapped<Arg> >/*<-*/
{
typedef Arg arg_;
@@ -38,8 +38,8 @@
public:
- adapter_modifier() : ptr( new arg_() ){}
- explicit adapter_modifier(
+ interpreter_modifier() : ptr( new arg_() ){}
+ explicit interpreter_modifier(
ignore_,
typename boost::call_traits<arg_>::param_type arg
) : ptr( new arg_( arg ) )
Modified: sandbox/assign_v2/boost/assign/v2/option/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier.hpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -20,7 +20,7 @@
namespace boost{
namespace assign{
namespace v2{
-//[syntax_put_modifier_modulo
+//[syntax_option_modifier
namespace interpreter_aux{
template<typename /*<<A class of modifiers>>*/ Keyword, typename /*<<A part of the modifier's implementation>>*/Arg = keyword_aux::ignore>
@@ -53,7 +53,7 @@
struct /*<<Metafunction class to be specialized on Keyword>>*/ meta_modifier_tag
{
template<typename /*<<Inherits `interpreter_crtp<>` >>*/ D>
- struct /*<<Returns a modifier-tag>>*/ apply;
+ struct apply;
};
namespace result_of{
@@ -85,8 +85,7 @@
template<typename C, typename F, typename Tag, typename D,
typename Keyword, typename Arg>
typename ::boost::mpl::apply2<
- result_of::option_modifier<D>,
- Keyword, Arg
+ result_of::option_modifier<D>, Keyword, Arg
>::type
operator%(
interpreter_crtp<C, F, Tag, D> const& lhs,
@@ -95,7 +94,7 @@
{
typedef interpreter_aux::meta_modifier_tag<Keyword, Arg> meta_;
typedef typename ::boost::mpl::apply1<meta_, D>::type modifier_tag;
- typedef interpreter_aux::adapter_modifier<modifier_tag> modifier_;
+ typedef interpreter_aux::interpreter_modifier<modifier_tag> modifier_;
typedef typename ::boost::mpl::apply2<
result_of::option_modifier<D>,
@@ -110,6 +109,10 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
}// interpreter_aux
+
+ /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/#define BOOST_ASSIGN_V2_OPTION_MODIFIER_KEYWORD(NAME) unspecified/*<-*/)/*->*/
+ /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/#define BOOST_ASSIGN_V2_OPTION_MODIFIER_META_MODIFIER_TAG(NAME, Result) unspecified/*<-*/)/*->*/
+
//]
namespace result_of{
Modified: sandbox/assign_v2/boost/assign/v2/option/repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/repeat.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/repeat.hpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -32,16 +32,16 @@
namespace interpreter_aux{
template<typename Arg>
- class adapter_modifier<modifier_tag::repeat<Arg> >/*<-*/
+ class interpreter_modifier<modifier_tag::repeat<Arg> >/*<-*/
{
- typedef adapter_modifier<Arg> inner_type;
+ typedef interpreter_modifier<Arg> inner_type;
public:
typedef std::size_t size_type;
- adapter_modifier() : n_( 0 ){}
- explicit adapter_modifier( inner_type inner, size_type n )
+ interpreter_modifier() : n_( 0 ){}
+ explicit interpreter_modifier( inner_type inner, size_type n )
: inner_( inner ), n_( n )
{}
Modified: sandbox/assign_v2/boost/assign/v2/option/std_modifier/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/std_modifier/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/std_modifier/modifier.hpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -82,12 +82,12 @@
namespace interpreter_aux{\
\
template<>\
- class adapter_modifier<modifier_tag::FUN>\
+ class interpreter_modifier<modifier_tag::FUN>\
{\
typedef keyword_aux::ignore ignore_;\
public:\
- adapter_modifier(){}\
- adapter_modifier( ignore_, ignore_ ){}\
+ interpreter_modifier(){}\
+ interpreter_modifier( ignore_, ignore_ ){}\
BOOST_ASSIGN_V2_OPTION_STD_MODIFIER_IMPL(FUN)\
};\
\
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-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -23,11 +23,11 @@
namespace interpreter_aux{
template<typename C, typename F, typename Tag>
- class put_interpreter
- : protected ref::wrapper< ref::assign_tag::copy, C >,
+ class put_interpreter :
//<-
- public interpreter_aux::interpreter_crtp< C, F, Tag, put_interpreter<C, F, Tag> >
+ protected ref::wrapper< ref::assign_tag::copy, C >,
//->
+ public interpreter_aux::interpreter_crtp< C, F, Tag, put_interpreter<C, F, Tag> >
{
//<-
typedef interpreter_aux::interpreter_crtp< C, F, Tag, put_interpreter > super2_t;
@@ -38,7 +38,7 @@
//<-
protected:
- typedef interpreter_aux::adapter_modifier<Tag> modifier_;
+ typedef interpreter_aux::interpreter_modifier<Tag> modifier_;
typedef ref::assign_tag::copy assign_tag_;
typedef ref::wrapper<assign_tag_,C> super1_t;
//->
@@ -65,13 +65,13 @@
struct /*<<Metafunction class>>*/replace_data_generator< interpreter_aux::put_interpreter<C, F, Tag> >{/*<-*/
template<typename F1>
struct apply{ typedef interpreter_aux::put_interpreter<C, F1, Tag> type; };
- /*->*/};
+ }/*->*/;
template<typename C, typename F, typename Tag>
struct /*<<Metafunction class>>*/replace_modifier_tag< interpreter_aux::put_interpreter<C, F, Tag> >{/*<-*/
template<typename Tag1>
struct apply{ typedef interpreter_aux::put_interpreter<C, F, Tag1> type; };
- /*->*/};
+ }/*->*/;
}// interpreter_aux
namespace result_of{
Modified: sandbox/assign_v2/libs/assign/v2/test/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/data.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/data.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -41,7 +41,7 @@
typedef double(*fp)(double);
typedef function<double(double)> f_;
(
- as2::put( exponent ) % ( as2::_data = f_( fp(log10) ) )
+ as2::put( exponent ) % ( as2::_data = /*<<Some compilers allow `f_( log10 )`. See [@http://boost.2283326.n4.nabble.com/function-lt-double-double-gt-cmath-td3388896.html link]>>*/f_( fp( log10 ) ) )
)/*<<Equivalent to `as2::put( exponent )( log10( 1000.0 ) )( log10( 10.0 ) )( log10( 10000.0 ) )( log10( 1.0 ) )( log10( 100.0 ) )`>>*/( 1000.0 )( 10.0 )( 10000.0 )( 1.0 )( 100.0 );
double eps = numeric::bounds<double>::smallest();
Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -29,7 +29,7 @@
using namespace boost;
namespace as2 = assign::v2;
{
- //[test_put_pipe_csv_put_str_literal
+ //[test_pipe_csv_put_str_literal
typedef const char* T; typedef std::string str_; std::deque<T> cont;
BOOST_ASSIGN_V2_CHECK(
Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/data.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -29,7 +29,7 @@
using namespace boost;
namespace as2 = assign::v2;
{
- //[test_put_pipe_option_data_math
+ //[test_pipe_option_data_math
int k = 1; std::list<int> factorials;
using namespace lambda;
@@ -37,8 +37,8 @@
range::equal(
factorials | (
as2::_csv_put % ( as2::_data = ( var(k) *= _1 ) )
- )/*Equivalent to calling `factorials.push_back( k *= ++i )`*/( 1, 2, 3, 4, 5 ),
- as2::csv_deque<int>( 1 )( 2 )( 6 )( 24 )( 120 )
+ )/*<<Equivalent to calling `factorials.push_back( k *= ++i )`>>*/( 1, 2, 3, 4, 5 ),
+ as2::csv_deque<int>( 1, 2, 6, 24, 120 )
)
);
//]
Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/iterate.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -29,7 +29,7 @@
namespace as2 = assign::v2;
{
- //[test_put_pipe_modifier_iterate
+ //[test_pipe_option_iterate
typedef int T; boost::array<T, 4> powers; powers[0] = 1; powers[1] = 10;
int i = 2;
Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -28,7 +28,7 @@
using namespace boost;
namespace as2 = assign::v2;
{
- //[test_put_pipe_modifier_mapped
+ //[test_pipe_option_mapped
using namespace lambda;
typedef std::map<std::string, int> C; C cal;
BOOST_AUTO( _local, ( as2::_data = _1 ) );
Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/repeat.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -27,7 +27,7 @@
using namespace boost;
namespace as2 = assign::v2;
{
- //[test_put_pipe_modifier_repeat
+ //[test_pipe_option_repeat
std::vector<int> cont;
BOOST_ASSIGN_V2_CHECK(
range::equal(
Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/std_modifier.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -41,7 +41,7 @@
// MSVC REMINDER : fully qualify boost::begin boost::end - error C2668
{
- //[test_put_pipe_modifier_push_front
+ //[test_pipe_option_push_front
std::deque<int> powers; int front = (
powers | ( as2::_csv_put % as2::_push_front )( 16, 8, 4, 2, 1 )
).front();
@@ -51,7 +51,7 @@
//]
}
{
- //[test_put_pipe_modifier_push
+ //[test_pipe_option_push
typedef int int_; std::queue<int_> fifo; int_ front = (
fifo | ( as2::_csv_put % as2::_push )( 72, 31, 48 )
).front();
@@ -61,7 +61,7 @@
//]
}
{
- //[test_put_pipe_modifier_insert
+ //[test_pipe_option_insert
typedef std::set<double> doubles_; doubles_ sqrt2;
range_iterator<doubles_>::type lower = (
sqrt2 | ( as2::_csv_put % as2::_insert )( 1.414, 1.41421, 1.41, 1.4142 )
Modified: sandbox/assign_v2/libs/assign/v2/test/ref.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -8,6 +8,8 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
#include <libs/assign/v2/test/ref/array.h>
+#include <libs/assign/v2/test/ref/csv_array.h>
+#include <libs/assign/v2/test/ref/get.h>
#include <libs/assign/v2/test/ref/aux_.h>
#include <libs/assign/v2/test/ref/wrapper.h>
#include <libs/assign/v2/test/ref.h>
@@ -18,7 +20,9 @@
void test(){
xxx_array::test();
+ xxx_csv_array::test();
xxx_aux_::test();
+ xxx_get::test();
xxx_wrapper::test();
}
Modified: sandbox/assign_v2/libs/assign/v2/test/ref/wrapper.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/wrapper.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/wrapper.cpp 2011-03-23 22:09:42 EDT (Wed, 23 Mar 2011)
@@ -37,6 +37,7 @@
}
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
{
+ //[test_ref_wrapper
typedef val_ const cval_;
typedef as2::ref::wrapper_param<val_>::type param_;
BOOST_MPL_ASSERT(( boost::is_same<param_, cval_> ));
@@ -51,6 +52,7 @@
w_ w = w_( 1 );
BOOST_ASSIGN_V2_CHECK( w.get() == a );
}
+ //]
}
#endif
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk