Update of /cvsroot/boost/boost/boost/xpressive/detail/core
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30530/detail/core
Modified Files:
linker.hpp quant_style.hpp
Log Message:
grammar tweaks, misc clean-up
Index: linker.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/linker.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- linker.hpp 15 Nov 2006 06:35:30 -0000 1.11
+++ linker.hpp 19 Nov 2006 21:15:17 -0000 1.12
@@ -149,77 +149,77 @@
}
template<typename Matcher>
- void accept(Matcher const &, xpression_base const *)
+ void accept(Matcher const &, void const *)
{
// no-op
}
- void accept(repeat_begin_matcher const &, xpression_base const *next)
+ void accept(repeat_begin_matcher const &, void const *next)
{
this->back_stack_.push(next);
}
template<bool Greedy>
- void accept(repeat_end_matcher<Greedy> const &matcher, xpression_base
const *)
+ void accept(repeat_end_matcher<Greedy> const &matcher, void const *)
{
matcher.back_ = this->back_stack_.top();
this->back_stack_.pop();
}
template<typename Alternates, typename Traits>
- void accept(alternate_matcher<Alternates, Traits> const &matcher,
xpression_base const *next)
+ void accept(alternate_matcher<Alternates, Traits> const &matcher, void
const *next)
{
xpression_peeker<Char> peeker(matcher.bset_,
this->get_traits<Traits>());
this->alt_link(matcher.alternates_, next, &peeker);
}
- void accept(alternate_end_matcher const &matcher, xpression_base const *)
+ void accept(alternate_end_matcher const &matcher, void const *)
{
matcher.back_ = this->back_stack_.top();
this->back_stack_.pop();
}
template<typename Xpr, bool Greedy>
- void accept(optional_matcher<Xpr, Greedy> const &matcher, xpression_base
const *next)
+ void accept(optional_matcher<Xpr, Greedy> const &matcher, void const *next)
{
this->back_stack_.push(next);
matcher.xpr_.link(*this);
}
template<typename Xpr, bool Greedy>
- void accept(optional_mark_matcher<Xpr, Greedy> const &matcher,
xpression_base const *next)
+ void accept(optional_mark_matcher<Xpr, Greedy> const &matcher, void const
*next)
{
this->back_stack_.push(next);
matcher.xpr_.link(*this);
}
template<typename Xpr>
- void accept(keeper_matcher<Xpr> const &matcher, xpression_base const *)
+ void accept(keeper_matcher<Xpr> const &matcher, void const *)
{
matcher.xpr_.link(*this);
}
template<typename Xpr>
- void accept(lookahead_matcher<Xpr> const &matcher, xpression_base const *)
+ void accept(lookahead_matcher<Xpr> const &matcher, void const *)
{
matcher.xpr_.link(*this);
}
template<typename Xpr>
- void accept(lookbehind_matcher<Xpr> const &matcher, xpression_base const *)
+ void accept(lookbehind_matcher<Xpr> const &matcher, void const *)
{
matcher.xpr_.link(*this);
}
template<typename Xpr, bool Greedy>
- void accept(simple_repeat_matcher<Xpr, Greedy> const &matcher,
xpression_base const *)
+ void accept(simple_repeat_matcher<Xpr, Greedy> const &matcher, void const
*)
{
matcher.xpr_.link(*this);
}
// for use by alt_link_pred below
template<typename Xpr>
- void alt_branch_link(Xpr const &xpr, xpression_base const *next,
xpression_peeker<Char> *peeker)
+ void alt_branch_link(Xpr const &xpr, void const *next,
xpression_peeker<Char> *peeker)
{
this->back_stack_.push(next);
xpr.link(*this);
@@ -235,13 +235,13 @@
{
xpression_linker<Char> *linker_;
xpression_peeker<Char> *peeker_;
- xpression_base const *next_;
+ void const *next_;
alt_link_pred
(
xpression_linker<Char> *linker
, xpression_peeker<Char> *peeker
- , xpression_base const *next
+ , void const *next
)
: linker_(linker)
, peeker_(peeker)
@@ -260,7 +260,7 @@
void alt_link
(
alternates_vector<BidiIter> const &alternates
- , xpression_base const *next
+ , void const *next
, xpression_peeker<Char> *peeker
)
{
@@ -271,7 +271,7 @@
void alt_link
(
fusion::sequence_base<Alternates> const &alternates
- , xpression_base const *next
+ , void const *next
, xpression_peeker<Char> *peeker
)
{
@@ -289,7 +289,7 @@
return *static_cast<Traits const *>(this->traits_);
}
- std::stack<xpression_base const *> back_stack_;
+ std::stack<void const *> back_stack_;
void const *traits_;
std::type_info const *traits_type_;
};
Index: quant_style.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/quant_style.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- quant_style.hpp 29 Oct 2006 06:14:41 -0000 1.4
+++ quant_style.hpp 19 Nov 2006 21:15:17 -0000 1.5
@@ -22,42 +22,17 @@
#include <boost/xpressive/detail/utility/width.hpp>
#include <boost/xpressive/detail/detail_fwd.hpp>
-#if defined(NDEBUG) & defined(BOOST_XPR_DEBUG_STACK)
-# undef BOOST_XPR_DEBUG_STACK
-#endif
-
-#ifdef BOOST_XPR_DEBUG_STACK
-# define BOOST_XPR_DEBUG_STACK_ASSERT BOOST_ASSERT
-#else
-# define BOOST_XPR_DEBUG_STACK_ASSERT(x) static_cast<void>(0)
-#endif
-
namespace boost { namespace xpressive { namespace detail
{
-//////////////////////////////////////////////////////////////////////////
-// xpression_base
-//
-//struct xpression_base
-//{
-//#ifdef BOOST_XPR_DEBUG_STACK
-// virtual ~xpression_base()
-// {
-// }
-//#endif
-//};
-
-// BUGBUG
-typedef void xpression_base;
-
-BOOST_MPL_HAS_XXX_TRAIT_DEF(is_xpression)
+BOOST_MPL_HAS_XXX_TRAIT_DEF(is_boost_xpressive_xpression_)
///////////////////////////////////////////////////////////////////////////////
// is_xpr
//
template<typename Xpr>
struct is_xpr
- : has_is_xpression<Xpr>
+ : has_is_boost_xpressive_xpression_<Xpr>
{};
///////////////////////////////////////////////////////////////////////////////
@@ -76,7 +51,7 @@
template<quant_enum QuantStyle, std::size_t Width = unknown_width::value, bool
Pure = true>
struct quant_style
{
- typedef void is_xpression;
+ typedef void is_boost_xpressive_xpression_;
// Which quantification strategy to use?
BOOST_STATIC_CONSTANT(quant_enum, quant = QuantStyle);
@@ -94,7 +69,7 @@
};
#define BOOST_XPR_QUANT_STYLE(Style, Width, Pure)\
- typedef void is_xpression;\
+ typedef void is_boost_xpressive_xpression_;\
BOOST_STATIC_CONSTANT(quant_enum, quant = Style);\
BOOST_STATIC_CONSTANT(std::size_t, width = Width);\
BOOST_STATIC_CONSTANT(bool, pure = Pure);\
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
