[Boost-commit] svn:boost r61304 - in sandbox/statistics/detail/assign: boost/assign/auto_size/check boost/assign/auto_size/detail boost/assign/auto_size/range libs/assign/doc libs/assign/example libs/assign/src

Subject: [Boost-commit] svn:boost r61304 - in sandbox/statistics/detail/assign: boost/assign/auto_size/check boost/assign/auto_size/detail boost/assign/auto_size/range libs/assign/doc libs/assign/example libs/assign/src
From: erwann.rogard_at_[hidden]
Date: 2010-04-15 19:33:39

Author: e_r
Date: 2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
New Revision: 61304
URL: http://svn.boost.org/trac/boost/changeset/61304

Log:
m
Text files modified: 
   sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_l.hpp       |     1                                         
   sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_r.hpp       |     1                                         
   sandbox/statistics/detail/assign/boost/assign/auto_size/detail/expr.hpp         |   120 ----------------------------------------
   sandbox/statistics/detail/assign/boost/assign/auto_size/range/chain.hpp         |    24 +++++++-                                
   sandbox/statistics/detail/assign/boost/assign/auto_size/range/convert_range.hpp |     3 +                                       
   sandbox/statistics/detail/assign/libs/assign/doc/revision_history.txt           |     1                                         
   sandbox/statistics/detail/assign/libs/assign/example/range.cpp                  |    43 +++++++------                           
   sandbox/statistics/detail/assign/libs/assign/src/main.cpp                       |     5 +                                       
   8 files changed, 54 insertions(+), 144 deletions(-)

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_l.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_l.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_l.hpp	2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
@@ -11,6 +11,7 @@
 #include <boost/array.hpp>
 #include <boost/typeof/typeof.hpp>
 #include <boost/range/algorithm/copy.hpp>
+#include <boost/assign/auto_size/range/chain_l.hpp>
 #include <boost/assign/auto_size/range/chain.hpp>
 #include <boost/assign/auto_size/check/iterator.hpp>
 #include <boost/assign/auto_size/check/constants.hpp>

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_r.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_r.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_r.hpp	2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
@@ -12,6 +12,7 @@
 #include <boost/typeof/typeof.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/assign/auto_size/range/chain.hpp>
+#include <boost/assign/auto_size/range/chain_r.hpp>
 #include <boost/assign/auto_size/check/iterator.hpp>
 #include <boost/assign/auto_size/check/constants.hpp>
 #include <boost/assign/auto_size/check/copy_iterator.hpp>

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/detail/expr.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/detail/expr.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/detail/expr.hpp	2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
@@ -250,126 +250,6 @@
     struct n_th_expr_rebind 
         : meta::n_th_expr_rebind<T,P>::template apply<N>{};
 
-// Older stuff to be phased out
-/* 
-    // ---- insert_range ---- //
-
-    namespace result_of{
-        template<int K,typename E,typename I>
-        struct insert_range
-        {
-    	    typedef E curr_;
-            typedef typename E::alt_result_type result_;
-            typedef insert_range<K-1,result_,I> iter_;
-            typedef typename iter_::type type;
-        
-            static type call(const E& e,I i){
-                BOOST_CONCEPT_ASSERT(
-                    (boost_concepts::ForwardTraversalConcept<I>));
-                return iter_::call(e.alt(*i),boost::next(i));
-            }
-    	
-        };
-
-        template<typename E,typename I>
-        struct insert_range<0,E,I>
-        {
-            typedef E type;        
-            static type call(const E& e,I i){
-                return e;
-            }
-        };
-    }
-
-    template<int K,typename E,typename I>
-    typename result_of::insert_range<K,E,I>::type
-    insert_range(const E& e,I i){
-        typedef result_of::insert_range<K,E,I> result_;
-        return result_::call(e,i);
-    }
-
-
-        typedef typename boost::mpl::if_c<F,const E&,E>::type storage_;
-
-        template<int K,typename I>
-        struct result_of_range 
-            : auto_size::result_of::insert_range<K,expr,I>{};
-
-        template<int K,typename Range>
-        struct result_of_range2 : result_of_range<
-            K, typename boost::range_iterator<Range>::type>{};
-
-        template<typename Range>
-        struct result_of_range3 : result_of_range2<
-            auto_size::static_size<
-                typename boost::remove_const<Range>::type>::value, Range>{};
-        public:       
-
-        typedef typename boost::mpl::if_<is_first_,E,storage_>::type previous_;
-        typedef typename boost::mpl::equal_to<int_n_,int_1_>::type is_first_;
-        typedef typename boost::mpl::if_<is_first_,E,ref_to_previous_>::type previous_;
-        typedef typename next<expr>::type result_type;
-
-        typedef typename alt_next<expr>::type alt_result_type;
-
-        explicit expr(const E& p,T& t):previous(p),ref(t){} 
-        // Needed by csv.hpp :
-        template<typename E1,typename P1,bool F1>
-        explicit expr(const expr<E1,T,N,R,P1,F1>& that)
-            :super_(that)
-            ,previous(that.previous)            
-            ,ref(that.ref){}
-
-        result_type operator()(T& t)const{ return result_type(*this,t); }
-        
-        // ---- range() ----
-        alt_result_type alt(T& t)const{ return alt_result_type(*this,t); }
-        
-        template<int K,typename I>
-        typename result_of_range<K,I>::type
-        range(I b,I e)const{
-            BOOST_ASSERT(std::distance(b,e)>=K);
-            typedef result_of_range<K,I> result_; 
-            return result_::call(*this,b);
-        }
-
-        template<int K,typename Range>
-        typename result_of_range2<K,Range>::type
-        range(Range& r)const{    	
-            return this->range<K>(
-                boost::begin(r),
-                boost::end(r)
-            );
-        }
-
-        template<int K,typename Range>
-        typename result_of_range2<K,const Range>::type
-        range(const Range& r)const{    	
-            return this->range<K>(
-            	boost::begin(r),
-                boost::end(r)
-            );
-        }
-
-        template<typename Range>
-        typename boost::lazy_enable_if_c<
-            has_static_size<Range>::value,
-            result_of_range3<Range>
-        >::type
-        range(Range& r){ 
-            return this->range<auto_size::static_size<Range>::value>(r); 
-        }
-
-        template<typename Range>
-        typename boost::lazy_enable_if_c<
-            has_static_size<Range>::value,
-            result_of_range3<const Range>
-        >::type
-        range(const Range& r){
-            return this->range<auto_size::static_size<Range>::value>(r); 
-        }
-*/
-
 }// auto_size  
 }// detail      
 }// assign

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/range/chain.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/range/chain.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/range/chain.hpp	2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
@@ -134,6 +134,7 @@
         struct result_impl 
             { typedef expr<list_,impl_,Rng2,false,V,R,add_const> type; };
   
