|
|
Boost-Commit : |
From: eric_at_[hidden]
Date: 2007-12-01 20:39:48
Author: eric_niebler
Date: 2007-12-01 20:39:47 EST (Sat, 01 Dec 2007)
New Revision: 41561
URL: http://svn.boost.org/trac/boost/changeset/41561
Log:
s/apply_/apply/
Text files modified:
branches/proto/v3/boost/xpressive/detail/static/grammar.hpp | 8 ++++----
branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp | 2 +-
branches/proto/v3/boost/xpressive/proto/traits.hpp | 8 ++++----
branches/proto/v3/boost/xpressive/proto/transform/apply.hpp | 18 +++++++++---------
branches/proto/v3/boost/xpressive/proto/transform/when.hpp | 20 ++++++++++----------
5 files changed, 28 insertions(+), 28 deletions(-)
Modified: branches/proto/v3/boost/xpressive/detail/static/grammar.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/static/grammar.hpp (original)
+++ branches/proto/v3/boost/xpressive/detail/static/grammar.hpp 2007-12-01 20:39:47 EST (Sat, 01 Dec 2007)
@@ -485,11 +485,11 @@
// Here are some transforms ...
struct as_independent
- : apply_<Gram, _make_shift_right(_, true_matcher()), no_next()>
+ : apply<Gram, _make_shift_right(_, true_matcher()), no_next()>
{};
struct as_alternate
- : apply_<Gram, _make_shift_right(_, alternate_end_matcher()), no_next()>
+ : apply<Gram, _make_shift_right(_, alternate_end_matcher()), no_next()>
{};
struct as_alternates_list
@@ -540,7 +540,7 @@
template<typename Greedy, typename Tag, uint_t = min_type<Tag>::value, uint_t = max_type<Tag>::value>
struct as_default_repeat_impl
- : apply_<as_repeater<Greedy, Tag>, as_marker(add_hidden_mark(_arg))>
+ : apply<as_repeater<Greedy, Tag>, as_marker(add_hidden_mark(_arg))>
{};
template<typename Greedy, typename Tag, uint_t Max>
@@ -568,7 +568,7 @@
template<typename Greedy>
struct as_simple_repeat
- : apply_<
+ : apply<
_
, simple_repeat_matcher<as_independent(_arg), Greedy>(
as_independent(_arg)
Modified: branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp 2007-12-01 20:39:47 EST (Sat, 01 Dec 2007)
@@ -352,7 +352,7 @@
struct call;
template<typename Trans, typename... Args>
- struct apply_;
+ struct apply;
template<typename Sequence, typename State, typename Fun>
struct fold;
Modified: branches/proto/v3/boost/xpressive/proto/traits.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/traits.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/traits.hpp 2007-12-01 20:39:47 EST (Sat, 01 Dec 2007)
@@ -247,17 +247,17 @@
template<typename This, typename Expr, typename State, typename Visitor>
struct result<This(Expr, State, Visitor)>
{
- typedef detail::apply_args<args<Args...>, typename Expr::proto_args, State, Visitor> apply_;
- typedef expr<typename Expr::proto_tag, typename apply_::type> type;
+ typedef detail::apply_args<args<Args...>, typename Expr::proto_args, State, Visitor> apply;
+ typedef expr<typename Expr::proto_tag, typename apply::type> type;
};
template<typename Expr, typename State, typename Visitor>
typename result<nary_expr(Expr, State, Visitor)>::type
operator()(Expr const &expr, State const &state, Visitor &visitor) const
{
- typedef typename result<nary_expr(Expr, State, Visitor)>::apply_ apply_;
+ typedef typename result<nary_expr(Expr, State, Visitor)>::apply apply;
typename result<nary_expr(Expr, State, Visitor)>::type that = {
- apply_::call(expr.proto_base().proto_args_, state, visitor)
+ apply::call(expr.proto_base().proto_args_, state, visitor)
};
return that;
}
Modified: branches/proto/v3/boost/xpressive/proto/transform/apply.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/apply.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/apply.hpp 2007-12-01 20:39:47 EST (Sat, 01 Dec 2007)
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////
/// \file apply.hpp
-/// Contains definition of the apply_<> transform.
+/// Contains definition of the apply<> transform.
//
// Copyright 2007 Eric Niebler. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
@@ -26,12 +26,12 @@
}
template<typename Trans>
- struct apply_<Trans>
+ struct apply<Trans>
: Trans
{};
template<typename Trans, typename ExprTfx>
- struct apply_<Trans, ExprTfx> : raw_transform
+ struct apply<Trans, ExprTfx> : raw_transform
{
template<typename Sig>
struct result;
@@ -46,7 +46,7 @@
{};
template<typename Expr, typename State, typename Visitor>
- typename result<apply_(Expr, State, Visitor)>::type
+ typename result<apply(Expr, State, Visitor)>::type
operator()(Expr const &expr, State const &state, Visitor &visitor) const
{
return Trans()(
@@ -58,7 +58,7 @@
};
template<typename Trans, typename ExprTfx, typename StateTfx>
- struct apply_<Trans, ExprTfx, StateTfx> : raw_transform
+ struct apply<Trans, ExprTfx, StateTfx> : raw_transform
{
template<typename Sig>
struct result;
@@ -73,7 +73,7 @@
{};
template<typename Expr, typename State, typename Visitor>
- typename result<apply_(Expr, State, Visitor)>::type
+ typename result<apply(Expr, State, Visitor)>::type
operator()(Expr const &expr, State const &state, Visitor &visitor) const
{
return Trans()(
@@ -85,7 +85,7 @@
};
template<typename Trans, typename ExprTfx, typename StateTfx, typename VisitorTfx>
- struct apply_<Trans, ExprTfx, StateTfx, VisitorTfx> : raw_transform
+ struct apply<Trans, ExprTfx, StateTfx, VisitorTfx> : raw_transform
{
template<typename Sig>
struct result;
@@ -100,7 +100,7 @@
{};
template<typename Expr, typename State, typename Visitor>
- typename result<apply_(Expr, State, Visitor)>::type
+ typename result<apply(Expr, State, Visitor)>::type
operator()(Expr const &expr, State const &state, Visitor &visitor) const
{
typedef typename boost::result_of<when<_, VisitorTfx>(Expr, State, Visitor)>::type visitor_type;
@@ -115,7 +115,7 @@
}
template<typename Trans, typename... Args>
- struct transform_category<transform::apply_<Trans, Args...> >
+ struct transform_category<transform::apply<Trans, Args...> >
{
typedef raw_transform type;
};
Modified: branches/proto/v3/boost/xpressive/proto/transform/when.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/when.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/when.hpp 2007-12-01 20:39:47 EST (Sat, 01 Dec 2007)
@@ -187,7 +187,7 @@
, typename Return
, typename... Args
>
- struct apply_
+ struct apply
{
typedef typename apply_lambda_<Return, Expr, State, Visitor>::type lambda_type;
@@ -199,13 +199,13 @@
typename mpl::eval_if<
is_same<no_transform, lambda_category>
, mpl::identity<lambda_type>
- , apply_<Expr, State, Visitor, lambda_category, lambda_type, Args...>
+ , apply<Expr, State, Visitor, lambda_category, lambda_type, Args...>
>::type
type;
static type call(Expr const &expr, State const &state, Visitor &visitor)
{
- return apply_::call_(expr, state, visitor, is_same<no_transform, lambda_category>());
+ return apply::call_(expr, state, visitor, is_same<no_transform, lambda_category>());
}
private:
@@ -218,7 +218,7 @@
static type call_(Expr const &expr, State const &state, Visitor &visitor, mpl::false_)
{
- return apply_<Expr, State, Visitor, lambda_category, lambda_type, Args...>::call(expr, state, visitor);
+ return apply<Expr, State, Visitor, lambda_category, lambda_type, Args...>::call(expr, state, visitor);
}
};
@@ -229,7 +229,7 @@
, typename Return
, typename... Args
>
- struct apply_<Expr, State, Visitor, function_transform, Return, Args...>
+ struct apply<Expr, State, Visitor, function_transform, Return, Args...>
{
typedef typename boost::result_of<
transform::call<Return, Args...>(Expr, State, Visitor)
@@ -248,15 +248,15 @@
, typename Return
, typename... Args
>
- struct apply_<Expr, State, Visitor, raw_transform, Return, Args...>
+ struct apply<Expr, State, Visitor, raw_transform, Return, Args...>
{
typedef typename boost::result_of<
- transform::apply_<Return, Args...>(Expr, State, Visitor)
+ transform::apply<Return, Args...>(Expr, State, Visitor)
>::type type;
static type call(Expr const &expr, State const &state, Visitor &visitor)
{
- return transform::apply_<Return, Args...>()(expr, state, visitor);
+ return transform::apply<Return, Args...>()(expr, state, visitor);
}
};
@@ -285,7 +285,7 @@
template<typename This, typename Expr, typename State, typename Visitor>
struct result<This(Expr, State, Visitor)>
- : detail::apply_<Expr, State, Visitor, typename transform_category<Return>::type, Return, Args...>
+ : detail::apply<Expr, State, Visitor, typename transform_category<Return>::type, Return, Args...>
{};
// BUGBUG makes a temporary
@@ -308,7 +308,7 @@
template<typename This, typename Expr, typename State, typename Visitor>
struct result<This(Expr, State, Visitor)>
- : detail::apply_<Expr, State, Visitor, typename transform_category<Return>::type, Return, Args...>
+ : detail::apply<Expr, State, Visitor, typename transform_category<Return>::type, Return, Args...>
{};
template<typename Expr, typename State, typename Visitor>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk