[Boost-commit] svn:boost r72514 - in sandbox/assign_v2: boost/assign/v2/deque/cpp03 boost/assign/v2/deque/csv_deque boost/assign/v2/support/mpl libs/assign/v2/doc libs/assign/v2/src libs/assign/v2/test/deque libs/assign/v2/test/option libs/assign/v2/test/unit_testing

Subject: [Boost-commit] svn:boost r72514 - in sandbox/assign_v2: boost/assign/v2/deque/cpp03 boost/assign/v2/deque/csv_deque boost/assign/v2/support/mpl libs/assign/v2/doc libs/assign/v2/src libs/assign/v2/test/deque libs/assign/v2/test/option libs/assign/v2/test/unit_testing
From: erwann.rogard_at_[hidden]
Date: 2011-06-09 12:20:45

Author: e_r
Date: 2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
New Revision: 72514
URL: http://svn.boost.org/trac/boost/changeset/72514

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_basic.hpp          |    10 ++++----                                
   sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp      |     4 +-                                      
   sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp        |     4 +-                                      
   sandbox/assign_v2/boost/assign/v2/support/mpl/variadic_args_to_indices.hpp |    22 +++++++++---------                      
   sandbox/assign_v2/libs/assign/v2/doc/put.qbk                               |    42 ++++++++++++++++++------------------    
   sandbox/assign_v2/libs/assign/v2/src/main.cpp                              |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_basic.cpp            |    11 +++++----                               
   sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_ext.cpp              |     8 +++---                                  
   sandbox/assign_v2/libs/assign/v2/test/option/data.cpp                      |     2                                         
   sandbox/assign_v2/libs/assign/v2/test/unit_testing/Jamfile.v2              |     5 +++                                     
   sandbox/assign_v2/libs/assign/v2/test/unit_testing/deque.cpp               |     4 ---                                     
   sandbox/assign_v2/libs/assign/v2/test/unit_testing/option.cpp              |    45 --------------------------------------- 
   sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp                 |     6 -----                                   
   13 files changed, 58 insertions(+), 107 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_basic.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_basic.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_basic.hpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -19,8 +19,8 @@
 #define BOOST_ASSIGN_V2_CSV_DEQUE_OVERLOAD_BASIC(z, N, is_const)\
     template<typename T, typename Options BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
     typename boost::lazy_enable_if<\
