Update of /cvsroot/boost/boost/boost/xpressive/detail/dynamic
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1958/detail/dynamic
Modified Files:
dynamic.hpp matchable.hpp parser.hpp
Log Message:
misc clean-up
Index: dynamic.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/dynamic/dynamic.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dynamic.hpp 3 Apr 2007 06:32:17 -0000 1.10
+++ dynamic.hpp 17 Apr 2007 05:02:38 -0000 1.11
@@ -42,7 +42,7 @@
intrusive_ptr_add_ref(this); // keep alive forever
}
- bool match(state_type<BidiIter> &) const
+ bool match(match_state<BidiIter> &) const
{
BOOST_ASSERT(false);
return false;
@@ -75,7 +75,7 @@
{
}
- virtual bool match(state_type<BidiIter> &state) const
+ virtual bool match(match_state<BidiIter> &state) const
{
return this->Matcher::match(state, *this->next_.matchable());
}
@@ -179,7 +179,7 @@
}
template<typename BidiIter>
- bool match(state_type<BidiIter> &state) const
+ bool match(match_state<BidiIter> &state) const
{
return this->Matcher::match(state, matcher_wrapper<true_matcher>());
}
Index: matchable.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/dynamic/matchable.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- matchable.hpp 21 Dec 2006 03:51:41 -0000 1.8
+++ matchable.hpp 17 Apr 2007 05:02:39 -0000 1.9
@@ -43,7 +43,7 @@
typedef BidiIter iterator_type;
typedef typename iterator_value<iterator_type>::type char_type;
virtual ~matchable() {}
- virtual bool match(state_type<BidiIter> &state) const = 0;
+ virtual bool match(match_state<BidiIter> &state) const = 0;
};
///////////////////////////////////////////////////////////////////////////////
@@ -82,23 +82,23 @@
//
template<typename Top>
- bool push_match(state_type<BidiIter> &state) const
+ bool push_match(match_state<BidiIter> &state) const
{
BOOST_MPL_ASSERT((is_same<Top, matchable_ex<BidiIter> >));
return this->match(state);
}
- 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<matchable_ex<BidiIter> const *>(top)->match(state);
}
- 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<matchable_ex<BidiIter> const *>(top)->match(state);
}
- bool skip_match(state_type<BidiIter> &state) const
+ bool skip_match(match_state<BidiIter> &state) const
{
return this->match(state);
}
@@ -141,7 +141,7 @@
return this->xpr_;
}
- bool match(state_type<BidiIter> &state) const
+ bool match(match_state<BidiIter> &state) const
{
return this->xpr_->match(state);
}
@@ -158,7 +158,7 @@
// BUGBUG yuk!
template<typename Top>
- bool push_match(state_type<BidiIter> &state) const
+ bool push_match(match_state<BidiIter> &state) const
{
BOOST_MPL_ASSERT((is_same<Top, matchable_ex<BidiIter> >));
return this->match(state);
Index: parser.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/dynamic/parser.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- parser.hpp 17 Apr 2006 19:36:52 -0000 1.5
+++ parser.hpp 17 Apr 2007 05:02:39 -0000 1.6
@@ -86,7 +86,7 @@
set_matcher s(traits);
s.set_[0] = newline;
s.set_[1] = 0;
- s.complement();
+ s.inverse();
switch(((int)not_dot_newline | not_dot_null) & flags)
{
-------------------------------------------------------------------------
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
