|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69753 - in sandbox/assign_v2: boost/assign libs/assign/v2/speed libs/assign/v2/src libs/assign/v2/test libs/assign/v2/test/detail libs/assign/v2/test/put libs/assign/v2/test/put/modulo libs/assign/v2/test/put/pipe/functor libs/assign/v2/test/ref/array libs/assign/v2/test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-08 22:28:10
Author: e_r
Date: 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
New Revision: 69753
URL: http://svn.boost.org/trac/boost/changeset/69753
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2.hpp | 3
sandbox/assign_v2/libs/assign/v2/speed/put_ref.cpp | 12 -
sandbox/assign_v2/libs/assign/v2/src/main.cpp | 18 ---
sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp | 176 +++++++++++++--------------------------
sandbox/assign_v2/libs/assign/v2/test/put.cpp | 4
sandbox/assign_v2/libs/assign/v2/test/put/frame.cpp | 25 -----
sandbox/assign_v2/libs/assign/v2/test/put/frame.h | 24 -----
sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp | 25 -----
sandbox/assign_v2/libs/assign/v2/test/put/modulo.h | 24 -----
sandbox/assign_v2/libs/assign/v2/test/put/modulo/fun.cpp | 94 ---------------------
sandbox/assign_v2/libs/assign/v2/test/put/modulo/fun.h | 26 -----
sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/rhs.cpp | 4
sandbox/assign_v2/libs/assign/v2/test/ref/array/csv.cpp | 25 +++--
sandbox/assign_v2/libs/assign/v2/test/ref/array/functor.cpp | 31 +++---
sandbox/assign_v2/libs/assign/v2/test/utility/convert.cpp | 124 ---------------------------
sandbox/assign_v2/libs/assign/v2/test/utility/convert.h | 24 -----
sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp | 1
17 files changed, 110 insertions(+), 530 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2.hpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -10,8 +10,9 @@
#ifndef BOOST_ASSIGN_V2_ER_2010_HPP
#define BOOST_ASSIGN_V2_ER_2010_HPP
-#include <boost/assign/v2/utility.hpp>
+#include <boost/assign/v2/detail.hpp>
#include <boost/assign/v2/put.hpp>
#include <boost/assign/v2/ref.hpp>
+#include <boost/assign/v2/utility.hpp>
#endif
Modified: sandbox/assign_v2/libs/assign/v2/speed/put_ref.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/speed/put_ref.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/speed/put_ref.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -12,14 +12,10 @@
#include <deque>
#include <string>
-#include <boost/preprocessor/control/if.hpp>
-#include <boost/preprocessor/control/expr_if.hpp>
-#include <boost/preprocessor/comparison/less_equal.hpp>
-#include <boost/preprocessor/comparison/greater.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/seq/first_n.hpp>
-#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
+#include <boost/preprocessor/comparison.hpp>
+#include <boost/preprocessor/control.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#include <boost/preprocessor/seq.hpp>
#include <boost/format.hpp>
#include <boost/progress.hpp>
Modified: sandbox/assign_v2/libs/assign/v2/src/main.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/src/main.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/src/main.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,17 +1,11 @@
// Test
-//#include <libs/assign/v2/test/detail.h>
-//#include <libs/assign/v2/test/ref.h>
+#include <libs/assign/v2/test/detail.h>
+#include <libs/assign/v2/test/ref.h>
//#include <libs/assign/v2/test/put.h>
//#include <libs/assign/v2/test/utility.h>
//#include <libs/assign/v2/test/other.h>
-#include <libs/assign/v2/test/put/container/functor.h>
-#include <libs/assign/v2/test/put/modifier/standard.h>
-#include <libs/assign/v2/test/put/modifier/iterate.h>
-#include <libs/assign/v2/test/put/modifier/lookup.h>
-#include <libs/assign/v2/test/put/modifier/repeat.h>
-
// Speed
//#include <fstream>
//#include <libs/assign/v2/speed/put_ref.h>
@@ -50,19 +44,13 @@
std::cout << cpp0x << std::endl;
}
{
- /*
using namespace test_assign_v2;
- xxx_detail::test();
+ /*
xxx_put::test();
xxx_ref::test();
xxx_utility::test();
xxx_other::test();
*/
- using namespace test_assign_v2;
- xxx_put::xxx_container::xxx_functor::test();
- xxx_put::xxx_modifier::xxx_standard::test();
- xxx_put::xxx_modifier::xxx_iterate::test();
- xxx_put::xxx_modifier::xxx_repeat::test();
}
/*
Modified: sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/detail/functor.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -7,137 +7,79 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#include <string>
-#include <iostream>
-#include <boost/preprocessor/arithmetic.hpp>
-#include <boost/preprocessor/control.hpp>
-#include <boost/preprocessor/repetition.hpp>
-#include <boost/tuple/tuple.hpp>
-
-#include <boost/assign/v2/detail/config/tuple_limit_arity.hpp>
#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/detail/functor/constructor.hpp>
-
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-// do nothing
-#else
-#include <boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp>
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
+#include <boost/assign/v2/detail/functor/constructor.hpp>
+#include <boost/tuple/tuple.hpp>
#include <libs/assign/v2/test/detail/functor.h>
namespace test_assign_v2{
namespace xxx_detail{
namespace xxx_functor{
- void test(){
- using namespace boost::assign::v2;
-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-#define BOOST_ASSIGN_V2_n BOOST_ASSIGN_V2_LIMIT_CPP03_TUPLE_ARITY
-// That's because we are constructing a boost::tuple<>.
-#else
-#define BOOST_ASSIGN_V2_n BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY
-#if BOOST_ASSIGN_V2_n > BOOST_ASSIGN_V2_LIMIT_CPP03_TUPLE_ARITY
+ void test(){
+ using namespace boost;
+ namespace as2 = assign::v2;
+#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
+// Requirement specific to this test file
+#if BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY != 2
#error
#endif
+#endif
+
+ // Primarily tests whether a functor is overloaded on any combination of
+ // non-const/cont within BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY
+ // (relevant only for CPP03) and on all-non-const and all-const above
+ // this limit.
+
+ {
+ typedef int e_; e_ x = -1, y = 1;
+ typedef boost::tuple<e_&, e_&> tuple_;
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
+ BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, y ) ) == &x );
+ BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( x, y ) ) == &y );
- {
- // value-type // var-type // tuple_param
- typedef int val_;
- typedef int const cval_;
-
- typedef val_& x_;
- typedef cval_& y_;
- typedef val_ z_;
-
-#define BOOST_ASSIGN_V2_MACRO(Z, n, data) data
-
- typedef boost::tuple<
- BOOST_PP_EXPR_IF(
- BOOST_ASSIGN_V2_n,
- x_
- )
- BOOST_PP_ENUM_TRAILING(
- BOOST_PP_IF(BOOST_PP_DEC(BOOST_ASSIGN_V2_n),1,0),
- BOOST_ASSIGN_V2_MACRO,
- y_
- )
- BOOST_PP_ENUM_TRAILING(
- BOOST_PP_SUB(BOOST_ASSIGN_V2_n,2),
- BOOST_ASSIGN_V2_MACRO,
- z_
- )
- > t_;
-#undef BOOST_ASSIGN_V2_MACRO
-
- typedef functor_aux::constructor<t_> f_;
- f_ f;
-
- val_ x = -1;
- cval_ y = 0;
-
-#define BOOST_ASSIGN_V2_MACRO(z, n, data) data
-
- t_ t = f(
- BOOST_PP_EXPR_IF(
- BOOST_ASSIGN_V2_n,
- x
- )
- BOOST_PP_ENUM_TRAILING(
- BOOST_PP_IF(BOOST_PP_DEC(BOOST_ASSIGN_V2_n),1,0),
- BOOST_ASSIGN_V2_MACRO,
- y
- )
- BOOST_PP_ENUM_TRAILING(
- BOOST_PP_SUB(BOOST_ASSIGN_V2_n, 2),
- BOOST_ASSIGN_V2_MACRO,
- 1
- )
- );
-#undef BOOST_ASSIGN_V2_MACRO
- BOOST_PP_EXPR_IF(
- BOOST_ASSIGN_V2_n,
- BOOST_ASSIGN_V2_CHECK(
- &boost::get<0>( t ) == &x
- );
- )
- BOOST_PP_EXPR_IF(
- BOOST_PP_DEC(BOOST_ASSIGN_V2_n),
- BOOST_ASSIGN_V2_CHECK(
- &boost::get<1>( t ) == &y
- );
- )
-
-#define BOOST_ASSIGN_V2_MACRO(z, i, data ) \
- BOOST_ASSIGN_V2_CHECK( \
- boost::get< BOOST_PP_ADD(i,2) >( t ) == 1 \
- ); \
-/**/
-
- BOOST_PP_REPEAT(
- BOOST_PP_SUB(BOOST_ASSIGN_V2_n,2),
- BOOST_ASSIGN_V2_MACRO,
- ~
- )
-#undef BOOST_ASSIGN_V2_MACRO
-
- typedef std::string str_;
- const str_ cpp
- = BOOST_ASSIGN_V2_ENABLE_CPP0X ? "C++0x" : "C++03";
- const str_ str = str_("test_assign_v2::xxx_detail::xxx_functor")
- + "{ " + cpp + ", arity = ";
-
- std::cout
- << str
- << BOOST_ASSIGN_V2_n
- << " }"
- << std::endl;
+ }
+ {
+ typedef int e_; e_ x = -1;
+ {
+ typedef boost::tuple<e_&, e_ const&> tuple_;
+
+ BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, 1 ) ) == &x );
+ BOOST_ASSIGN_V2_CHECK( get<1>( as2::constructor<tuple_>()( x, 1 ) ) == 1 );
+ }
+ {
+ typedef boost::tuple< e_ const&, e_&> tuple_;
+
+ BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( 1, x ) ) == 1 );
+ BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( 1, x ) ) == &x );
+ }
+ }
+ {
+ typedef int e_; e_ x = -1, y = 0, z = 1;
+ typedef boost::tuple<e_&, e_&, e_&> tuple_;
-#undef BOOST_ASSIGN_V2_n
+ BOOST_ASSIGN_V2_CHECK( &get<0>( as2::constructor<tuple_>()( x, y, z ) ) == &x );
+ BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( x, y, z ) ) == &y );
+ }
+#if BOOST_ASSIGN_V2_ENABLE_CPP0X
+ {
+ typedef int e_; int y = 0;
+ typedef boost::tuple<e_ const&, e_ &, e_ const&> tuple_;
+
+ BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( -1, y, 1 ) ) == -1 );
+ BOOST_ASSIGN_V2_CHECK( &get<1>( as2::constructor<tuple_>()( -1, y, 1 ) ) == &y );
+ BOOST_ASSIGN_V2_CHECK( get<2>( as2::constructor<tuple_>()( -1, y, 1 ) ) == 1 );
+ }
+#endif
+ {
+ typedef int e_;
+ typedef boost::tuple<e_ const&, e_ const&, e_ const&> tuple_;
+
+ BOOST_ASSIGN_V2_CHECK( get<0>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == -1 );
+ BOOST_ASSIGN_V2_CHECK( get<1>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == 0 );
+ BOOST_ASSIGN_V2_CHECK( get<2>( as2::constructor<tuple_>()( -1, 0, 1 ) ) == 1 );
}
}
Modified: sandbox/assign_v2/libs/assign/v2/test/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -10,7 +10,7 @@
#include <libs/assign/v2/test/put/container.h>
#include <libs/assign/v2/test/put/deduce.h>
#include <libs/assign/v2/test/put/deque.h>
-#include <libs/assign/v2/test/put/modulo.h>
+#include <libs/assign/v2/test/put/fun.h>
#include <libs/assign/v2/test/put/pipe.h>
#include <libs/assign/v2/test/put/ptr.h>
#include <libs/assign/v2/test/put.h>
@@ -23,7 +23,7 @@
xxx_container::test();
xxx_deduce::test();
xxx_deque::test();
- xxx_modulo::test();
+ xxx_fun::test();
xxx_pipe::test();
xxx_ptr::test();
}
Modified: sandbox/assign_v2/libs/assign/v2/test/put/frame.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/frame.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/frame.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,24 +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) //
-//////////////////////////////////////////////////////////////////////////////
-#include <boost/assign/v2/put/frame.hpp>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_frame{
-
- void test()
- {
- namespace as2 = boost::assign::v2;
- // For now nothing
- }
-
-}// xxx_frame
-}// xxx_put
-}// test_assign_v2
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/put/frame.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/frame.h (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/frame.h 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,23 +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 LIBS_ASSIGN_V2_TEST_PUT_FRAME_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_FRAME_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_frame{
-
- void test();
-
-}// xxx_frame
-}// xxx_put
-}// xxx_test_assign
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modulo.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,24 +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) //
-//////////////////////////////////////////////////////////////////////////////
-#include <libs/assign/v2/test/put/modulo/fun.h>
-#include <libs/assign/v2/test/put/modulo.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_modulo{
-
- void test()
- {
- xxx_fun::test();
- }
-
-}// xxx_modulo
-}// xxx_put
-}// test_assign_v2
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modulo.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modulo.h (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modulo.h 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,23 +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 LIBS_ASSIGN_V2_TEST_PUT_MODULO_OP_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_MODULO_OP_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_modulo{
-
- void test();
-
-}// xxx_modulo
-}// xxx_put
-}// xxx_test_assign
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modulo/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modulo/fun.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modulo/fun.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,93 +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) //
-//////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <deque>
-#include <boost/typeof/typeof.hpp>
-#include <boost/spirit/home/phoenix.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/container.hpp>
-#include <boost/assign/v2/put/deque.hpp>
-#include <boost/assign/v2/put/modulo/fun.hpp>
-#include <libs/assign/v2/test/put/modulo.h>
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_modulo{
-namespace xxx_fun{
-
-#ifdef __llvm__
-
- struct f{
-
- typedef int result_type;
-
- template<typename T>
- result_type operator()(T const& i)const{ return i + 1; };
-
- };
-
- void test()
- {
- namespace as2 = boost::assign::v2;
- {
- std::vector<int> incr_fact;
- (
- as2::put( cont ) % ( as2::_fun = f() )
- )( 1 )( 2 )( 6 )( 24 )( 120 );
-
- BOOST_ASSIGN_V2_CHECK( incr_fact.front() == ( 2 ) );
- BOOST_ASSIGN_V2_CHECK( incr_fact.back() == ( 121 ) );
- // TODO fix Bug :
- // LLVM 1.5 - Release mode, EXC_BAD_ACCESS, stl_vector.h #602
- }
-
- }
-
-#else
-
- void test()
- {
- namespace as2 = boost::assign::v2;
- namespace lambda = boost::phoenix;
- {
- //[modulo_fun
- std::vector<int> incr_fact;
- (
- as2::put( incr_fact ) % ( as2::_fun = lambda::arg_names::arg1 + 1 )
- )/*<<1!, 2!, 3!, 4!, 5!>>*/( 1 )( 2 )( 6 )( 24 )( 120 );
-
- BOOST_ASSIGN_V2_CHECK( incr_fact.front() == ( 2 ) );
- BOOST_ASSIGN_V2_CHECK( incr_fact.back() == ( 121 ) );
- //]
- }
- {
- //[modulo_fun_deque
- BOOST_AUTO(
- incr_fact, (
- as2::deque<int>( as2::_nil ) % (
- as2::_fun = ( lambda::arg_names::arg1 + 1 )
- )
- )/*<<1!, 2!, 3!, 4!, 5!>>*/( 1 )( 2 )( 6 )( 24 )( 120 )
- );
-
- BOOST_ASSIGN_V2_CHECK( incr_fact.front() == ( 2 ) );
- BOOST_ASSIGN_V2_CHECK( incr_fact.back() == ( 121 ) );
- //]
- }
-
- }
-
-#endif
-
-
-}// xxx_fun
-}// xxx_modulo
-}// xxx_put
-}// test_assign_v2
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modulo/fun.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modulo/fun.h (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modulo/fun.h 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,25 +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 LIBS_ASSIGN_V2_TEST_PUT_MODULO_FUN_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_MODULO_FUN_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_put{
-namespace xxx_modulo{
-namespace xxx_fun{
-
- void test();
-
-}// xxx_fun
-}// xxx_modulo
-}// xxx_put
-}// xxx_test_assign
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/rhs.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/rhs.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/functor/rhs.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -13,7 +13,7 @@
#include <boost/assign/v2/detail/check/equal_val.hpp>
#include <boost/assign/v2/detail/check/equal_ref.hpp>
#include <boost/assign/v2/put/modifier/repeat.hpp>
-#include <boost/assign/v2/put/pipe/functor.hpp> // rhs?
+#include <boost/assign/v2/put/pipe/functor.hpp>
#include <boost/assign/v2/utility/csv.hpp>
#include <libs/assign/v2/test/put/pipe/functor/rhs.h>
@@ -31,7 +31,7 @@
typedef as2::put_pipe_aux::rhs<> rhs_;
int x = -1;
BOOST_AUTO( rhs, ( ( rhs_() % ( as2::_repeat = 3 ) )( x ) ) );
- int n = as2::ref::at<0>( rhs.pars() ).arg();
+ int n = as2::ref::at<0>( rhs.par_list_cont() ).arg();
BOOST_ASSIGN_V2_CHECK( n == 3 );
}
namespace chk = as2::check_aux;
Modified: sandbox/assign_v2/libs/assign/v2/test/ref/array/csv.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/array/csv.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/array/csv.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -31,21 +31,24 @@
typedef as2::ref::nth_result_of::csv_array<3, T>::type ar_;
ar_ ar = as2::ref::csv_array( x, y, z );
{
- T& rx = ar[0]; T& rz = ar[2];
- BOOST_ASSIGN_V2_CHECK( &rx == &x );
- BOOST_ASSIGN_V2_CHECK( &rz == &z );
+ T& a = ar[0]; T& b = ar[2];
+
+ BOOST_ASSIGN_V2_CHECK( &a == &x );
+ BOOST_ASSIGN_V2_CHECK( &b == &z );
}
//]
{
- T& rx = ar.front(); T& rz = ar.back();
- BOOST_ASSIGN_V2_CHECK( &rx == &x );
- BOOST_ASSIGN_V2_CHECK( &rz == &z );
+ T& a = ar.front(); T& b = ar.back();
+
+ BOOST_ASSIGN_V2_CHECK( &a == &x );
+ BOOST_ASSIGN_V2_CHECK( &b == &z );
}
{
- T& rx = (*boost::begin( ar ) );
- T& rz = *boost::next( boost::begin( ar ), 2 );
- BOOST_ASSIGN_V2_CHECK( &rx == &x );
- BOOST_ASSIGN_V2_CHECK( &rz == &z );
+ T& a = (*boost::begin( ar ) );
+ T& b = *boost::next( boost::begin( ar ), 2 );
+
+ BOOST_ASSIGN_V2_CHECK( &a == &x );
+ BOOST_ASSIGN_V2_CHECK( &b == &z );
}
}
{
@@ -56,6 +59,7 @@
as2::ref::csv_array( x, y, z ) | as2::ref::_get
)
);
+
BOOST_ASSIGN_V2_CHECK( x == r[0] );
BOOST_ASSIGN_V2_CHECK( z == r[2] );
//]
@@ -64,6 +68,7 @@
//[ref_csv_array_assign
typedef int T; T x, y, z;
as2::ref::csv_array( x, y, z ).assign( -1 );
+
BOOST_ASSIGN_V2_CHECK( x == -1 );
BOOST_ASSIGN_V2_CHECK( z == -1 );
//]
Modified: sandbox/assign_v2/libs/assign/v2/test/ref/array/functor.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/array/functor.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/array/functor.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -31,28 +31,25 @@
T w = 11, x = 72, y = 31, z = 48;
as2::ref::nth_result_of::array<3, T>::type ar3 = as2::ref::array( w )( x )( y );
{
- T& rw = ar3.front(); T& ry = ar3.back();
- BOOST_ASSIGN_V2_CHECK( &rw == &w );
- BOOST_ASSIGN_V2_CHECK( &ry == &y );
+ T& a = ar3.front(); T& b = ar3.back();
+
+ BOOST_ASSIGN_V2_CHECK( &a == &w );
+ BOOST_ASSIGN_V2_CHECK( &b == &y );
}
as2::ref::nth_result_of::array<4, T>::type ar4 = ar3( z );
{
- T& rw = ar4.front(); T& rz = ar4.back();
- BOOST_ASSIGN_V2_CHECK( &rw == &w );
- BOOST_ASSIGN_V2_CHECK( &rz == &z );
+ T& a = ar4.front(); T& b = ar4.back();
+
+ BOOST_ASSIGN_V2_CHECK( &a == &w );
+ BOOST_ASSIGN_V2_CHECK( &b == &z );
}
//]
{
- T& rx = ar4[0]; T& rz = ar4[2];
- BOOST_ASSIGN_V2_CHECK( &rx == &x );
- BOOST_ASSIGN_V2_CHECK( &rz == &z );
- //]
- }
- {
- T& rx = ( *boost::begin( ar4 ) );
- T& rz = *boost::next( boost::begin( ar4 ), 2 );
- BOOST_ASSIGN_V2_CHECK( &rx == &x );
- BOOST_ASSIGN_V2_CHECK( &rz == &z );
+ T& a = ( *boost::begin( ar4 ) );
+ T& b = *boost::next( boost::begin( ar4 ), ar4.size() - 1 );
+
+ BOOST_ASSIGN_V2_CHECK( &a == &w );
+ BOOST_ASSIGN_V2_CHECK( &b == &z );
}
}
{
@@ -63,6 +60,7 @@
as2::ref::array( x )( y )( z ) | as2::ref::_get
)
);
+
BOOST_ASSIGN_V2_CHECK( x == r[0] );
BOOST_ASSIGN_V2_CHECK( z == r[2] );
//]
@@ -71,6 +69,7 @@
//[ref_array_assign
typedef int T; T x, y, z;
as2::ref::array( x )( y )( z ).assign( -1 );
+
BOOST_ASSIGN_V2_CHECK( x == -1 );
BOOST_ASSIGN_V2_CHECK( z == -1 );
//]
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/convert.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/convert.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/convert.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,123 +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) //
-//////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <stack>
-#include <boost/array.hpp>
-#include <boost/assign/v2/detail/check/equal_container.hpp>
-#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/utility/convert.hpp>
-#include <boost/assign/v2/utility/convert/check.hpp>
-#include <boost/assign/v2/ref/array.hpp>
-#include <boost/assign/v2/put/deque.hpp>
-#include <libs/assign/v2/test/utility/convert.h>
-
-
-namespace test_assign_v2{
-namespace xxx_utility{
-namespace xxx_convert{
-
- // suggested by JB:
- //[convert_f
- template<typename C, typename R>
- void f(C cont, R const& r){
- namespace as2 = boost::assign::v2;
- as2::check_aux::equal_container( cont, r );
- }
- //]
-
- void test()
- {
- namespace as2 = boost::assign::v2;
- namespace ns = as2::check_aux;
-
- // Non-Boost.Assign.2.0 containers - fully qualified as2::converter()
- {
- //[convert_inpl
- std::vector<int> v( 3 ); v[0] = 1; v[1] = 2; v[2] = 0;
- typedef boost::array<int, 3> ar_;
- BOOST_ASSIGN_V2_CHECK(
- ( as2::converter( v ).type<ar_>() )[1] == v[1]
- );
- //]
- BOOST_ASSIGN_V2_CHECK(
- ( as2::converter( v ).type<ar_>() )[0] == v[0]
- );
- BOOST_ASSIGN_V2_CHECK(
- ( as2::converter( v ).type<ar_>() )[2] == v[2]
- );
- }
- {
- //[convert_copy
- std::vector<int> v( 3 ); v[0] = 72; v[1] = 31; v[2] = 48;
- std::stack<int> lifo = as2::converter( v );
- BOOST_ASSIGN_V2_CHECK( lifo.top() == 48 );
- //]
- }
- {
- {
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
- typedef std::vector<T> C; f<C>( as2::converter( r ), r );
- }
- {
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
- typedef std::deque<T> C; f<C>( as2::converter( r ), r );
- }
- {
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
- typedef std::list<T> C; f<C>( as2::converter( r ), r );
- }
- {
- //[convert_f_invoke
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
- typedef std::stack<T> C; f<C>( as2::converter( r ), r );
- //]
- }
- {
- typedef int T;
- typedef std::vector<T> R; R r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
- typedef std::queue<T> C; f<C>( as2::converter( r ), r );
- }
- }
-
- // Non-Boost.Assign.2.0 containers - name lookup
- {
- //[convert_array
- std::stack<int> lifo = /*<<Notice unqualified (name lookup)>>*/converter( as2::ref::array( 72 )( 31 )( 48 ) );
- BOOST_ASSIGN_V2_CHECK( lifo.top() == 48 );
- //]
- }
- {
- //[convert_csv_array
- std::stack<int> lifo = /*<<Notice unqualified (name lookup)>>*/converter( as2::ref::csv_array( 72, 31, 48 ) );
- BOOST_ASSIGN_V2_CHECK( lifo.top() == 48 );
- //]
- }
- {
- //[convert_deque
- std::stack<int> lifo = /*<<Notice unqualified (name lookup)>>*/converter( as2::deque<int>( 72 )( 31 )( 48 ) );
- BOOST_ASSIGN_V2_CHECK( lifo.top() == 48 );
- //]
- }
- {
- //[convert_csv_array
- std::stack<int> lifo = /*<<Notice unqualified (name lookup)>>*/converter( as2::csv_deque( 72, 31, 48 ) );
- BOOST_ASSIGN_V2_CHECK( lifo.top() == 48 );
- //]
- }
- }
-
-}// xxx_convert
-}// xxx_utility
-}// xxx_test_assign
-
+// TODO remove file
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/convert.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/convert.h (original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/convert.h 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -1,23 +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 LIBS_ASSIGN_V2_TEST_UTILITY_CONVERT_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_UTILITY_CONVERT_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_utility{
-namespace xxx_convert{
-
- void test();
-
-}// xxx_convert
-}// xxx_utility
-}// xxx_test_assign
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp 2011-03-08 22:28:06 EST (Tue, 08 Mar 2011)
@@ -66,7 +66,6 @@
BOOST_ASSIGN_V2_CHECK( powers[0] == 1 );
BOOST_ASSIGN_V2_CHECK( powers[4] == 16 );
//]
- //]
}
}
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