Update of /cvsroot/boost/boost/boost/xpressive/detail/static
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1958/detail/static
Modified Files:
grammar.hpp is_pure.hpp static.hpp width_of.hpp
Log Message:
misc clean-up
Index: grammar.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/grammar.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- grammar.hpp 16 Apr 2007 08:10:13 -0000 1.17
+++ grammar.hpp 17 Apr 2007 05:02:39 -0000 1.18
@@ -43,7 +43,7 @@
));
namespace boost { namespace xpressive
-{
+{
template<typename Char>
struct Grammar;
@@ -127,13 +127,13 @@
{};
template<typename Dummy>
- struct case_<lookahead_tag<true>, Dummy>
- : proto::trans::arg<proto::unary_expr<lookahead_tag<true>,
as_lookahead<Grammar<Char> > > >
+ struct case_<lookahead_tag, Dummy>
+ : proto::trans::arg<proto::unary_expr<lookahead_tag,
as_lookahead<Grammar<Char> > > >
{};
template<typename Dummy>
- struct case_<lookbehind_tag<true>, Dummy>
- : proto::trans::arg<proto::unary_expr<lookbehind_tag<true>,
as_lookbehind<Grammar<Char> > > >
+ struct case_<lookbehind_tag, Dummy>
+ : proto::trans::arg<proto::unary_expr<lookbehind_tag,
as_lookbehind<Grammar<Char> > > >
{};
template<typename Dummy>
@@ -219,13 +219,13 @@
{};
template<typename Dummy>
- struct case_<lookahead_tag<true> , Dummy>
- :
in_sequence<proto::trans::arg<proto::unary_expr<lookahead_tag<true>,
as_lookahead<Grammar<Char> > > > >
+ struct case_<lookahead_tag, Dummy>
+ : in_sequence<proto::trans::arg<proto::unary_expr<lookahead_tag,
as_lookahead<Grammar<Char> > > > >
{};
template<typename Dummy>
- struct case_<lookbehind_tag<true> , Dummy>
- :
in_sequence<proto::trans::arg<proto::unary_expr<lookbehind_tag<true>,
as_lookbehind<Grammar<Char> > > > >
+ struct case_<lookbehind_tag, Dummy>
+ :
in_sequence<proto::trans::arg<proto::unary_expr<lookbehind_tag,
as_lookbehind<Grammar<Char> > > > >
{};
template<typename Dummy>
Index: is_pure.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/is_pure.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- is_pure.hpp 16 Apr 2007 08:10:13 -0000 1.18
+++ is_pure.hpp 17 Apr 2007 05:02:39 -0000 1.19
@@ -116,13 +116,13 @@
: is_pure<typename proto::result_of::arg<Expr>::type>
{};
- template<typename Expr, bool Positive>
- struct is_pure<Expr, lookahead_tag<Positive> >
+ template<typename Expr>
+ struct is_pure<Expr, lookahead_tag>
: is_pure<typename proto::result_of::arg<Expr>::type>
{};
- template<typename Expr, bool Positive>
- struct is_pure<Expr, lookbehind_tag<Positive> >
+ template<typename Expr>
+ struct is_pure<Expr, lookbehind_tag>
: is_pure<typename proto::result_of::arg<Expr>::type>
{};
Index: static.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/static.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- static.hpp 12 Mar 2007 22:11:29 -0000 1.14
+++ static.hpp 17 Apr 2007 05:02:39 -0000 1.15
@@ -42,7 +42,7 @@
// match
// delegates to Next
template<typename BidiIter>
- bool match(state_type<BidiIter> &state) const
+ bool match(match_state<BidiIter> &state) const
{
return static_cast<Next const *>(this)->
BOOST_NESTED_TEMPLATE push_match<Top>(state);
@@ -52,7 +52,7 @@
// jump back to the xpression on top of the xpression stack,
// and keep the xpression on the stack.
template<typename BidiIter>
- static bool top_match(state_type<BidiIter> &state, void const *top)
+ static bool top_match(match_state<BidiIter> &state, void const *top)
{
return static_cast<Top const *>(top)->
BOOST_NESTED_TEMPLATE push_match<Top>(state);
@@ -62,7 +62,7 @@
// jump back to the xpression on top of the xpression stack,
// pop the xpression off the stack.
template<typename BidiIter>
- static bool pop_match(state_type<BidiIter> &state, void const *top)
+ static bool pop_match(match_state<BidiIter> &state, void const *top)
{
return static_cast<Top const *>(top)->match(state);
}
@@ -71,7 +71,7 @@
// pop the xpression off the top of the stack and ignore it; call
// match on next.
template<typename BidiIter>
- bool skip_match(state_type<BidiIter> &state) const
+ bool skip_match(match_state<BidiIter> &state) const
{
// could be static_xpression::skip_impl or stacked_xpression::skip_impl
// depending on if there is 1 or more than 1 xpression on the
@@ -84,7 +84,7 @@
// skip_impl
// implementation of skip_match.
template<typename That, typename BidiIter>
- static bool skip_impl(That const &that, state_type<BidiIter> &state)
+ static bool skip_impl(That const &that, match_state<BidiIter> &state)
{
return that.BOOST_NESTED_TEMPLATE push_match<Top>(state);
}
@@ -131,7 +131,7 @@
// match
// delegates to the Matcher
template<typename BidiIter>
- bool match(state_type<BidiIter> &state) const
+ bool match(match_state<BidiIter> &state) const
{
return this->Matcher::match(state, this->next_);
}
@@ -140,7 +140,7 @@
// call match on this, but also push "Top" onto the xpression
// stack so we know what we are jumping back to later.
template<typename Top, typename BidiIter>
- bool push_match(state_type<BidiIter> &state) const
+ bool push_match(match_state<BidiIter> &state) const
{
return this->Matcher::match(state,
stacked_xpression_cast<Top>(this->next_));
}
@@ -148,7 +148,7 @@
// skip_impl
// implementation of skip_match, called from
stacked_xpression::skip_match
template<typename That, typename BidiIter>
- static bool skip_impl(That const &that, state_type<BidiIter> &state)
+ static bool skip_impl(That const &that, match_state<BidiIter> &state)
{
return that.match(state);
}
Index: width_of.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/width_of.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- width_of.hpp 16 Apr 2007 08:10:14 -0000 1.16
+++ width_of.hpp 17 Apr 2007 05:02:39 -0000 1.17
@@ -137,13 +137,13 @@
: width_of<typename proto::result_of::right<Expr>::type>
{};
- template<typename Expr, bool Positive>
- struct width_of<Expr, lookahead_tag<Positive> >
+ template<typename Expr>
+ struct width_of<Expr, lookahead_tag>
: mpl::size_t<0>
{};
- template<typename Expr, bool Positive>
- struct width_of<Expr, lookbehind_tag<Positive> >
+ template<typename Expr>
+ struct width_of<Expr, lookbehind_tag>
: mpl::size_t<0>
{};
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
