[Boost-commit] svn:boost r70372 - in sandbox/assign_v2/libs/assign/v2: . test/framework test/optional test/put/pipe/optional

Subject: [Boost-commit] svn:boost r70372 - in sandbox/assign_v2/libs/assign/v2: . test/framework test/optional test/put/pipe/optional
From: erwann.rogard_at_[hidden]
Date: 2011-03-21 18:01:13

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

Log:
upd assign_v2
Text files modified: 
   sandbox/assign_v2/libs/assign/v2/test/framework/modifier.cpp       |     2 +-                                      
   sandbox/assign_v2/libs/assign/v2/test/optional/fun.cpp             |    10 +++++-----                              
   sandbox/assign_v2/libs/assign/v2/test/optional/fun.h               |     6 +++---                                  
   sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp          |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.cpp    |     6 +++---                                  
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.h      |     6 +++---                                  
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp |     4 ++--                                    
   sandbox/assign_v2/libs/assign/v2/tutorial.cpp                      |     2 +-                                      
   8 files changed, 20 insertions(+), 20 deletions(-)

Modified: sandbox/assign_v2/libs/assign/v2/test/framework/modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/framework/modifier.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/framework/modifier.cpp	2011-03-21 18:01:11 EDT (Mon, 21 Mar 2011)
@@ -23,7 +23,7 @@
 #include <boost/ptr_container/ptr_list.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
-#include <boost/assign/v2/framework/modifier.hpp>
+#include <boost/assign/v2/interpreter/modifier.hpp>
 #include <libs/assign/v2/test/framework/modifier.h>
 
 namespace test_assign_v2{

Modified: sandbox/assign_v2/libs/assign/v2/test/optional/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/fun.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/fun.cpp	2011-03-21 18:01:11 EDT (Mon, 21 Mar 2011)
@@ -16,7 +16,7 @@
 #include <boost/assign/v2/deque.hpp>
 #include <boost/assign/v2/put/put.hpp>
 // Options come next
-#include <boost/assign/v2/optional/fun.hpp>
+#include <boost/assign/v2/optional/data.hpp>
 #include <boost/function.hpp>
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>
@@ -36,12 +36,12 @@
         namespace as2 = assign::v2;
         {
                 // (*fp) resolves error C2440 using MSVC
-            //[test_optional_fun_math
+            //[test_optional_data_math
             std::vector<double> exponent;
             typedef double(*fp)(double);
             typedef function<double(double)> f_;
             (
-                as2::put( exponent ) % ( as2::_fun = 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();
@@ -50,13 +50,13 @@
             //]
         }
         {
-            //[test_optional_fun_recursive
+            //[test_optional_data_recursive
                 using namespace lambda;
             int i = 1, k = 1;
             BOOST_AUTO(
                 factorials, (
                     as2::deque<int>( as2::_nil ) % (
-                        as2::_fun = ( var(k) *= ( var(i)++ ) )
+                        as2::_data = ( var(k) *= ( var(i)++ ) )
                     )
                 )/*<<Equivalent to `factorials( k *= i++ )` for [^i = 1, ..., 5]>>*/()()()()()
             );

Modified: sandbox/assign_v2/libs/assign/v2/test/optional/fun.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/fun.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/fun.h	2011-03-21 18:01:11 EDT (Mon, 21 Mar 2011)
@@ -7,8 +7,8 @@
 //  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_OPTIONAL_FUN_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_OPTIONAL_FUN_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_OPTIONAL_DATA_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_OPTIONAL_DATA_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_optional{
@@ -20,4 +20,4 @@
 }// xxx_optional
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_OPTIONAL_FUN_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_OPTIONAL_DATA_ER_2010_H

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:01:11 EDT (Mon, 21 Mar 2011)
@@ -14,7 +14,7 @@
 #include <boost/assign/v2/put/put.hpp>
 #include <boost/assign/v2/deque.hpp>
 // Options come next
-#include <boost/assign/v2/optional/fun.hpp>
+#include <boost/assign/v2/optional/data.hpp>
 #include <boost/assign/v2/optional/lookup.hpp> 
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/assert.hpp>
@@ -55,7 +55,7 @@
             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::_fun = _1 ) %  ( as2::_lookup = ( _1 = 31 ) ) 
+                    % ( as2::_data = _1 ) %  ( as2::_lookup = ( _1 = 31 ) ) 
             )/*<<Calls `year["jan"] = 31` etc.>>*/( "jan" )( "mar" )( "may" )( "jul" )( "aug" )( "oct" )( "dec" );
             
             BOOST_ASSIGN_V2_CHECK( year["jan"] == 31 );

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.cpp	2011-03-21 18:01:11 EDT (Mon, 21 Mar 2011)
@@ -14,7 +14,7 @@
 #include <boost/assign/v2/deque/csv_deque.hpp>
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 // Options come next
-#include <boost/assign/v2/optional/fun.hpp>
+#include <boost/assign/v2/optional/data.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <libs/assign/v2/test/put/pipe/optional/fun.h>
@@ -30,14 +30,14 @@
         using namespace boost;
         namespace as2 = assign::v2;
         {
-            //[test_put_pipe_optional_fun_math
+            //[test_put_pipe_optional_data_math
             int k = 1; std::list<int> factorials;
                 using namespace lambda;
             
             BOOST_ASSIGN_V2_CHECK(
                 range::equal(
                     factorials | ( 
-                        as2::_csv_put % ( as2::_fun = ( var(k) *= _1 ) ) 
+                        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 )
                 )

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.h	(original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.h	2011-03-21 18:01:11 EDT (Mon, 21 Mar 2011)
@@ -7,8 +7,8 @@
 //  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_PIPE_OPTIONAL_FUN_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_FUN_ER_2010_H
+#ifndef LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_DATA_ER_2010_H
+#define LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_DATA_ER_2010_H
 
 namespace test_assign_v2{
 namespace xxx_put{
@@ -24,4 +24,4 @@
 }// xxx_value
 }// xxx_test_assign
 
-#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_FUN_ER_2010_H
+#endif // LIBS_ASSIGN_V2_TEST_PUT_PIPE_OPTIONAL_DATA_ER_2010_H

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:01:11 EDT (Mon, 21 Mar 2011)
@@ -14,7 +14,7 @@
 #include <boost/assign/v2/detail/config/check.hpp>
 #include <boost/assign/v2/put/pipe/csv_put.hpp>
 // Options come next
-#include <boost/assign/v2/optional/fun.hpp>
+#include <boost/assign/v2/optional/data.hpp>
 #include <boost/assign/v2/optional/lookup.hpp>
 #include <libs/assign/v2/test/put/pipe/optional/lookup.h>
 
@@ -32,7 +32,7 @@
             //[test_put_pipe_modifier_lookup
                 using namespace lambda;
             typedef std::map<std::string, int> C; C cal;
-            BOOST_AUTO( _local, ( as2::_fun = _1 ) );
+            BOOST_AUTO( _local, ( as2::_data = _1 ) );
             BOOST_ASSIGN_V2_CHECK(
                 (
                     cal 

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-21 18:01:11 EDT (Mon, 21 Mar 2011)
@@ -102,7 +102,7 @@
             //]
         }
         {
-            //[tutorial_parametrization
+            //[tutorial_optional
             using namespace lambda;
             typedef int T; array<T, 4> powers = converter( csv_deque( 1, 10, -1, -1 ) );
             std::size_t index = 2; ( put( powers ) % ( _iterate = var( index )++ ) )( 100 )( 1000 );