From: hartmut.kaiser_at_[hidden]
Date: 2008-07-19 10:23:10
Author: hkaiser
Date: 2008-07-19 10:23:10 EDT (Sat, 19 Jul 2008)
New Revision: 47600
URL: http://svn.boost.org/trac/boost/changeset/47600
Log:
Spirit: Split the pattern test (it timed out on one of the platforms)
Added:
trunk/libs/spirit/test/karma/pattern2.cpp (contents, props changed)
Text files modified:
trunk/libs/spirit/test/Jamfile | 3 +
trunk/libs/spirit/test/karma/pattern.cpp | 56 ----------------------------------------
2 files changed, 2 insertions(+), 57 deletions(-)
Modified: trunk/libs/spirit/test/Jamfile
==============================================================================
--- trunk/libs/spirit/test/Jamfile (original)
+++ trunk/libs/spirit/test/Jamfile 2008-07-19 10:23:10 EDT (Sat, 19 Jul 2008)
@@ -79,7 +79,8 @@
[ run karma/lit.cpp : : : : karma_lit ]
[ run karma/none.cpp : : : : karma_none ]
[ run karma/optional.cpp : : : : karma_optional ]
- [ run karma/pattern.cpp : : : : ]
+ [ run karma/pattern.cpp : : : : karma_pattern ]
+ [ run karma/pattern2.cpp : : : : karma_pattern2 ]
[ run karma/real_numerics.cpp : : : : ]
[ run karma/right_alignment.cpp : : : : ]
[ run karma/sequence.cpp : : : : karma_sequence ]
Modified: trunk/libs/spirit/test/karma/pattern.cpp
==============================================================================
--- trunk/libs/spirit/test/karma/pattern.cpp (original)
+++ trunk/libs/spirit/test/karma/pattern.cpp 2008-07-19 10:23:10 EDT (Sat, 19 Jul 2008)
@@ -36,62 +36,6 @@
typedef spirit_test::output_iterator<char>::type outiter_type;
- // basic tests
- {
- rule<outiter_type> start;
-
- start = char_[_1 = 'a'] << int_[_1 = 10] << double_[_1 = 12.4];
- BOOST_TEST(test("a1012.4", start));
-
- start = (char_ << int_ << double_)[_1 = 'a', _2 = 10, _3 = 12.4];
- BOOST_TEST(test("a1012.4", start));
-
- rule<outiter_type> a, b, c;
- a = char_[_1 = 'a'];
- b = int_[_1 = 10];
- c = double_[_1 = 12.4];
-
- start = a << b << c;
- BOOST_TEST(test("a1012.4", start));
- }
-
- // basic tests involving a direct parameter
- {
- typedef variant<char, int, double> var_type;
- var_type v ('a');
-
- rule<outiter_type, var_type()> start;
-
- start = (char_ | int_ | double_)[_1 = _r0];
- BOOST_TEST(test("a", start, v));
-
- v = 10;
- BOOST_TEST(test("10", start, v));
- v = 12.4;
- BOOST_TEST(test("12.4", start, v));
- }
-
- {
- rule<outiter_type, void(char, int, double)> start;
- fusion::vector<char, int, double> vec('a', 10, 12.4);
-
- start = char_[_1 = _r1] << int_[_1 = _r2] << double_[_1 = _r3];
- BOOST_TEST(test("a1012.4", start('a', 10, 12.4)));
-
- start = (char_ << int_ << double_)[_1 = _r1, _2 = _r2, _3 = _r3];
- BOOST_TEST(test("a1012.4", start('a', 10, 12.4)));
-
- rule<outiter_type, void(char)> a;
- rule<outiter_type, void(int)> b;
- rule<outiter_type, void(double)> c;
-
- a = char_[_1 = _r1];
- b = int_[_1 = _r1];
- c = double_[_1 = _r1];
- start = a(_r1) << b(_r2) << c(_r3);
- BOOST_TEST(test("a1012.4", start('a', 10, 12.4)));
- }
-
// test rule parameter propagation
{
using boost::phoenix::at_c;
Added: trunk/libs/spirit/test/karma/pattern2.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/test/karma/pattern2.cpp 2008-07-19 10:23:10 EDT (Sat, 19 Jul 2008)
@@ -0,0 +1,97 @@
+// Copyright (c) 2001-2008 Hartmut Kaiser
+//
+// 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/config/warning_disable.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+// include this first to make rules have placeholders (e.g. _r1)
+#include <boost/spirit/include/support_argument.hpp>
+
+#include <boost/spirit/include/karma_operator.hpp>
+#include <boost/spirit/include/karma_char.hpp>
+#include <boost/spirit/include/karma_auxiliary.hpp>
+#include <boost/spirit/include/karma_string.hpp>
+#include <boost/spirit/include/karma_numeric.hpp>
+#include <boost/spirit/include/karma_nonterminal.hpp>
+#include <boost/spirit/include/karma_action.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/spirit/include/phoenix_statement.hpp>
+#include <boost/spirit/include/phoenix_fusion.hpp>
+
+#include "test.hpp"
+
+using namespace spirit_test;
+
+///////////////////////////////////////////////////////////////////////////////
+int main()
+{
+ using namespace boost;
+ using namespace boost::spirit;
+ using namespace boost::spirit::arg_names;
+ using namespace boost::spirit::karma;
+ using namespace boost::spirit::ascii;
+
+ typedef spirit_test::output_iterator<char>::type outiter_type;
+
+ // basic tests
+ {
+ rule<outiter_type> start;
+
+ start = char_[_1 = 'a'] << int_[_1 = 10] << double_[_1 = 12.4];
+ BOOST_TEST(test("a1012.4", start));
+
+ start = (char_ << int_ << double_)[_1 = 'a', _2 = 10, _3 = 12.4];
+ BOOST_TEST(test("a1012.4", start));
+
+ rule<outiter_type> a, b, c;
+ a = char_[_1 = 'a'];
+ b = int_[_1 = 10];
+ c = double_[_1 = 12.4];
+
+ start = a << b << c;
+ BOOST_TEST(test("a1012.4", start));
+ }
+
+ // basic tests involving a direct parameter
+ {
+ typedef variant<char, int, double> var_type;
+ var_type v ('a');
+
+ rule<outiter_type, var_type()> start;
+
+ start = (char_ | int_ | double_)[_1 = _r0];
+ BOOST_TEST(test("a", start, v));
+
+ v = 10;
+ BOOST_TEST(test("10", start, v));
+ v = 12.4;
+ BOOST_TEST(test("12.4", start, v));
+ }
+
+ {
+ rule<outiter_type, void(char, int, double)> start;
+ fusion::vector<char, int, double> vec('a', 10, 12.4);
+
+ start = char_[_1 = _r1] << int_[_1 = _r2] << double_[_1 = _r3];
+ BOOST_TEST(test("a1012.4", start('a', 10, 12.4)));
+
+ start = (char_ << int_ << double_)[_1 = _r1, _2 = _r2, _3 = _r3];
+ BOOST_TEST(test("a1012.4", start('a', 10, 12.4)));
+
+ rule<outiter_type, void(char)> a;
+ rule<outiter_type, void(int)> b;
+ rule<outiter_type, void(double)> c;
+
+ a = char_[_1 = _r1];
+ b = int_[_1 = _r1];
+ c = double_[_1 = _r1];
+ start = a(_r1) << b(_r2) << c(_r3);
+ BOOST_TEST(test("a1012.4", start('a', 10, 12.4)));
+ }
+
+ return boost::report_errors();
+}
+