+
         template<typename Rng2> // Warning : overrides base.
         typename result_impl<Rng2>::type
         operator()(Rng2& r2,typename enable<Rng2,!add_const>::type* = 0)
@@ -158,6 +159,7 @@
             );            
         }
 
+
         // This macro solves compiler complaints that otherwise would occur if
         // assign_detail::converter<> were a base
         BOOST_ASSIGN_AS_CONVERTER(this_)
@@ -173,10 +175,10 @@
         static type call(cr1_& r1){ return type(r1); }
     };
 
+/*
     template<typename Rng1,typename V,
       typename R = typename detail::convert_range_reference<Rng1,V>::type>
     struct first_expr_l : chain_impl::first_expr<Rng1,V,R,false>{};
-
     // It's necessary to take add_const<V> or else non-rvalues may occur e.g.
     // Rng1 = array<ref_wrapper<int>,1> and V = int, then R = int*.
     template<typename Rng1,typename V,
@@ -185,6 +187,7 @@
     struct first_expr_r 
         : chain_impl::first_expr<
             Rng1,typename boost::add_const<V>::type,R,true>{};
+*/
 
     template<typename Rng1,bool add_const>
     struct deduce_value{
@@ -194,9 +197,22 @@
         typedef typename basic_chain_impl::sel_const<to_,add_const>::type type;
     };
 
-}// chain_l_impl
+/*
+    template<typename Rng1>
+    struct deduce_first_expr_l : detail::chain_impl::first_expr_l<
+        Rng1, typename detail::chain_impl::deduce_value<Rng1,false>::type
+    >{};
+    template<typename Rng1>
+    struct deduce_first_expr_r : detail::chain_impl::first_expr_r<
+        Rng1, typename detail::chain_impl::deduce_value<
+        const Rng1,true>::type
+    >{};
+*/
+
+}// chain_impl
 }// detail
 
+/*
     // lvalue
 
     template<typename V,typename R,typename Rng1>
@@ -230,7 +246,6 @@
         typedef detail::chain_impl::first_expr_l<Rng1,val_> caller_;
         return caller_::call(r1);
     }
-
     // rvalue : Warning: if is_const<V> != true, R must be value, not a ref. 
 
     template<typename V,typename R,typename Rng1>
@@ -266,6 +281,9 @@
         return caller_::call(r1);
     }
 
+*/
+
+
 }// assign
 }// boost
 

Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/range/convert_range.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/range/convert_range.hpp	(original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/range/convert_range.hpp	2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
@@ -53,6 +53,9 @@
 }// result_of
 }// detail
 
+    // Usage
+    //     convert_range<V>(rng);
+
     // lvalue
 
     template<typename V,typename R,typename Rng>

Modified: sandbox/statistics/detail/assign/libs/assign/doc/revision_history.txt
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/doc/revision_history.txt	(original)
+++ sandbox/statistics/detail/assign/libs/assign/doc/revision_history.txt	2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
@@ -1,5 +1,6 @@
 // Revision history:
 //
