[Boost-commit] svn:boost r59341 - in trunk/libs/fusion: doc/html test test/sequence

Subject: [Boost-commit] svn:boost r59341 - in trunk/libs/fusion: doc/html test test/sequence
From: hartmut.kaiser_at_[hidden]
Date: 2010-01-29 10:04:58

Author: hkaiser
Date: 2010-01-29 10:04:57 EST (Fri, 29 Jan 2010)
New Revision: 59341
URL: http://svn.boost.org/trac/boost/changeset/59341

Log:
Fusion: added tests for adapt_class_named
Added:
   trunk/libs/fusion/test/sequence/adapt_class_named.cpp   (contents, props changed)
Properties modified: 
   trunk/libs/fusion/doc/html/   (props changed)
Text files modified: 
   trunk/libs/fusion/test/Jamfile                         |     2 ++                                      
   trunk/libs/fusion/test/sequence/adapt_struct_named.cpp |     2 ++                                      
   2 files changed, 4 insertions(+), 0 deletions(-)

Modified: trunk/libs/fusion/test/Jamfile
==============================================================================
--- trunk/libs/fusion/test/Jamfile	(original)
+++ trunk/libs/fusion/test/Jamfile	2010-01-29 10:04:57 EST (Fri, 29 Jan 2010)
@@ -110,6 +110,8 @@
     [ run sequence/adapt_struct.cpp : : : : ]
     [ run sequence/adapt_assoc_struct.cpp : : : : ]
     [ run sequence/adapt_struct_named.cpp : : : : ]
+    [ run sequence/adapt_class.cpp : : : : ]
+    [ run sequence/adapt_class_named.cpp : : : : ]
 
     [ run functional/fused.cpp : : : : ]
     [ run functional/fused_function_object.cpp : : : : ]

Added: trunk/libs/fusion/test/sequence/adapt_class_named.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/fusion/test/sequence/adapt_class_named.cpp	2010-01-29 10:04:57 EST (Fri, 29 Jan 2010)
@@ -0,0 +1,137 @@
+/*=============================================================================
+    Copyright (c) 2001-2009 Joel de Guzman
+
+    Distributed under 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/detail/lightweight_test.hpp>
+#include <boost/fusion/adapted/class/adapt_class_named.hpp>
+#include <boost/fusion/sequence/intrinsic/at.hpp>
+#include <boost/fusion/sequence/intrinsic/size.hpp>
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
+#include <boost/fusion/sequence/intrinsic/front.hpp>
+#include <boost/fusion/sequence/intrinsic/back.hpp>
+#include <boost/fusion/sequence/intrinsic/value_at.hpp>
+#include <boost/fusion/sequence/io/out.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/sequence/comparison/equal_to.hpp>
+#include <boost/fusion/sequence/comparison/not_equal_to.hpp>
+#include <boost/fusion/sequence/comparison/less.hpp>
+#include <boost/fusion/sequence/comparison/less_equal.hpp>
+#include <boost/fusion/sequence/comparison/greater.hpp>
+#include <boost/fusion/sequence/comparison/greater_equal.hpp>
+#include <boost/fusion/mpl.hpp>
+#include <boost/fusion/support/is_view.hpp>
+#include <boost/mpl/front.hpp>
+#include <boost/mpl/is_sequence.hpp>
+#include <boost/mpl/assert.hpp>
+#include <iostream>
+#include <string>
+
+namespace ns
+{
+    class point
+    {
+    public:
+    
+        point() : x(0), y(0) {}
+        point(int x, int y) : x(x), y(y) {}
+            
+        int get_x() const { return x; }
+        int get_y() const { return y; }
+        void set_x(int x_) { x = x_; }
+        void set_y(int y_) { y = y_; }
+        
+    private:
+        
+        int x;
+        int y;
+    };
+}
+
+// this creates a fusion view: boost::fusion::adapted::point
+BOOST_FUSION_ADAPT_CLASS_NAMED(
+    ns::point, point,
+    (int, int, obj.get_x(), obj.set_x(val))
+    (int, int, obj.get_y(), obj.set_y(val))
+)
+
+int
+main()
+{
+    using namespace boost::fusion;
+    using namespace boost;
+    using namespace std;
+
+    std::cout << tuple_open('[');
+    std::cout << tuple_close(']');
+    std::cout << tuple_delimiter(", ");
+
+    {
+        BOOST_MPL_ASSERT_NOT((traits::is_view<adapted::point>));
+        ns::point basep(123, 456);
+        adapted::point p(basep);
+
+        std::cout << at_c<0>(p) << std::endl;
+        std::cout << at_c<1>(p) << std::endl;
+        std::cout << p << std::endl;
+        BOOST_TEST(p == make_vector(123, 456));
+
+        at_c<0>(p) = 6;
+        at_c<1>(p) = 9;
+        BOOST_TEST(p == make_vector(6, 9));
+
+        BOOST_STATIC_ASSERT(result_of::size<adapted::point>::value == 2);
+        BOOST_STATIC_ASSERT(!result_of::empty<adapted::point>::value);
+
+        BOOST_TEST(front(p) == 6);
+        BOOST_TEST(back(p) == 9);
+    }
+
+    {
+        fusion::vector<int, float> v1(4, 2);
+        ns::point basep(5, 3);
+        adapted::point v2(basep);
+
+        fusion::vector<long, double> v3(5, 4);
+        BOOST_TEST(v1 < v2);
+        BOOST_TEST(v1 <= v2);
+        BOOST_TEST(v2 > v1);
+        BOOST_TEST(v2 >= v1);
+        BOOST_TEST(v2 < v3);
+        BOOST_TEST(v2 <= v3);
+        BOOST_TEST(v3 > v2);
+        BOOST_TEST(v3 >= v2);
+    }
+
+    {
+        // conversion from ns::point to vector
+        ns::point basep(5, 3);
+        adapted::point p(basep);
+
+        fusion::vector<int, short> v(p);
+        v = p;
+    }
+
+    {
+        // conversion from ns::point to list
+        ns::point basep(5, 3);
+        adapted::point p(basep);
+
+        fusion::list<int, short> l(p);
+        l = p;
+    }
+
+    {
+        BOOST_MPL_ASSERT((mpl::is_sequence<adapted::point>));
+        BOOST_MPL_ASSERT((boost::is_same<
+            fusion::result_of::value_at_c<adapted::point,0>::type
+          , mpl::front<adapted::point>::type>));
+    }
+
+    return boost::report_errors();
+}
+

Modified: trunk/libs/fusion/test/sequence/adapt_struct_named.cpp
==============================================================================
--- trunk/libs/fusion/test/sequence/adapt_struct_named.cpp	(original)
+++ trunk/libs/fusion/test/sequence/adapt_struct_named.cpp	2010-01-29 10:04:57 EST (Fri, 29 Jan 2010)
@@ -40,12 +40,14 @@
     };
 }
 
+// this creates a fusion view: boost::fusion::adapted::point
 BOOST_FUSION_ADAPT_STRUCT_NAMED(
     ns::point, point,
     (int, x)
     (int, y)
 )
 
+// this creates a fusion view: ns1::s1
 struct s { int m; };
 BOOST_FUSION_ADAPT_STRUCT_NAMED_NS(s, (ns1), s1, (int, m))