Update of /cvsroot/boost/boost/boost/xpressive
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1958
Modified Files:
basic_regex.hpp regex_algorithms.hpp regex_iterator.hpp
regex_primitives.hpp
Log Message:
misc clean-up
Index: basic_regex.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/basic_regex.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- basic_regex.hpp 15 Apr 2007 06:40:25 -0000 1.15
+++ basic_regex.hpp 17 Apr 2007 05:02:31 -0000 1.16
@@ -167,7 +167,7 @@
basic_regex(string_type const &);
/// INTERNAL ONLY
- bool match_(detail::state_type<BidiIter> &state) const
+ bool match_(detail::match_state<BidiIter> &state) const
{
return proto::arg(*this)->xpr_->match(state);
}
Index: regex_algorithms.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_algorithms.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- regex_algorithms.hpp 17 Apr 2006 19:36:52 -0000 1.8
+++ regex_algorithms.hpp 17 Apr 2007 05:02:32 -0000 1.9
@@ -60,7 +60,7 @@
{
// the state object holds matching state and
// is passed by reference to all the matchers
- detail::state_type<BidiIter> state(begin, end, what,
*access::get_regex_impl(re), flags);
+ detail::match_state<BidiIter> state(begin, end, what,
*access::get_regex_impl(re), flags);
state.flags_.match_all_ = true;
state.sub_match(0).begin_ = begin;
@@ -204,7 +204,7 @@
template<typename BidiIter>
inline bool regex_search_impl
(
- state_type<BidiIter> &state
+ match_state<BidiIter> &state
, basic_regex<BidiIter> const &re
, bool not_initial_null = false
)
@@ -343,7 +343,7 @@
{
// the state object holds matching state and
// is passed by reference to all the matchers
- detail::state_type<BidiIter> state(begin, end, what,
*access::get_regex_impl(re), flags);
+ detail::match_state<BidiIter> state(begin, end, what,
*access::get_regex_impl(re), flags);
return detail::regex_search_impl(state, re);
}
@@ -508,7 +508,7 @@
BidiIter cur = begin;
match_results<BidiIter> what;
- detail::state_type<BidiIter> state(begin, end, what,
*access::get_regex_impl(re), flags);
+ detail::match_state<BidiIter> state(begin, end, what,
*access::get_regex_impl(re), flags);
bool const yes_copy = (0 == (flags & format_no_copy));
if(detail::regex_search_impl(state, re))
Index: regex_iterator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_iterator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- regex_iterator.hpp 18 Apr 2006 07:52:49 -0000 1.6
+++ regex_iterator.hpp 17 Apr 2007 05:02:32 -0000 1.7
@@ -80,7 +80,7 @@
}
match_results<BidiIter> what_;
- state_type<BidiIter> state_;
+ match_state<BidiIter> state_;
basic_regex<BidiIter> const *const rex_;
regex_constants::match_flag_type const flags_;
bool not_null_;
Index: regex_primitives.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_primitives.hpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- regex_primitives.hpp 15 Apr 2007 06:40:25 -0000 1.28
+++ regex_primitives.hpp 17 Apr 2007 05:02:32 -0000 1.29
@@ -568,14 +568,14 @@
template<typename Expr>
inline typename proto::unary_expr
<
- detail::lookahead_tag<true>
+ detail::lookahead_tag
, typename proto::result_of::as_expr<Expr>::type
>::type const
before(Expr const &expr)
{
typename proto::unary_expr
<
- detail::lookahead_tag<true>
+ detail::lookahead_tag
, typename proto::result_of::as_expr<Expr>::type
>::type that = {proto::as_expr(expr)};
return that;
@@ -599,14 +599,14 @@
template<typename Expr>
inline typename proto::unary_expr
<
- detail::lookbehind_tag<true>
+ detail::lookbehind_tag
, typename proto::result_of::as_expr<Expr>::type
>::type const
after(Expr const &expr)
{
typename proto::unary_expr
<
- detail::lookbehind_tag<true>
+ detail::lookbehind_tag
, typename proto::result_of::as_expr<Expr>::type
>::type that = {proto::as_expr(expr)};
return that;
-------------------------------------------------------------------------
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
