Update of /cvsroot/boost/boost/boost/xpressive/detail/core
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1958/detail/core
Modified Files:
access.hpp adaptor.hpp finder.hpp flow_control.hpp
regex_impl.hpp state.hpp
Log Message:
misc clean-up
Index: access.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/access.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- access.hpp 24 Mar 2007 10:07:30 -0000 1.8
+++ access.hpp 17 Apr 2007 05:02:33 -0000 1.9
@@ -38,7 +38,7 @@
return rex.invalid_();
}
- static bool match(basic_regex<BidiIter> const &rex, state_type<BidiIter>
&state)
+ static bool match(basic_regex<BidiIter> const &rex, match_state<BidiIter>
&state)
{
return rex.match_(state);
}
Index: adaptor.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/adaptor.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adaptor.hpp 17 Apr 2006 19:36:52 -0000 1.4
+++ adaptor.hpp 17 Apr 2007 05:02:33 -0000 1.5
@@ -41,7 +41,7 @@
{
}
- virtual bool match(state_type<iterator_type> &state) const
+ virtual bool match(match_state<iterator_type> &state) const
{
typedef typename unwrap_reference<Xpr const>::type xpr_type;
return implicit_cast<xpr_type &>(this->xpr_).match(state);
Index: finder.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/finder.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- finder.hpp 21 Dec 2006 03:51:41 -0000 1.4
+++ finder.hpp 17 Apr 2007 05:02:33 -0000 1.5
@@ -36,7 +36,7 @@
{
}
- bool operator ()(state_type<BidiIter> &state) const
+ bool operator ()(match_state<BidiIter> &state) const
{
Traits const &traits = traits_cast<Traits>(state);
state.cur_ = this->bm_.find(state.cur_, state.end_, traits);
@@ -64,7 +64,7 @@
{
}
- bool operator ()(state_type<BidiIter> &state) const
+ bool operator ()(match_state<BidiIter> &state) const
{
Traits const &traits = traits_cast<Traits>(state);
state.cur_ = (this->bset_.icase()
@@ -104,7 +104,7 @@
{
}
- bool operator ()(state_type<BidiIter> &state) const
+ bool operator ()(match_state<BidiIter> &state) const
{
if(state.bos() && state.flags_.match_bol_)
{
@@ -155,7 +155,7 @@
}
}
- bool operator ()(state_type<BidiIter> &state) const
+ bool operator ()(match_state<BidiIter> &state) const
{
if(state.bos() && state.flags_.match_bol_)
{
Index: flow_control.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/flow_control.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- flow_control.hpp 4 Mar 2007 18:07:03 -0000 1.5
+++ flow_control.hpp 17 Apr 2007 05:02:33 -0000 1.6
@@ -28,7 +28,7 @@
inline bool push_context_match
(
regex_impl<BidiIter> const &impl
- , state_type<BidiIter> &state
+ , match_state<BidiIter> &state
, matchable<BidiIter> const &next
)
{
@@ -53,7 +53,7 @@
// pop_context_match
//
template<typename BidiIter>
-inline bool pop_context_match(state_type<BidiIter> &state)
+inline bool pop_context_match(match_state<BidiIter> &state)
{
// save state
// BUGBUG nested regex could have changed state.traits_
Index: regex_impl.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/regex_impl.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- regex_impl.hpp 18 Mar 2007 21:46:52 -0000 1.9
+++ regex_impl.hpp 17 Apr 2007 05:02:33 -0000 1.10
@@ -30,7 +30,7 @@
: counted_base<finder<BidiIter> >
{
virtual ~finder() {}
- virtual bool operator ()(state_type<BidiIter> &state) const = 0;
+ virtual bool operator ()(match_state<BidiIter> &state) const = 0;
};
///////////////////////////////////////////////////////////////////////////////
Index: state.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/state.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- state.hpp 24 Mar 2007 10:07:30 -0000 1.12
+++ state.hpp 17 Apr 2007 05:02:33 -0000 1.13
@@ -84,10 +84,10 @@
};
///////////////////////////////////////////////////////////////////////////////
-// state_type
+// match_state
//
template<typename BidiIter>
-struct state_type
+struct match_state
: noncopyable
{
typedef BidiIter iterator;
@@ -117,7 +117,7 @@
///////////////////////////////////////////////////////////////////////////////
//
- state_type
+ match_state
(
BidiIter begin
, BidiIter end
@@ -303,7 +303,7 @@
// save_sub_matches
//
template<typename BidiIter>
-inline memento<BidiIter> save_sub_matches(state_type<BidiIter> &state)
+inline memento<BidiIter> save_sub_matches(match_state<BidiIter> &state)
{
memento<BidiIter> mem =
{
@@ -319,7 +319,7 @@
// restore_sub_matches
//
template<typename BidiIter>
-inline void restore_sub_matches(memento<BidiIter> const &mem,
state_type<BidiIter> &state)
+inline void restore_sub_matches(memento<BidiIter> const &mem,
match_state<BidiIter> &state)
{
typedef core_access<BidiIter> access;
nested_results<BidiIter> &nested =
access::get_nested_results(*state.context_.results_ptr_);
@@ -335,7 +335,7 @@
// reclaim_sub_matches
//
template<typename BidiIter>
-inline void reclaim_sub_matches(memento<BidiIter> const &mem,
state_type<BidiIter> &state, bool success)
+inline void reclaim_sub_matches(memento<BidiIter> const &mem,
match_state<BidiIter> &state, bool success)
{
std::size_t count = state.context_.results_ptr_->nested_results().size() -
mem.nested_results_count_;
if(count == 0)
@@ -356,7 +356,7 @@
// traits_cast
//
template<typename Traits, typename BidiIter>
-inline Traits const &traits_cast(state_type<BidiIter> const &state)
+inline Traits const &traits_cast(match_state<BidiIter> const &state)
{
return state.template get_traits<Traits>();
}
-------------------------------------------------------------------------
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
