Subject: [Boost-commit] svn:boost r56576 - in trunk/libs/fusion: doc test/sequence
From: joel_at_[hidden]
Date: 2009-10-04 12:59:51
Author: djowel
Date: 2009-10-04 12:59:50 EDT (Sun, 04 Oct 2009)
New Revision: 56576
URL: http://svn.boost.org/trac/boost/changeset/56576
Log:
BOOST_FUSION_ADAPT_CLASS
Added:
trunk/libs/fusion/test/sequence/adapt_class.cpp (contents, props changed)
trunk/libs/fusion/test/sequence/test_deduce_sequence.cpp (contents, props changed)
Text files modified:
trunk/libs/fusion/doc/container.qbk | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
Modified: trunk/libs/fusion/doc/container.qbk
==============================================================================
--- trunk/libs/fusion/doc/container.qbk (original)
+++ trunk/libs/fusion/doc/container.qbk 2009-10-04 12:59:50 EDT (Sun, 04 Oct 2009)
@@ -716,9 +716,7 @@
[heading Example]
- make_map(
- __fusion_make_pair__<int>('X')
- , __fusion_make_pair__<double>("Men"))
+ make_map<int, double>('X', "Men")
[heading See also]
Added: trunk/libs/fusion/test/sequence/adapt_class.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/fusion/test/sequence/adapt_class.cpp 2009-10-04 12:59:50 EDT (Sun, 04 Oct 2009)
@@ -0,0 +1,118 @@
+/*=============================================================================
+ 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.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/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/support/is_view.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;
+ };
+}
+
+BOOST_FUSION_ADAPT_CLASS(
+ ns::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<ns::point>));
+ ns::point p(123, 456);
+
+ 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<ns::point>::value == 2);
+ BOOST_STATIC_ASSERT(!result_of::empty<ns::point>::value);
+
+ BOOST_TEST(front(p) == 6);
+ BOOST_TEST(back(p) == 9);
+ }
+
+ {
+ fusion::vector<int, float> v1(4, 2);
+ ns::point v2(5, 3);
+ 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 p(5, 3);
+ fusion::vector<int, short> v(p);
+ v = p;
+ }
+
+ {
+ // conversion from ns::point to list
+ ns::point p(5, 3);
+ fusion::list<int, short> l(p);
+ l = p;
+ }
+
+ return boost::report_errors();
+}
+
Added: trunk/libs/fusion/test/sequence/test_deduce_sequence.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/fusion/test/sequence/test_deduce_sequence.cpp 2009-10-04 12:59:50 EDT (Sun, 04 Oct 2009)
@@ -0,0 +1,16 @@
+
+#include <boost/mpl/vector.hpp>
+#include <boost/fusion/support.hpp>
+
+typedef boost::fusion::traits::deduce_sequence <
+
+boost::mpl::vector<int, char>
+
+>::type seq1_t;
+
+
+typedef boost::fusion::traits::deduce_sequence <
+
+boost::fusion::vector<int, char>
+
+>::type seq2_t;