+// April 15, 2010 chain_l(a)(b)(c) becomes a && b && c 
 // March 25, 2010 
 // in write_to_array, replaced 
 //        a[Nshift+N-1] = e.ref;

Modified: sandbox/statistics/detail/assign/libs/assign/example/range.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/example/range.cpp	(original)
+++ sandbox/statistics/detail/assign/libs/assign/example/range.cpp	2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
@@ -12,6 +12,8 @@
 #include <boost/assign/auto_size/ref_list_of.hpp>
 #include <boost/assign/auto_size/range/basic_chain.hpp>
 #include <boost/assign/auto_size/range/chain.hpp>
+#include <boost/assign/auto_size/range/chain_l.hpp>
+#include <boost/assign/auto_size/range/chain_r.hpp>
 #include <boost/assign/auto_size/range/convert_range.hpp>
 
 #include <libs/assign/example/range.h>
@@ -33,46 +35,47 @@
     ar_ ar5; ar5.assign( 3 );
     ar_ ar6; ar6.assign( 6 );
 
-    typedef boost::array<detail::assign_reference_copy<val_>,1> ref_array_;
+    typedef boost::assign::detail::auto_size::n_th_expr_copy<val_,2>::type inp_;
 
-    ar1 = ref_list_of(a)(b);
+    typedef detail::result_of::convert_range<ar_,val_>::type range_;
 
+    typedef boost::range_reference<range_>::type ref_;
+//    typedef boost::assign::detail::reference_traits::convert_to<ref_>::type to_;
+
+    BOOST_MPL_ASSERT(( boost::is_same<ref_,val_&> ));    
+    
 {   
-/*
 
-    BOOST_AUTO(tmp1,ref_list_of(a)(b));
-    BOOST_AUTO(tmp2,ref_list_of(c)(d));
-    BOOST_AUTO(tmp3,ref_list_of(e)(f));
+    BOOST_AUTO(tmp1, ref_list_of(a)(b) );
+    BOOST_AUTO(tmp2, ref_list_of(c)(d) );
+    BOOST_AUTO(tmp3, ref_list_of(e)(f) );
 
     typedef std::vector<val_> vec_;
 
-    tmp1.convert_to_container<std::vector<val_> >();
-
-    vec_ v = chain_r(tmp1)(tmp2)(tmp3).convert_to_container<vec_>();
-    boost::copy(
-        v,
-        std::ostream_iterator<val_>(os," "));
-
-    os << " chain_l(tmp1)(tmp2)(tmp3) = (";
+    os << " tmp1 && tmp2 && tmp3 = (";
     boost::copy(
-        chain_l(tmp1)(ar5)(tmp3),
+        tmp1 && tmp2 && tmp3,
         std::ostream_iterator<val_>(os," ")
     ); 
+
+    tmp1 && ar5 && ref_list_of(e)(f);
+
     os <<  ") becomes (";
     boost::copy(
-        chain_l(ar1)(ar2)(ar3),
-        boost::begin(chain_l(tmp1)(ar5)(tmp3))
+        ar1 && ar2 && ar3 ,
+        boost::begin( tmp1 && ar5 && tmp3 )
     );  
     boost::copy(
-        chain_l(tmp1)(ar5)(tmp3),
+        tmp1 && ar5 && tmp3,
         std::ostream_iterator<val_>(os," ")
     );
     os << ") should equal (";
     boost::copy(
-        chain_l(ar1)(ar2)(ar3),
+        ar1 && ar2 && ar3,
         std::ostream_iterator<val_>(os," ")
     ); os << ')' << std::endl;
-*/
+
+
 }
         os << "<- " << std::endl;
     

Modified: sandbox/statistics/detail/assign/libs/assign/src/main.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/src/main.cpp	(original)
+++ sandbox/statistics/detail/assign/libs/assign/src/main.cpp	2010-04-15 19:33:38 EDT (Thu, 15 Apr 2010)
@@ -1,7 +1,7 @@
 #include <iostream>
 #define BOOST_ASSIGN_CHECK_EQUAL(a,b) BOOST_ASSERT(a==b)
 #include <boost/assign/auto_size/check/ref_list_of.hpp>
-#include <boost/assign/auto_size/check/ref_csv.hpp>
+//#include <boost/assign/auto_size/check/ref_csv.hpp>
 #undef BOOST_ASSIGN_CHECK_EQUAL
 #include <libs/assign/example/range.h>
 
@@ -74,6 +74,7 @@
        (*fp)();
     }
     std::cout << "check_ref_list_of : ok" << std::endl;
+/*
     {   // 1
         fp = check_ref_csv_example1<int>;
        (*fp)();
@@ -134,6 +135,8 @@
         fp = check_ref_csv_example2<int>;
        (*fp)();
     }
+    
+*/    
     std::cout << "check_ref_csv : ok" << std::endl;
 
     return 0;