-    	is_option<Options>,\
-    	result_of::csv_deque_option<T, Options>\
+        is_option<Options>,\
+        result_of::csv_deque_option<T, Options>\
     >::type\
     csv_deque(\
         BOOST_PP_ENUM_BINARY_PARAMS(N, T, BOOST_PP_EXPR_IF(is_const, const)& _)\
@@ -56,11 +56,11 @@
 #undef BOOST_ASSIGN_V2_CSV_DEQUE_OVERLOAD_BASIC
 
 #define BOOST_ASSIGN_V2_MACRO(z, i, data) const T& BOOST_PP_CAT(_,i)
-#define BOOST_ASSIGN_V2_CSV_DEQUE_OVERLOAD_BASIC_IMPLICIT(z, N, is_const)\
+#define BOOST_ASSIGN_V2_CSV_DEQUE_OVERLOAD_BASIC_IMPLICIT(z, N, data)\
     template<typename T, typename Options>\
     typename boost::lazy_enable_if<\
-    	is_option<Options>,\
-    	result_of::csv_deque_option<T, Options>\
+        is_option<Options>,\
+        result_of::csv_deque_option<T, Options>\
     >::type\
     csv_deque( BOOST_PP_ENUM(N, BOOST_ASSIGN_V2_MACRO, ~) )\
     {\

Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -38,8 +38,8 @@
 
     template<typename T, typename Options, typename... Args>
     typename boost::lazy_enable_if<
-    	is_option<Options>,
-    	result_of::csv_deque_option<T, Options>
+        is_option<Options>,
+        result_of::csv_deque_option<T, Options>
     >::type
     csv_deque(Args&& ...  args)/*<-*/
     {

Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -35,8 +35,8 @@
     template<typename T,
         typename Options, int I, typename...Types, typename... Args>
     typename boost::enable_if<
-    	is_option<Options>,
-    	result_of::csv_deque_option<T, Options>
+        is_option<Options>,
+        result_of::csv_deque_option<T, Options>
     >::type
     csv_deque(Args&& ...  args)/*<-*/
     {

Modified: sandbox/assign_v2/boost/assign/v2/support/mpl/variadic_args_to_indices.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/support/mpl/variadic_args_to_indices.hpp	(original)
+++ sandbox/assign_v2/boost/assign/v2/support/mpl/variadic_args_to_indices.hpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -17,10 +17,10 @@
 template<typename I, typename PackHolder> struct pack_holder_size{};
 template<typename I, typename ...Args>
 struct pack_holder_size<
-	I, pack_holder<Args...>
+    I, pack_holder<Args...>
 >
 {
-	BOOST_STATIC_CONSTANT(I, value = sizeof...(Args) );
+    BOOST_STATIC_CONSTANT(I, value = sizeof...(Args) );
 };
 
 namespace mpl_aux{
@@ -61,8 +61,8 @@
     I, K, N
 >
 {
-	typedef typename collect_indices<
-    	indices<I, Head..., K>,
+    typedef typename collect_indices<
+        indices<I, Head..., K>,
         I, K + 1, N
     >::type type;
 };
@@ -70,7 +70,7 @@
 template<typename I, I N, I...Head>
 struct collect_indices<indices<I, Head...>, I, N, N>
 {
-	typedef indices<I, Head...> type;
+    typedef indices<I, Head...> type;
 };
 
 }// aux
@@ -85,22 +85,22 @@
 
 template<typename I, I N>
 struct head_indices
-	: mpl_aux::collect_indices<
-    	indices<I>, I, 0, N
+    : mpl_aux::collect_indices<
+        indices<I>, I, 0, N
     >
 {};
 
 template<typename I, I K, I N>
 struct tail_indices
-	: mpl_aux::collect_indices<
-    	indices<I, K>, I, K + 1, N
+    : mpl_aux::collect_indices<
+        indices<I, K>, I, K + 1, N
     >
 {};
 
 template<typename I, I N>
 struct tail_indices<I, N, N>
-	: mpl_aux::collect_indices<
-    	indices<I>, I, N, N
+    : mpl_aux::collect_indices<
+        indices<I>, I, N, N
     >
 {};
 

Modified: sandbox/assign_v2/libs/assign/v2/doc/put.qbk
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/doc/put.qbk	(original)
+++ sandbox/assign_v2/libs/assign/v2/doc/put.qbk	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -1,7 +1,7 @@
 [import ../test/put/csv_put_basic.cpp]
 [import ../test/put/csv_put_ext.cpp]
-[import ../test/put/delay_csv_put.cpp]
-[import ../test/put/delay_put.cpp]
+[import ../test/put/do_csv_put.cpp]
+[import ../test/put/do_put.cpp]
 [import ../test/put/put.cpp]
 
 [heading Header]
@@ -116,18 +116,18 @@
 
 [endsect][/ csv_put_ext]
 [endsect][/ csv_put]
-[section:delay_csv_put Delay_csv_put]
-[#delay_csv_put]
+[section:do_csv_put do_csv_put]
+[#do_csv_put]
 
 [heading Header]
-[@../../../../../boost/assign/v2/put/delay_csv_put.hpp [^boost/assign/v2/put/delay_csv_put.hpp]]
+[@../../../../../boost/assign/v2/put/do_csv_put.hpp [^boost/assign/v2/put/do_csv_put.hpp]]
 
 [heading Description]
 Piping version of [link csv_put `__fun_csv_put__`]
 
 [heading Synopsis]
-[import ../../../../boost/assign/v2/put/delay_csv_put.hpp]
-[syntax_delay_csv_put]
+[import ../../../../boost/assign/v2/put/do_csv_put.hpp]
+[syntax_do_csv_put]
 
 [heading Semantics]
 
@@ -137,7 +137,7 @@
                 [Description]
         ]
         [	
-		[`__cont__ | delay_csv_put<I>( args0, ..., arg( I-1 ), ..., args(n-1)I, ..., arg( nI - 1 ) )`]
+		[`__cont__ | do_csv_put<I>( args0, ..., arg( I-1 ), ..., args(n-1)I, ..., arg( nI - 1 ) )`]
                 [`__fun_csv_put__<I>( __cont__,  args0, ..., arg( I-1 ), ..., args(n-1)I, ..., arg( nI - 1 ) ); return __cont__`]
         ]
 ]
@@ -145,24 +145,24 @@
 
 [heading Example]
 
-[#ex_delay_csv_put]
+[#ex_do_csv_put]
 
 [*Example1]
-[test_delay_csv_put1]
+[test_do_csv_put1]
 
-[endsect][/delay_csv_put]
-[section:delay_put Delay_put]
-[#delay_put]
+[endsect][/do_csv_put]
+[section:do_put do_put]
+[#do_put]
 
 [heading Header]
-[@../../../../../boost/assign/v2/put/delay_put.hpp [^boost/assign/v2/put/delay_put.hpp]]
+[@../../../../../boost/assign/v2/put/do_put.hpp [^boost/assign/v2/put/do_put.hpp]]
 
 [heading Description]
 Piping version of [link csv_put `__fun_put__`]. Only overloads of `for_each`, for now, are implemented.
 
 [heading Synopsis]
-[import ../../../../boost/assign/v2/put/delay_put.hpp]
-[syntax_delay_put]
+[import ../../../../boost/assign/v2/put/do_put.hpp]
+[syntax_do_put]
 
 [heading Semantics]
 
@@ -173,11 +173,11 @@
                 [Description]
         ]
         [	
-		[`__cont__ | _delay_put.for_each<I>( __range__ )`]
+		[`__cont__ | _do_put.for_each<I>( __range__ )`]
                 [`__fun_put__.for_each<I>( __cont__, __range__ ); return __cont__`]
         ]
         [	
-		[`__cont__ | _delay_put.for_each( __range__ )`]
+		[`__cont__ | _do_put.for_each( __range__ )`]
                 [`__fun_put__.for_each( __cont__, __range__ ); return __cont__`]
         ]
 ]
@@ -185,12 +185,12 @@
 
 [heading Example]
 
-[#ex_delay_put]
+[#ex_do_put]
 
 [*Example1]
-[test_delay_put1]
+[test_do_put1]
 
-[endsect][/delay_put]
+[endsect][/do_put]
 [section:put Put]
 [#put]
 

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-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -22,7 +22,7 @@
 #include <fstream>
 #include <libs/assign/v2/speed/test.h>
 
-int main (int argc, char * const argv[])
+int main (int argc, char * const argv[])    
 {
 
     // Do not put libs/assign/v2/test/unit_testing in this project

Modified: sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_basic.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_basic.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_basic.cpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -28,18 +28,19 @@
         namespace as2 = boost::assign::v2;
         {
             //[test_csv_deque_basic1
+            typedef std::string T;
             typedef as2::result_of::csv_deque<const char[2]>::type C1;
             typedef as2::result_of::deque<char*>::type result1_;
-            typedef as2::result_of::csv_deque<std::string>::type C2;
-            typedef as2::result_of::deque<std::string>::type result2_;
+            typedef as2::result_of::csv_deque<T>::type C2;
+            typedef as2::result_of::deque<T>::type result2_;
 
             BOOST_MPL_ASSERT(( boost::is_same<C1, result1_> ));
             BOOST_MPL_ASSERT(( boost::is_same<C2, result2_> ));
 
-            C1 deque1 = as2::csv_deque( "x", "y", "z" );
-            C2 deque2 = as2::csv_deque<std::string>( "x", "y", "z" );
+            C1 deque1 = as2::csv_deque( "x", "y", "z" ); // Implicit
+            C2 deque2 = as2::csv_deque<T>( "x", "y", "z" ); // Explicit
 
-            std::deque<std::string> benchmark;
+            std::deque<T> benchmark;
             benchmark.push_back( "x" );
             benchmark.push_back( "y" );
             benchmark.push_back( "z" );

Modified: sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_ext.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_ext.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_ext.cpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -29,12 +29,12 @@
         namespace as2 = boost::assign::v2;
 //<-
 #if BOOST_ASSIGN_V2_ENABLE_CPP0X
-		using std;
+        using namespace std;
 #else
-		using boost;
-#endif 
+        using namespace boost;
+#endif
 //->
-        
+
         {
             //[test_csv_deque_ext1
             typedef const char state_ [3]; typedef int code_;

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-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -7,7 +7,7 @@
 //  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 <cmath> // MSVC #include <math.h>
+#include <cmath>
 #include <deque>
 #include <list>
 #include <map>

Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/Jamfile.v2
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/Jamfile.v2	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/Jamfile.v2	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -19,9 +19,12 @@
     [ assign-test chain ]
     [ assign-test conversion ]
     [ assign-test deque ]
+    [ assign-test csv_deque ]
     [ assign-test interpreter ]
-    [ assign-test option ]
+    [ assign-test option_data ]
+    [ assign-test option_modifier ]
     [ assign-test put ]
+    [ assign-test csv_put ]
     [ assign-test ref ]
     [ assign-test support ]
 ;

Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/deque.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/deque.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/deque.cpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -12,8 +12,6 @@
 #include <boost/test/test_tools.hpp>
 #define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
 
-#include <libs/assign/v2/test/deque/csv_deque_basic.cpp>
-#include <libs/assign/v2/test/deque/csv_deque_ext.cpp>
 #include <libs/assign/v2/test/deque/deque.cpp>
 
 #include <boost/test/unit_test.hpp>
@@ -25,8 +23,6 @@
     {
         namespace ns = xxx_deque;
         test->add( BOOST_TEST_CASE( &ns::xxx_deque::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_csv_deque_basic::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_csv_deque_ext::test ) );
     }
     return test;
 }

Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/option.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/option.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/option.cpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -1,44 +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_UNIT_TEST_OPTION_ER_2010_CPP
-#define LIBS_ASSIGN_V2_TEST_UNIT_TEST_OPTION_ER_2010_CPP
-
-#include <boost/test/test_tools.hpp>
-#define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
-
-#include <libs/assign/v2/test/option/data.cpp>
-#include <libs/assign/v2/test/option/iterate.cpp>
-#include <libs/assign/v2/test/option/list.cpp>
-#include <libs/assign/v2/test/option/mapped.cpp>
-#include <libs/assign/v2/test/option/repeat.cpp>
-#include <libs/assign/v2/test/option/row_major.cpp>
-#include <libs/assign/v2/test/option/std_modifier.cpp>
-
-#include <boost/test/unit_test.hpp>
-using boost::unit_test::test_suite;
-test_suite* init_unit_test_suite( int argc, char* argv[] )
-{
-    test_suite* test = BOOST_TEST_SUITE( "BOOST_ASSIGN_V2" );
-    using namespace test_assign_v2;
-    {
-        namespace ns = xxx_option;
-        test->add( BOOST_TEST_CASE( &ns::xxx_data::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_iterate::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_list::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_mapped::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_repeat::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_row_major::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_std_modifier::test ) );
-    }
-    return test;
-}
-
-#endif // LIBS_ASSIGN_V2_TEST_UNIT_TEST_OPTION_ER_2010_CPP
-
+// TODO remove file

Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp	2011-06-09 12:20:44 EDT (Thu, 09 Jun 2011)
@@ -13,10 +13,7 @@
 #include <boost/test/test_tools.hpp>
 #define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
 
-#include <libs/assign/v2/test/put/csv_put_basic.cpp>
-#include <libs/assign/v2/test/put/csv_put_ext.cpp>
 #include <libs/assign/v2/test/put/put.cpp>
-#include <libs/assign/v2/test/put/do_csv_put.cpp>
 #include <libs/assign/v2/test/put/do_put.cpp>
 
 #include <boost/test/unit_test.hpp>
@@ -29,9 +26,6 @@
         namespace ns = xxx_put;
         test->add( BOOST_TEST_CASE( &ns::xxx_put::test ) );
         test->add( BOOST_TEST_CASE( &ns::xxx_do_put::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_csv_put_basic::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_csv_put_ext::test ) );
-        test->add( BOOST_TEST_CASE( &ns::xxx_do_csv_put::test ) );
     }
     return test;
 }