Subject: [Boost-commit] svn:boost r70551 - in sandbox/assign_v2: boost/assign/v2/detail/keyword boost/assign/v2/interpreter boost/assign/v2/ref/array boost/assign/v2/ref/wrapper libs/assign/v2 libs/assign/v2/doc libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/put
From: erwann.rogard_at_[hidden]
Date: 2011-03-25 21:30:48
Author: e_r
Date: 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
New Revision: 70551
URL: http://svn.boost.org/trac/boost/changeset/70551
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/interpreter/data.hpp | 3 +++
sandbox/assign_v2/boost/assign/v2/ref/array/get.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp | 4 +++-
sandbox/assign_v2/libs/assign/v2/doc/conv.qbk | 8 ++++++--
sandbox/assign_v2/libs/assign/v2/doc/org.qbk | 4 ++--
sandbox/assign_v2/libs/assign/v2/test/deque.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/option/data.cpp | 4 ++--
sandbox/assign_v2/libs/assign/v2/test/put/put.cpp | 18 ++++++------------
sandbox/assign_v2/libs/assign/v2/tutorial.cpp | 2 +-
11 files changed, 28 insertions(+), 25 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -18,7 +18,7 @@
//<-
namespace{
//->
- const keyword_aux::nil _nil = keyword_aux::nil();
+ const keyword_aux::nil _nil/*<-*/ = keyword_aux::nil()/*->*/;
//<-
}
//->
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-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -134,8 +134,8 @@
};
template<
- typename C // Container,
- , typename F // Data generator
+ typename C // Container,
+ , typename F // Data generator
, typename Tag // Modifier tag
, typename D // Derived
>
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-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -23,6 +23,7 @@
namespace v2{
//[syntax_interpreter_data
namespace interpreter_aux{
+//<-
template<typename C>
struct container_value{ typedef typename C::value_type type; };
@@ -52,6 +53,8 @@
> type;
}/*->*/;
+//->
+
template<
typename C // Value or pointer-container
>
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/get.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/get.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/get.hpp 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -51,7 +51,7 @@
}// result_of
- // Transforms rw by member function `get()`
+ // Transforms rw by member function get()
template<typename R>
typename result_of::transform_get<R>::type
transform_get(R& rw)/*<-*/
Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -32,7 +32,9 @@
{
typedef T type;
- /*<-*/BOOST_STATIC_CONSTANT( bool, is_const = boost::is_const<T>::value )/*->*/;
+ /*<-*/BOOST_STATIC_CONSTANT( bool, is_const = boost::is_const<T>::value );/*->*/
+
+ BOOST_ASSIGN_V2_IGNORE(static bool is_const;)
wrapper()/*<-*/
{/*TODO or null pointer?*/}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
Modified: sandbox/assign_v2/libs/assign/v2/doc/conv.qbk
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/doc/conv.qbk (original)
+++ sandbox/assign_v2/libs/assign/v2/doc/conv.qbk 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -14,7 +14,7 @@
]
[
[Csv form]
- [Syntax that is equivalent to succesive functor invocations ]
+ [Function whose invocation is equivalent to successive functor invocations ]
]
[
[Data generator]
@@ -38,7 +38,10 @@
]
[
[Pipe]
- [TODO]
+ [Overload of `operator|` that applies, then returns, some transformation to the first argument in a way that is specified by
+ the second argument. [footnote This idiom originated in [tpl_pipe Unix] and is present in [tpl_boost_range Boost.Range]
+ under the name [tpl_boost_range_adaptor range adaptor]]
+ ]
]
[
[Reference array]
@@ -46,6 +49,7 @@
]
]
+
[heading Notation]
[variablelist
Modified: sandbox/assign_v2/libs/assign/v2/doc/org.qbk
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/doc/org.qbk (original)
+++ sandbox/assign_v2/libs/assign/v2/doc/org.qbk 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -17,8 +17,8 @@
[*By identifier]
-In directory [^boost/assign/v2/include], described in section [link boost_assign_v2.reference.include Include], headers are named after the
-an identifier that they define.
+In directory [link boost_assign_v2.reference.include [^boost/assign/v2/include]], headers are named after the an identifier that they
+define.
[*Requirement]
Modified: sandbox/assign_v2/libs/assign/v2/test/deque.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/deque.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/deque.cpp 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -62,7 +62,7 @@
typedef std::string str_;
typedef std::pair<str_, str_> T;
typedef as2::result_of::deque<T>::type C;
- C airports = as2::deque<T>("AUH", "Abu Dhabi")("JFK", "New York")("LHR", "London")( "PEK", "Beijing" );
+ C airports = as2::deque<T>("AUH", "Abu Dhabi")("JFK", "New York")("LHR", "London")("PEK", "Beijing");
std::deque<T> benchmark;
benchmark.push_back( T("AUH", "Abu Dhabi") );
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-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -38,10 +38,10 @@
// (*fp) resolves error C2440 using MSVC
//[test_option_data_math
std::vector<double> exponent;
- typedef double(*fp)(double);
+ /*<-*/typedef double(*fp)(double);/*->*/
typedef function<double(double)> f_;
(
- 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 ) ) )
+ as2::put( exponent ) % ( as2::_data = 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/put/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/put.cpp 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -67,13 +67,11 @@
/*<<Calls `numeric_kb[ i ] = data_( t )` for [^( i, t ) = ( 0, "+" ), ..., ( 5, "." )]>>*/( "+" )( "-" )( "*" )( "/" )( "=" )( "." )
/*<<Calls `numeric_kb[ 6 + i ] = data_( *( b + i ) )` for [^i = 0, ..., 9] and [^b =] `boost::begin( numeric )`>>*/( as2::as_arg_list( numeric ) );
- assert( get<str_>( numeric_kb.front() ) == "+" );
- assert( get<int>( numeric_kb.back() ) == 9 );
- //]
BOOST_ASSIGN_V2_CHECK( get<str_>( numeric_kb.front() ) == "+" );
+ BOOST_ASSIGN_V2_CHECK( get<int>( numeric_kb.back() ) == 9 );
+ //]
BOOST_ASSIGN_V2_CHECK( get<str_>( numeric_kb[ 5 ] ) == "." );
BOOST_ASSIGN_V2_CHECK( get<int>( numeric_kb[ 6 ] ) == 0 );
- BOOST_ASSIGN_V2_CHECK( get<int>( numeric_kb.back() ) == 9 );
}
{
//[test_put_put_ragged
@@ -87,13 +85,11 @@
/*<<Calls `ragged.push_back( variable_size_( 1, -99.99 ) )`>>*/( 1, -99.99 )
/*<<Calls `ragged.push_back( variable_size_( ) )`>>*/( );
- assert( ragged[0].size() == a.size() );
- assert( ragged[3].size() == 0 );
+ BOOST_ASSIGN_V2_CHECK( ragged[0].size() == a.size() );
+ BOOST_ASSIGN_V2_CHECK( ragged[3].size() == 0 );
//]
- BOOST_ASSIGN_V2_CHECK( ragged[0].size() == a.size() );
BOOST_ASSIGN_V2_CHECK( ragged[1].size() == b.size() );
BOOST_ASSIGN_V2_CHECK( ragged[2].size() == 1 );
- BOOST_ASSIGN_V2_CHECK( ragged[3].size() == 0 );
data_ eps = numeric::bounds<data_>::smallest();
BOOST_ASSIGN_V2_CHECK( fabs( ragged[0].front() - a.front() ) < eps );
BOOST_ASSIGN_V2_CHECK( fabs( ragged[0].back() - a.back() ) < eps );
@@ -126,13 +122,11 @@
/*<<Calls `tri_state.push_back( data_( s, c ) )` for [^( s, c ) =( ny, 212 )...( ct, 203 )]>>*/
as2::put( tri_state_area )( ny, 212 )( ny, 718 )( ny, 516 )( ny, 914 )( nj, 210 )( nj, 908 )( nj, 609 )( ct, 203 );
- assert( get<0>( tri_state_area.front() ) == ny );
- assert( get<1>( tri_state_area.back() ) == 203 );
- //]
BOOST_ASSIGN_V2_CHECK( get<0>( tri_state_area.front() ) == ny );
+ BOOST_ASSIGN_V2_CHECK( get<1>( tri_state_area.back() ) == 203 );
+ //]
BOOST_ASSIGN_V2_CHECK( get<1>( tri_state_area.front() ) == 212 );
BOOST_ASSIGN_V2_CHECK( get<0>( tri_state_area.back() ) == ct );
- BOOST_ASSIGN_V2_CHECK( get<1>( tri_state_area.back() ) == 203 );
}
}// test()
Modified: sandbox/assign_v2/libs/assign/v2/tutorial.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/tutorial.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/tutorial.cpp 2011-03-25 21:30:46 EDT (Fri, 25 Mar 2011)
@@ -108,7 +108,7 @@
using namespace lambda;
array<int, 4> powers = converter( csv_deque( 1, 10, -1, -1 ) );
std::size_t index = 2; using namespace lambda;
- ( put( powers ) % ( _iterate = var( index )++ ) )( 100 )( 1000 );
+ ( put( powers ) % ( _iterate = var( index )++ ) )( 100 )( 1000 );
for(int value = 1, index = 0; index < powers.size(); index++, value *=10 )
{