Subject: [Boost-commit] svn:boost r52864 - in trunk: boost/spirit/home/qi/stream/detail boost/spirit/home/support boost/spirit/home/support/detail/lexer boost/spirit/home/support/detail/lexer/parser boost/spirit/home/support/detail/lexer/parser/tokeniser boost/wave/cpplexer libs/spirit/test/karma libs/spirit/test/qi
From: hartmut.kaiser_at_[hidden]
Date: 2009-05-09 18:19:43
Author: hkaiser
Date: 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
New Revision: 52864
URL: http://svn.boost.org/trac/boost/changeset/52864
Log:
Applied a couple of patches as contributed by Francois Barel
Text files modified:
trunk/boost/spirit/home/qi/stream/detail/match_manip.hpp | 12 ++++++------
trunk/boost/spirit/home/support/container.hpp | 4 ++--
trunk/boost/spirit/home/support/detail/lexer/parser/parser.hpp | 2 +-
trunk/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp | 4 ++--
trunk/boost/spirit/home/support/detail/lexer/string_token.hpp | 2 +-
trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp | 2 +-
trunk/libs/spirit/test/karma/grammar_fail.cpp | 2 +-
trunk/libs/spirit/test/karma/rule_fail.cpp | 2 +-
trunk/libs/spirit/test/qi/end.cpp | 8 ++++----
trunk/libs/spirit/test/qi/range_run.cpp | 6 +++---
10 files changed, 22 insertions(+), 22 deletions(-)
Modified: trunk/boost/spirit/home/qi/stream/detail/match_manip.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/stream/detail/match_manip.hpp (original)
+++ trunk/boost/spirit/home/qi/stream/detail/match_manip.hpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -27,32 +27,32 @@
struct match_manip
{
match_manip(Expr const& xpr, Skipper const& s, Attribute& a)
- : expr(xpr), attr(a), skipper(s), post_skip(skip_flag::postskip) {}
+ : expr(xpr), skipper(s), attr(a), post_skip(skip_flag::postskip) {}
match_manip(Expr const& xpr, Skipper const& s
, BOOST_SCOPED_ENUM(skip_flag) ps, Attribute& a)
- : expr(xpr), attr(a), skipper(s), post_skip(ps) {}
+ : expr(xpr), skipper(s), attr(a), post_skip(ps) {}
Expr const& expr;
Skipper const& skipper;
- BOOST_SCOPED_ENUM(skip_flag) const post_skip;
Attribute& attr;
+ BOOST_SCOPED_ENUM(skip_flag) const post_skip;
};
template <typename Expr, typename Skipper, typename Attribute>
struct match_manip<Expr, mpl::true_, Skipper, Attribute>
{
match_manip(Expr const& xpr, Skipper const& s, Attribute& a)
- : expr(xpr), attr(a), skipper(s), post_skip(skip_flag::postskip) {}
+ : expr(xpr), skipper(s), attr(a), post_skip(skip_flag::postskip) {}
match_manip(Expr const& xpr, Skipper const& s
, BOOST_SCOPED_ENUM(skip_flag) ps, Attribute& a)
- : expr(xpr), attr(a), skipper(s), post_skip(ps) {}
+ : expr(xpr), skipper(s), attr(a), post_skip(ps) {}
Expr const& expr;
Skipper const& skipper;
- BOOST_SCOPED_ENUM(skip_flag) const post_skip;
Attribute attr;
+ BOOST_SCOPED_ENUM(skip_flag) const post_skip;
};
///////////////////////////////////////////////////////////////////////////
Modified: trunk/boost/spirit/home/support/container.hpp
==============================================================================
--- trunk/boost/spirit/home/support/container.hpp (original)
+++ trunk/boost/spirit/home/support/container.hpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -52,8 +52,8 @@
// struct is_container<optional<T> >
// : is_container<T> {};
-//#define BOOST_SPIRIT_IS_CONTAINER(z, N, data) \
-// is_container<BOOST_PP_CAT(T, N)>::value || \
+//#define BOOST_SPIRIT_IS_CONTAINER(z, N, data)
+// is_container<BOOST_PP_CAT(T, N)>::value ||
// /***/
// template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
Modified: trunk/boost/spirit/home/support/detail/lexer/parser/parser.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/parser/parser.hpp (original)
+++ trunk/boost/spirit/home/support/detail/lexer/parser/parser.hpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -252,7 +252,7 @@
node_ptr_vector &node_ptr_vector_, tree_node_stack &tree_node_stack_)
{
assert (handle_.top ()._type == token::SUB &&
- handle_.size () == 1 || handle_.size () == 2);
+ (handle_.size () == 1 || handle_.size () == 2));
if (handle_.size () == 1)
{
Modified: trunk/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp (original)
+++ trunk/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -525,8 +525,8 @@
throw runtime_error ("Unexpected end of regex "
"(missing '}').");
}
- } while (ch_ == '_' || ch_ == '-' || ch_ >= 'A' && ch_ <= 'Z' ||
- ch_ >= 'a' && ch_ <= 'z' || ch_ >= '0' && ch_ <= '9');
+ } while (ch_ == '_' || ch_ == '-' || (ch_ >= 'A' && ch_ <= 'Z') ||
+ (ch_ >= 'a' && ch_ <= 'z') || (ch_ >= '0' && ch_ <= '9'));
if (ch_ != '}')
{
Modified: trunk/boost/spirit/home/support/detail/lexer/string_token.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/string_token.hpp (original)
+++ trunk/boost/spirit/home/support/detail/lexer/string_token.hpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -135,7 +135,7 @@
void intersect (basic_string_token &rhs_, basic_string_token &overlap_)
{
- if (any () && rhs_.any () || (_negated == rhs_._negated &&
+ if ((any () && rhs_.any ()) || (_negated == rhs_._negated &&
!any () && !rhs_.any ()))
{
intersect_same_types (rhs_, overlap_);
Modified: trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -67,7 +67,7 @@
{ return *this; } // nothing to do here
#endif
-// interface to the multi_pass_policies::split_functor_input policy
+// interface to the iterator_policies::split_functor_input policy
typedef TokenT result_type;
typedef lex_iterator_functor_shim unique;
typedef lex_input_interface<TokenT>* shared;
Modified: trunk/libs/spirit/test/karma/grammar_fail.cpp
==============================================================================
--- trunk/libs/spirit/test/karma/grammar_fail.cpp (original)
+++ trunk/libs/spirit/test/karma/grammar_fail.cpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -40,7 +40,7 @@
std::back_insert_iterator<std::string> outit(generated);
num_list def;
- bool r = generate_delimited(outit, def, char_('%') << '\n');
+ generate_delimited(outit, def, char_('%') << '\n');
return 0;
}
Modified: trunk/libs/spirit/test/karma/rule_fail.cpp
==============================================================================
--- trunk/libs/spirit/test/karma/rule_fail.cpp (original)
+++ trunk/libs/spirit/test/karma/rule_fail.cpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -31,7 +31,7 @@
def = int_(1) << ',' << int_(0);
std::back_insert_iterator<std::string> outit(generated);
- bool r = generate_delimited(outit, def, char_('%') << '\n');
+ generate_delimited(outit, def, char_('%') << '\n');
return 0;
}
Modified: trunk/libs/spirit/test/qi/end.cpp
==============================================================================
--- trunk/libs/spirit/test/qi/end.cpp (original)
+++ trunk/libs/spirit/test/qi/end.cpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -39,10 +39,10 @@
BOOST_TEST(!test("\n", !eol, false));
BOOST_TEST(test("\b", !eol, false));
- BOOST_TEST(test(" \r", eol, ascii::char_(L' ')));
- BOOST_TEST(test(" \r\n", eol, ascii::char_(L' ')));
- BOOST_TEST(test(" \n", eol, ascii::char_(L' ')));
- BOOST_TEST(!test(" \b", eol, ascii::char_(L' ')));
+ BOOST_TEST(test(" \r", eol, ascii::char_(' ')));
+ BOOST_TEST(test(" \r\n", eol, ascii::char_(' ')));
+ BOOST_TEST(test(" \n", eol, ascii::char_(' ')));
+ BOOST_TEST(!test(" \b", eol, ascii::char_(' ')));
BOOST_TEST(test(L"\r", eol));
BOOST_TEST(test(L"\r\n", eol));
Modified: trunk/libs/spirit/test/qi/range_run.cpp
==============================================================================
--- trunk/libs/spirit/test/qi/range_run.cpp (original)
+++ trunk/libs/spirit/test/qi/range_run.cpp 2009-05-09 18:19:42 EDT (Sat, 09 May 2009)
@@ -77,7 +77,7 @@
rr.set(range<char>('a', 'a'));
for (char c = 0; c < 127; ++c)
{
- BOOST_TEST(c == 'a' == rr.test(c));
+ BOOST_TEST((c == 'a') == rr.test(c));
}
}
{
@@ -95,7 +95,7 @@
rr.set(range<char>(0, 0));
for (char c = 0; c < 127; ++c)
{
- BOOST_TEST(c == 0 == rr.test(c));
+ BOOST_TEST((c == 0) == rr.test(c));
}
rr.set(range<char>(0, 50));
for (char c = 0; c < 127; ++c)
@@ -108,7 +108,7 @@
rr.set(range<unsigned char>(255, 255));
for (unsigned char c = 0; c < 255; ++c)
{
- BOOST_TEST(c == 255 == rr.test(c));
+ BOOST_TEST((c == 255) == rr.test(c));
}
rr.set(range<unsigned char>(250, 255));
for (unsigned char c = 0; c < 255; ++c)