|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49686 - in trunk/boost/proto: . detail transform
From: eric_at_[hidden]
Date: 2008-11-11 13:41:50
Author: eric_niebler
Date: 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
New Revision: 49686
URL: http://svn.boost.org/trac/boost/changeset/49686
Log:
eliminate shadow warnings
Text files modified:
trunk/boost/proto/args.hpp | 3
trunk/boost/proto/detail/decltype.hpp | 4
trunk/boost/proto/matches.hpp | 54 ++++++------
trunk/boost/proto/traits.hpp | 8 +-
trunk/boost/proto/transform/arg.hpp | 42 +++++-----
trunk/boost/proto/transform/call.hpp | 130 ++++++++++++++++----------------
trunk/boost/proto/transform/default.hpp | 160 ++++++++++++++++++++--------------------
trunk/boost/proto/transform/fold.hpp | 60 +++++++-------
trunk/boost/proto/transform/fold_tree.hpp | 8 +-
trunk/boost/proto/transform/impl.hpp | 20 ++--
trunk/boost/proto/transform/make.hpp | 30 +++---
trunk/boost/proto/transform/pass_through.hpp | 16 ++--
trunk/boost/proto/transform/when.hpp | 16 ++--
13 files changed, 276 insertions(+), 275 deletions(-)
Modified: trunk/boost/proto/args.hpp
==============================================================================
--- trunk/boost/proto/args.hpp (original)
+++ trunk/boost/proto/args.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -1,7 +1,8 @@
#ifndef BOOST_PP_IS_ITERATING
///////////////////////////////////////////////////////////////////////////////
/// \file args.hpp
- /// Contains definition of args\<\> class template.
+ /// Contains definition of \c term\<\>, \c list1\<\>, \c list2\<\>, ...
+ /// class templates.
//
// Copyright 2008 Eric Niebler. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
Modified: trunk/boost/proto/detail/decltype.hpp
==============================================================================
--- trunk/boost/proto/detail/decltype.hpp (original)
+++ trunk/boost/proto/detail/decltype.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -420,9 +420,9 @@
typedef typename remove_const<typename remove_reference<PMF>::type>::type pmf_type;
typedef typename boost::result_of<pmf_type(T)>::type result_type;
- memfun(T t, PMF pmf)
+ memfun(T t, PMF p)
: obj(t)
- , pmf(pmf)
+ , pmf(p)
{}
result_type operator()() const
Modified: trunk/boost/proto/matches.hpp
==============================================================================
--- trunk/boost/proto/matches.hpp (original)
+++ trunk/boost/proto/matches.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -537,14 +537,14 @@
typedef Expr result_type;
/// \param expr An expression
- /// \return \c expr
+ /// \return \c e
typename impl::expr_param operator()(
- typename impl::expr_param expr
+ typename impl::expr_param e
, typename impl::state_param
, typename impl::data_param
) const
{
- return expr;
+ return e;
}
};
};
@@ -570,16 +570,16 @@
{
typedef Expr result_type;
- /// \param expr An expression
+ /// \param e An expression
/// \pre <tt>matches\<Expr,not_\>::::value</tt> is \c true.
- /// \return \c expr
+ /// \return \c e
typename impl::expr_param operator()(
- typename impl::expr_param expr
+ typename impl::expr_param e
, typename impl::state_param
, typename impl::data_param
) const
{
- return expr;
+ return e;
}
};
};
@@ -660,17 +660,17 @@
typedef typename which::template impl<Expr, State, Data>::result_type result_type;
- /// \param expr An expression
- /// \param state The current state
- /// \param data A data of arbitrary type
- /// \return <tt>which::impl<Expr, State, Data>()(expr, state, data)</tt>
+ /// \param e An expression
+ /// \param s The current state
+ /// \param d A data of arbitrary type
+ /// \return <tt>which::impl<Expr, State, Data>()(e, s, d)</tt>
result_type operator ()(
- typename impl::expr_param expr
- , typename impl::state_param state
- , typename impl::data_param data
+ typename impl::expr_param e
+ , typename impl::state_param s
+ , typename impl::data_param d
) const
{
- return typename which::template impl<Expr, State, Data>()(expr, state, data);
+ return typename which::template impl<Expr, State, Data>()(e, s, d);
}
};
};
@@ -692,11 +692,11 @@
{
typedef or_ proto_base_expr;
- /// \param expr An expression
- /// \param state The current state
- /// \param data A data of arbitrary type
+ /// \param e An expression
+ /// \param s The current state
+ /// \param d A data of arbitrary type
/// \pre <tt>matches\<Expr,or_\>::::value</tt> is \c true.
- /// \return <tt>result\<void(Expr, State, Data)\>::::which()(expr, state, data)</tt>
+ /// \return <tt>result\<void(Expr, State, Data)\>::::which()(e, s, d)</tt>
template<typename Expr, typename State, typename Data>
struct impl
@@ -730,11 +730,11 @@
struct impl
: detail::last<and_>::type::template impl<Expr, State, Data>
{
- /// \param expr An expression
- /// \param state The current state
- /// \param data A data of arbitrary type
+ /// \param e An expression
+ /// \param s The current state
+ /// \param d A data of arbitrary type
/// \pre <tt>matches\<Expr,and_\>::::value</tt> is \c true.
- /// \return <tt>result\<void(Expr, State, Data)\>::::which()(expr, state, data)</tt>
+ /// \return <tt>result\<void(Expr, State, Data)\>::::which()(e, s, d)</tt>
};
};
@@ -759,11 +759,11 @@
{
typedef switch_ proto_base_expr;
- /// \param expr An expression
- /// \param state The current state
- /// \param data A data of arbitrary type
+ /// \param e An expression
+ /// \param s The current state
+ /// \param d A data of arbitrary type
/// \pre <tt>matches\<Expr,switch_\>::::value</tt> is \c true.
- /// \return <tt>result\<void(Expr, State, Data)\>::::which()(expr, state, data)</tt>
+ /// \return <tt>result\<void(Expr, State, Data)\>::::which()(e, s, d)</tt>
template<typename Expr, typename State, typename Data>
struct impl
Modified: trunk/boost/proto/traits.hpp
==============================================================================
--- trunk/boost/proto/traits.hpp (original)
+++ trunk/boost/proto/traits.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -539,17 +539,17 @@
{
typedef Expr result_type;
- /// \param expr The current expression
+ /// \param e The current expression
/// \pre <tt>matches\<Expr, terminal\<T\> \>::::value</tt> is \c true.
- /// \return \c expr
+ /// \return \c e
/// \throw nothrow
typename impl::expr_param operator ()(
- typename impl::expr_param expr
+ typename impl::expr_param e
, typename impl::state_param
, typename impl::data_param
) const
{
- return expr;
+ return e;
}
};
Modified: trunk/boost/proto/transform/arg.hpp
==============================================================================
--- trunk/boost/proto/transform/arg.hpp (original)
+++ trunk/boost/proto/transform/arg.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -36,16 +36,16 @@
typedef Expr result_type;
/// Returns the current expression.
- /// \param expr The current expression.
- /// \return \c expr
+ /// \param e The current expression.
+ /// \return \c e
/// \throw nothrow
typename impl::expr_param operator()(
- typename impl::expr_param expr
+ typename impl::expr_param e
, typename impl::state_param
, typename impl::data_param
) const
{
- return expr;
+ return e;
}
};
};
@@ -68,16 +68,16 @@
typedef State result_type;
/// Returns the current state.
- /// \param state The current state.
- /// \return \c state
+ /// \param s The current state.
+ /// \return \c s
/// \throw nothrow
typename impl::state_param operator ()(
typename impl::expr_param
- , typename impl::state_param state
+ , typename impl::state_param s
, typename impl::data_param
) const
{
- return state;
+ return s;
}
};
};
@@ -101,16 +101,16 @@
typedef Data result_type;
/// Returns the current data.
- /// \param data The current data.
- /// \return \c data
+ /// \param d The current data.
+ /// \return \c d
/// \throw nothrow
typename impl::data_param operator ()(
typename impl::expr_param
, typename impl::state_param
- , typename impl::data_param data
+ , typename impl::data_param d
) const
{
- return data;
+ return d;
}
};
};
@@ -135,19 +135,19 @@
typename result_of::child_c<Expr, N>::type
result_type;
- /// Returns the N-th child of \c expr
+ /// Returns the N-th child of \c e
/// \pre <tt>arity_of\<Expr\>::::value \> N</tt>
- /// \param expr The current expression.
- /// \return <tt>proto::child_c\<N\>(expr)</tt>
+ /// \param e The current expression.
+ /// \return <tt>proto::child_c\<N\>(e)</tt>
/// \throw nothrow
typename result_of::child_c<typename impl::expr_param, N>::type
operator ()(
- typename impl::expr_param expr
+ typename impl::expr_param e
, typename impl::state_param
, typename impl::data_param
) const
{
- return proto::child_c<N>(expr);
+ return proto::child_c<N>(e);
}
};
};
@@ -173,17 +173,17 @@
/// Returns the value of the specified terminal expression.
/// \pre <tt>arity_of\<Expr\>::::value == 0</tt>.
- /// \param expr The current expression.
- /// \return <tt>proto::value(expr)</tt>
+ /// \param e The current expression.
+ /// \return <tt>proto::value(e)</tt>
/// \throw nothrow
typename result_of::value<typename impl::expr_param>::type
operator ()(
- typename impl::expr_param expr
+ typename impl::expr_param e
, typename impl::state_param
, typename impl::data_param
) const
{
- return proto::value(expr);
+ return proto::value(e);
}
};
};
Modified: trunk/boost/proto/transform/call.hpp
==============================================================================
--- trunk/boost/proto/transform/call.hpp (original)
+++ trunk/boost/proto/transform/call.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -117,11 +117,11 @@
/// expression, state, and data.
///
/// If \c Fun is a nullary PolymorphicFunctionObject, return <tt>Fun()()</tt>.
- /// Otherwise, return <tt>Fun()(expr, state, data)</tt>.
+ /// Otherwise, return <tt>Fun()(e, s, d)</tt>.
///
- /// \param expr The current expression
- /// \param state The current state
- /// \param data An arbitrary data
+ /// \param e The current expression
+ /// \param s The current state
+ /// \param d An arbitrary data
/// If \c Fun is a nullary PolymorphicFunctionObject, \c type is a typedef
/// for <tt>boost::result_of\<Fun()\>::::type</tt>. Otherwise, it is
@@ -146,13 +146,13 @@
typedef typename detail::as_mono_function<Fun(a0)>::type mono_fun;
typedef typename boost::result_of<mono_fun(a0)>::type result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
return mono_fun()(
- detail::as_lvalue(typename when<_, A0>::template impl<Expr, State, Data>()(expr, state, data))
+ detail::as_lvalue(typename when<_, A0>::template impl<Expr, State, Data>()(e, s, d))
);
}
};
@@ -164,19 +164,19 @@
typedef typename when<_, A0>::template impl<Expr, State, Data>::result_type a0;
typedef typename Fun::template impl<a0, State, Data>::result_type result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
return typename Fun::template impl<a0, State, Data>()(
- typename when<_, A0>::template impl<Expr, State, Data>()(expr, state, data)
- , state
- , data
+ typename when<_, A0>::template impl<Expr, State, Data>()(e, s, d)
+ , s
+ , d
);
}
};
- /// Let \c x be <tt>when\<_, A0\>()(expr, state, data)</tt> and \c X
+ /// Let \c x be <tt>when\<_, A0\>()(e, s, d)</tt> and \c X
/// be the type of \c x.
/// If \c Fun is a unary PolymorphicFunctionObject that accepts \c x,
/// then \c type is a typedef for <tt>boost::result_of\<Fun(X)\>::::type</tt>.
@@ -188,14 +188,14 @@
/// result of applying the \c A0 transform, the state, and the
/// data.
///
- /// Let \c x be <tt>when\<_, A0\>()(expr, state, data)</tt>.
+ /// Let \c x be <tt>when\<_, A0\>()(e, s, d)</tt>.
/// If \c Fun is a unary PolymorphicFunctionObject that accepts \c x,
/// then return <tt>Fun()(x)</tt>. Otherwise, return
- /// <tt>Fun()(x, state, data)</tt>.
+ /// <tt>Fun()(x, s, d)</tt>.
///
- /// \param expr The current expression
- /// \param state The current state
- /// \param data An arbitrary data
+ /// \param e The current expression
+ /// \param s The current state
+ /// \param d An arbitrary data
template<typename Expr, typename State, typename Data>
struct impl
: impl2<Expr, State, Data, is_transform<Fun>::value>
@@ -217,14 +217,14 @@
typedef typename detail::as_mono_function<Fun(a0, a1)>::type mono_fun;
typedef typename boost::result_of<mono_fun(a0, a1)>::type result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
return mono_fun()(
- detail::as_lvalue(typename when<_, A0>::template impl<Expr, State, Data>()(expr, state, data))
- , detail::as_lvalue(typename when<_, A1>::template impl<Expr, State, Data>()(expr, state, data))
+ detail::as_lvalue(typename when<_, A0>::template impl<Expr, State, Data>()(e, s, d))
+ , detail::as_lvalue(typename when<_, A1>::template impl<Expr, State, Data>()(e, s, d))
);
}
};
@@ -237,22 +237,22 @@
typedef typename when<_, A1>::template impl<Expr, State, Data>::result_type a1;
typedef typename Fun::template impl<a0, a1, Data>::result_type result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
return typename Fun::template impl<a0, a1, Data>()(
- typename when<_, A0>::template impl<Expr, State, Data>()(expr, state, data)
- , typename when<_, A1>::template impl<Expr, State, Data>()(expr, state, data)
- , data
+ typename when<_, A0>::template impl<Expr, State, Data>()(e, s, d)
+ , typename when<_, A1>::template impl<Expr, State, Data>()(e, s, d)
+ , d
);
}
};
- /// Let \c x be <tt>when\<_, A0\>()(expr, state, data)</tt> and \c X
+ /// Let \c x be <tt>when\<_, A0\>()(e, s, d)</tt> and \c X
/// be the type of \c x.
- /// Let \c y be <tt>when\<_, A1\>()(expr, state, data)</tt> and \c Y
+ /// Let \c y be <tt>when\<_, A1\>()(e, s, d)</tt> and \c Y
/// be the type of \c y.
/// If \c Fun is a binary PolymorphicFunction object that accepts \c x
/// and \c y, then \c type is a typedef for
@@ -266,15 +266,15 @@
/// the \c A0 transform, the result of applying the \c A1
/// transform, and the data.
///
- /// Let \c x be <tt>when\<_, A0\>()(expr, state, data)</tt>.
- /// Let \c y be <tt>when\<_, A1\>()(expr, state, data)</tt>.
+ /// Let \c x be <tt>when\<_, A0\>()(e, s, d)</tt>.
+ /// Let \c y be <tt>when\<_, A1\>()(e, s, d)</tt>.
/// If \c Fun is a binary PolymorphicFunction object that accepts \c x
/// and \c y, return <tt>Fun()(x, y)</tt>. Otherwise, return
- /// <tt>Fun()(x, y, data)</tt>.
+ /// <tt>Fun()(x, y, d)</tt>.
///
- /// \param expr The current expression
- /// \param state The current state
- /// \param data An arbitrary data
+ /// \param e The current expression
+ /// \param s The current state
+ /// \param d An arbitrary data
template<typename Expr, typename State, typename Data>
struct impl
: impl2<Expr, State, Data, is_transform<Fun>::value>
@@ -298,15 +298,15 @@
typedef typename detail::as_mono_function<Fun(a0, a1, a2)>::type mono_fun;
typedef typename boost::result_of<mono_fun(a0, a1, a2)>::type result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
return mono_fun()(
- detail::as_lvalue(typename when<_, A0>::template impl<Expr, State, Data>()(expr, state, data))
- , detail::as_lvalue(typename when<_, A1>::template impl<Expr, State, Data>()(expr, state, data))
- , detail::as_lvalue(typename when<_, A2>::template impl<Expr, State, Data>()(expr, state, data))
+ detail::as_lvalue(typename when<_, A0>::template impl<Expr, State, Data>()(e, s, d))
+ , detail::as_lvalue(typename when<_, A1>::template impl<Expr, State, Data>()(e, s, d))
+ , detail::as_lvalue(typename when<_, A2>::template impl<Expr, State, Data>()(e, s, d))
);
}
};
@@ -320,27 +320,27 @@
typedef typename when<_, A2>::template impl<Expr, State, Data>::result_type a2;
typedef typename Fun::template impl<a0, a1, a2>::result_type result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
return typename Fun::template impl<a0, a1, a2>()(
- typename when<_, A0>::template impl<Expr, State, Data>()(expr, state, data)
- , typename when<_, A1>::template impl<Expr, State, Data>()(expr, state, data)
- , typename when<_, A2>::template impl<Expr, State, Data>()(expr, state, data)
+ typename when<_, A0>::template impl<Expr, State, Data>()(e, s, d)
+ , typename when<_, A1>::template impl<Expr, State, Data>()(e, s, d)
+ , typename when<_, A2>::template impl<Expr, State, Data>()(e, s, d)
);
}
};
- /// Let \c x be <tt>when\<_, A0\>()(expr, state, data)</tt>.
- /// Let \c y be <tt>when\<_, A1\>()(expr, state, data)</tt>.
- /// Let \c z be <tt>when\<_, A2\>()(expr, state, data)</tt>.
+ /// Let \c x be <tt>when\<_, A0\>()(e, s, d)</tt>.
+ /// Let \c y be <tt>when\<_, A1\>()(e, s, d)</tt>.
+ /// Let \c z be <tt>when\<_, A2\>()(e, s, d)</tt>.
/// Return <tt>Fun()(x, y, z)</tt>.
///
- /// \param expr The current expression
- /// \param state The current state
- /// \param data An arbitrary data
+ /// \param e The current expression
+ /// \param s The current state
+ /// \param d An arbitrary data
template<typename Expr, typename State, typename Data>
struct impl
@@ -395,23 +395,23 @@
typename boost::result_of<mono_fun(BOOST_PP_ENUM_PARAMS(N, a))>::type
result_type;
- /// Let \c ax be <tt>when\<_, Ax\>()(expr, state, data)</tt>
+ /// Let \c ax be <tt>when\<_, Ax\>()(e, s, d)</tt>
/// for each \c x in <tt>[0,N]</tt>.
/// Return <tt>Fun()(a0, a1,... aN)</tt>.
///
- /// \param expr The current expression
- /// \param state The current state
- /// \param data An arbitrary data
+ /// \param e The current expression
+ /// \param s The current state
+ /// \param d An arbitrary data
result_type operator ()(
- typename impl::expr_param expr
- , typename impl::state_param state
- , typename impl::data_param data
+ typename impl::expr_param e
+ , typename impl::state_param s
+ , typename impl::data_param d
) const
{
#define M0(Z, M, DATA) \
detail::as_lvalue( \
typename when<_, BOOST_PP_CAT(A, M)> \
- ::template impl<Expr, State, Data>()(expr, state, data)) \
+ ::template impl<Expr, State, Data>()(e, s, d)) \
return mono_fun()(BOOST_PP_ENUM(N, M0, ~));
#undef M0
}
Modified: trunk/boost/proto/transform/default.hpp
==============================================================================
--- trunk/boost/proto/transform/default.hpp (original)
+++ trunk/boost/proto/transform/default.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -54,13 +54,13 @@
public: \
BOOST_PROTO_DECLTYPE_(OP proto::detail::MAKE<r0>(), result_type) \
result_type operator ()( \
- typename impl2::expr_param expr \
- , typename impl2::state_param state \
- , typename impl2::data_param data \
+ typename impl2::expr_param e \
+ , typename impl2::state_param s \
+ , typename impl2::data_param d \
) const \
{ \
typename Grammar::template impl<e0, State, Data> t0; \
- return OP t0(proto::child_c<0>(expr), state, data); \
+ return OP t0(proto::child_c<0>(e), s, d); \
} \
}; \
/**/
@@ -81,15 +81,15 @@
, result_type \
) \
result_type operator ()( \
- typename impl2::expr_param expr \
- , typename impl2::state_param state \
- , typename impl2::data_param data \
+ typename impl2::expr_param e \
+ , typename impl2::state_param s \
+ , typename impl2::data_param d \
) const \
{ \
typename Grammar::template impl<e0, State, Data> t0; \
typename Grammar::template impl<e1, State, Data> t1; \
- return t0(proto::child_c<0>(expr), state, data) \
- OP t1(proto::child_c<1>(expr), state, data); \
+ return t0(proto::child_c<0>(e), s, d) \
+ OP t1(proto::child_c<1>(e), s, d); \
} \
}; \
/**/
@@ -161,16 +161,16 @@
public:
typedef typename detail::mem_ptr_fun<r0, r1>::result_type result_type;
result_type operator ()(
- typename memfun_impl::expr_param expr
- , typename memfun_impl::state_param state
- , typename memfun_impl::data_param data
+ typename memfun_impl::expr_param e
+ , typename memfun_impl::state_param s
+ , typename memfun_impl::data_param d
) const
{
typename Grammar::template impl<e0, State, Data> t0;
typename Grammar::template impl<e1, State, Data> t1;
return detail::mem_ptr_fun<r0, r1>()(
- t0(proto::child_c<0>(expr), state, data)
- , t1(proto::child_c<1>(expr), state, data)
+ t0(proto::child_c<0>(e), s, d)
+ , t1(proto::child_c<1>(e), s, d)
);
}
};
@@ -188,16 +188,16 @@
public:
typedef detail::memfun<r0, r1> result_type;
result_type const operator ()(
- typename memfun_impl::expr_param expr
- , typename memfun_impl::state_param state
- , typename memfun_impl::data_param data
+ typename memfun_impl::expr_param e
+ , typename memfun_impl::state_param s
+ , typename memfun_impl::data_param d
) const
{
typename Grammar::template impl<e0, State, Data> t0;
typename Grammar::template impl<e1, State, Data> t1;
return detail::memfun<r0, r1>(
- t0(proto::child_c<0>(expr), state, data)
- , t1(proto::child_c<1>(expr), state, data)
+ t0(proto::child_c<0>(e), s, d)
+ , t1(proto::child_c<1>(e), s, d)
);
}
};
@@ -217,13 +217,13 @@
public:
BOOST_PROTO_DECLTYPE_(proto::detail::make_mutable<r0>() ++, result_type)
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
typename Grammar::template impl<e0, State, Data> t0;
- return t0(proto::child_c<0>(expr), state, data) ++;
+ return t0(proto::child_c<0>(e), s, d) ++;
}
};
@@ -237,13 +237,13 @@
public:
BOOST_PROTO_DECLTYPE_(proto::detail::make_mutable<r0>() --, result_type)
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
typename Grammar::template impl<e0, State, Data> t0;
- return t0(proto::child_c<0>(expr), state, data) --;
+ return t0(proto::child_c<0>(e), s, d) --;
}
};
@@ -262,15 +262,15 @@
, result_type
)
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
typename Grammar::template impl<e0, State, Data> t0;
typename Grammar::template impl<e1, State, Data> t1;
- return t0(proto::child_c<0>(expr), state, data) [
- t1(proto::child_c<1>(expr), state, data) ];
+ return t0(proto::child_c<0>(e), s, d) [
+ t1(proto::child_c<1>(e), s, d) ];
}
};
@@ -293,17 +293,17 @@
, result_type
)
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
typename Grammar::template impl<e0, State, Data> t0;
typename Grammar::template impl<e1, State, Data> t1;
typename Grammar::template impl<e2, State, Data> t2;
- return t0(proto::child_c<0>(expr), state, data)
- ? t1(proto::child_c<1>(expr), state, data)
- : t2(proto::child_c<2>(expr), state, data);
+ return t0(proto::child_c<0>(e), s, d)
+ ? t1(proto::child_c<1>(e), s, d)
+ : t2(proto::child_c<2>(e), s, d);
}
};
@@ -319,15 +319,15 @@
public:
typedef typename proto::detail::comma_result<r0, r1>::type result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
typename Grammar::template impl<e0, State, Data> t0;
typename Grammar::template impl<e1, State, Data> t1;
- return t0(proto::child_c<0>(expr), state, data)
- , t1(proto::child_c<1>(expr), state, data);
+ return t0(proto::child_c<0>(e), s, d)
+ , t1(proto::child_c<1>(e), s, d);
}
};
@@ -342,7 +342,7 @@
#define EVAL(Z, N, DATA) \
typename Grammar::template impl<BOOST_PP_CAT(e, N), State, Data>()( \
- proto::child_c<N>(DATA), state, data \
+ proto::child_c<N>(DATA), s, d \
) \
/**/
@@ -361,12 +361,12 @@
result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
- return EVAL(~, 0, expr)();
+ return EVAL(~, 0, e)();
}
};
@@ -386,15 +386,15 @@
result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
return this->invoke(
- expr
- , state
- , data
+ e
+ , s
+ , d
, is_member_function_pointer<function_type>()
, is_member_object_pointer<function_type>()
);
@@ -402,38 +402,38 @@
private:
result_type invoke(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
, mpl::false_
, mpl::false_
) const
{
- return EVAL(~, 0, expr)(EVAL(~, 1, expr));
+ return EVAL(~, 0, e)(EVAL(~, 1, e));
}
result_type invoke(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
, mpl::true_
, mpl::false_
) const
{
using namespace detail::get_pointer_;
- return (get_pointer(EVAL(~, 1, expr)) ->* EVAL(~, 0, expr))();
+ return (get_pointer(EVAL(~, 1, e)) ->* EVAL(~, 0, e))();
}
result_type invoke(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
, mpl::false_
, mpl::true_
) const
{
using namespace detail::get_pointer_;
- return (get_pointer(EVAL(~, 1, expr)) ->* EVAL(~, 0, expr));
+ return (get_pointer(EVAL(~, 1, e)) ->* EVAL(~, 0, e));
}
};
@@ -485,36 +485,36 @@
result_type;
result_type operator ()(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
) const
{
- return this->invoke(expr, state, data, is_member_function_pointer<function_type>());
+ return this->invoke(e, s, d, is_member_function_pointer<function_type>());
}
private:
result_type invoke(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
, mpl::false_
) const
{
- return EVAL(~, 0, expr)(BOOST_PP_ENUM_SHIFTED(N, EVAL, expr));
+ return EVAL(~, 0, e)(BOOST_PP_ENUM_SHIFTED(N, EVAL, e));
}
result_type invoke(
- typename impl2::expr_param expr
- , typename impl2::state_param state
- , typename impl2::data_param data
+ typename impl2::expr_param e
+ , typename impl2::state_param s
+ , typename impl2::data_param d
, mpl::true_
) const
{
- #define M0(Z, M, expr) BOOST_PP_COMMA_IF(BOOST_PP_SUB(M, 2)) EVAL(Z, M, expr)
+ #define M0(Z, M, e) BOOST_PP_COMMA_IF(BOOST_PP_SUB(M, 2)) EVAL(Z, M, e)
using namespace detail::get_pointer_;
- return (get_pointer(EVAL(~, 1, expr)) ->* EVAL(~, 0, expr))(
- BOOST_PP_REPEAT_FROM_TO(2, N, M0, expr)
+ return (get_pointer(EVAL(~, 1, e)) ->* EVAL(~, 0, e))(
+ BOOST_PP_REPEAT_FROM_TO(2, N, M0, e)
);
#undef M0
}
Modified: trunk/boost/proto/transform/fold.hpp
==============================================================================
--- trunk/boost/proto/transform/fold.hpp (original)
+++ trunk/boost/proto/transform/fold.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -60,9 +60,9 @@
template<typename Expr, typename State>
typename when<_, Transform>::template impl<Expr &, State const &, Data>::result_type
- operator ()(Expr &expr, State const &state) const
+ operator ()(Expr &e, State const &s) const
{
- return typename when<_, Transform>::template impl<Expr &, State const &, Data>()(expr, state, this->v_);
+ return typename when<_, Transform>::template impl<Expr &, State const &, Data>()(e, s, this->v_);
}
private:
@@ -145,9 +145,9 @@
, BOOST_PP_CAT(state, N) \
, Data \
>()( \
- proto::child_c<N>(expr) \
+ proto::child_c<N>(e) \
, BOOST_PP_CAT(s, N) \
- , data \
+ , d \
); \
/**/
@@ -175,9 +175,9 @@
, BOOST_PP_CAT(state, BOOST_PP_SUB(DATA, N)) \
, Data \
>()( \
- proto::child_c<BOOST_PP_SUB(DATA, BOOST_PP_INC(N))>(expr) \
+ proto::child_c<BOOST_PP_SUB(DATA, BOOST_PP_INC(N))>(e) \
, BOOST_PP_CAT(s, BOOST_PP_SUB(DATA, N)) \
- , data \
+ , d \
); \
/**/
@@ -227,27 +227,27 @@
>::type
result_type;
- /// Let \c seq be <tt>when\<_, Sequence\>()(expr, state, data)</tt>, let
- /// \c state0 be <tt>when\<_, State0\>()(expr, state, data)</tt>, and
- /// let \c fun(data) be an object such that <tt>fun(data)(expr, state)</tt>
- /// is equivalent to <tt>when\<_, Fun\>()(expr, state, data)</tt>. Then, this
- /// function returns <tt>fusion::fold(seq, state0, fun(data))</tt>.
+ /// Let \c seq be <tt>when\<_, Sequence\>()(e, s, d)</tt>, let
+ /// \c state0 be <tt>when\<_, State0\>()(e, s, d)</tt>, and
+ /// let \c fun(d) be an object such that <tt>fun(d)(e, s)</tt>
+ /// is equivalent to <tt>when\<_, Fun\>()(e, s, d)</tt>. Then, this
+ /// function returns <tt>fusion::fold(seq, state0, fun(d))</tt>.
///
- /// \param expr The current expression
- /// \param state The current state
- /// \param data An arbitrary data
+ /// \param e The current expression
+ /// \param s The current state
+ /// \param d An arbitrary data
result_type operator ()(
- typename impl::expr_param expr
- , typename impl::state_param state
- , typename impl::data_param data
+ typename impl::expr_param e
+ , typename impl::state_param s
+ , typename impl::data_param d
) const
{
- typename when<_, Sequence>::template impl<Expr, State, Data> sequence;
- detail::as_callable<Fun, Data> fun(data);
+ typename when<_, Sequence>::template impl<Expr, State, Data> seq;
+ detail::as_callable<Fun, Data> f(d);
return fusion::fold(
- BOOST_PROTO_AS_FUSION_SEQUENCE(sequence(expr, state, data))
- , typename when<_, State0>::template impl<Expr, State, Data>()(expr, state, data)
- , fun
+ BOOST_PROTO_AS_FUSION_SEQUENCE(seq(e, s, d))
+ , typename when<_, State0>::template impl<Expr, State, Data>()(e, s, d)
+ , f
);
}
};
@@ -323,13 +323,13 @@
typedef BOOST_PP_CAT(state, N) result_type;
result_type operator ()(
- typename fold_impl::expr_param expr
- , typename fold_impl::state_param state
- , typename fold_impl::data_param data
+ typename fold_impl::expr_param e
+ , typename fold_impl::state_param s
+ , typename fold_impl::data_param d
) const
{
state0 s0 =
- typename when<_, State0>::template impl<Expr, State, Data>()(expr, state, data);
+ typename when<_, State0>::template impl<Expr, State, Data>()(e, s, d);
BOOST_PP_REPEAT(N, BOOST_PROTO_FOLD_STATE, N)
return BOOST_PP_CAT(s, N);
}
@@ -344,13 +344,13 @@
typedef state0 result_type;
result_type operator ()(
- typename reverse_fold_impl::expr_param expr
- , typename reverse_fold_impl::state_param state
- , typename reverse_fold_impl::data_param data
+ typename reverse_fold_impl::expr_param e
+ , typename reverse_fold_impl::state_param s
+ , typename reverse_fold_impl::data_param d
) const
{
BOOST_PP_CAT(state, N) BOOST_PP_CAT(s, N) =
- typename when<_, State0>::template impl<Expr, State, Data>()(expr, state, data);
+ typename when<_, State0>::template impl<Expr, State, Data>()(e, s, d);
BOOST_PP_REPEAT(N, BOOST_PROTO_REVERSE_FOLD_STATE, N)
return s0;
}
Modified: trunk/boost/proto/transform/fold_tree.hpp
==============================================================================
--- trunk/boost/proto/transform/fold_tree.hpp (original)
+++ trunk/boost/proto/transform/fold_tree.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -85,9 +85,9 @@
/// \endcode
///
/// With <tt>recurse_if_\<\></tt> as defined above,
- /// <tt>fold_tree\<Sequence, State0, Fun\>()(expr, state, data)</tt> is
+ /// <tt>fold_tree\<Sequence, State0, Fun\>()(e, s, d)</tt> is
/// equivalent to
- /// <tt>fold<Sequence, State0, recurse_if_<Expr::proto_tag, Fun> >()(expr, state, data).</tt>
+ /// <tt>fold<Sequence, State0, recurse_if_<Expr::proto_tag, Fun> >()(e, s, d).</tt>
/// It has the effect of folding a tree front-to-back, recursing into
/// child nodes that share a tag type with the parent node.
template<typename Sequence, typename State0, typename Fun>
@@ -134,9 +134,9 @@
/// \endcode
///
/// With <tt>recurse_if_\<\></tt> as defined above,
- /// <tt>reverse_fold_tree\<Sequence, State0, Fun\>()(expr, state, data)</tt> is
+ /// <tt>reverse_fold_tree\<Sequence, State0, Fun\>()(e, s, d)</tt> is
/// equivalent to
- /// <tt>reverse_fold<Sequence, State0, recurse_if_<Expr::proto_tag, Fun> >()(expr, state, data).</tt>
+ /// <tt>reverse_fold<Sequence, State0, recurse_if_<Expr::proto_tag, Fun> >()(e, s, d).</tt>
/// It has the effect of folding a tree back-to-front, recursing into
/// child nodes that share a tag type with the parent node.
template<typename Sequence, typename State0, typename Fun>
Modified: trunk/boost/proto/transform/impl.hpp
==============================================================================
--- trunk/boost/proto/transform/impl.hpp (original)
+++ trunk/boost/proto/transform/impl.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -60,40 +60,40 @@
template<typename Expr>
typename apply_transform<PrimitiveTransform, Expr &>::result_type
- operator ()(Expr &expr) const
+ operator ()(Expr &e) const
{
int i = 0;
- return apply_transform<PrimitiveTransform, Expr &>()(expr, i, i);
+ return apply_transform<PrimitiveTransform, Expr &>()(e, i, i);
}
template<typename Expr, typename State>
typename apply_transform<PrimitiveTransform, Expr &, State &>::result_type
- operator ()(Expr &expr, State &state) const
+ operator ()(Expr &e, State &s) const
{
int i = 0;
- return apply_transform<PrimitiveTransform, Expr &, State &>()(expr, state, i);
+ return apply_transform<PrimitiveTransform, Expr &, State &>()(e, s, i);
}
template<typename Expr, typename State>
typename apply_transform<PrimitiveTransform, Expr &, State const &>::result_type
- operator ()(Expr &expr, State const &state) const
+ operator ()(Expr &e, State const &s) const
{
int i = 0;
- return apply_transform<PrimitiveTransform, Expr &, State const &>()(expr, state, i);
+ return apply_transform<PrimitiveTransform, Expr &, State const &>()(e, s, i);
}
template<typename Expr, typename State, typename Data>
typename apply_transform<PrimitiveTransform, Expr &, State &, Data &>::result_type
- operator ()(Expr &expr, State &state, Data &data) const
+ operator ()(Expr &e, State &s, Data &d) const
{
- return apply_transform<PrimitiveTransform, Expr &, State &, Data &>()(expr, state, data);
+ return apply_transform<PrimitiveTransform, Expr &, State &, Data &>()(e, s, d);
}
template<typename Expr, typename State, typename Data>
typename apply_transform<PrimitiveTransform, Expr &, State const &, Data &>::result_type
- operator ()(Expr &expr, State const &state, Data &data) const
+ operator ()(Expr &e, State const &s, Data &d) const
{
- return apply_transform<PrimitiveTransform, Expr &, State const &, Data &>()(expr, state, data);
+ return apply_transform<PrimitiveTransform, Expr &, State const &, Data &>()(e, s, d);
}
};
Modified: trunk/boost/proto/transform/make.hpp
==============================================================================
--- trunk/boost/proto/transform/make.hpp (original)
+++ trunk/boost/proto/transform/make.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -373,28 +373,28 @@
typedef typename detail::make_if_<Object, Expr, State, Data>::type result_type;
//typedef typename detail::make_<Object, Expr, State, Data>::type result_type;
- /// Let \c ax be <tt>when\<_, Ax\>()(expr, state, data)</tt>
+ /// Let \c ax be <tt>when\<_, Ax\>()(e, s, d)</tt>
/// for each \c x in <tt>[0,N]</tt>.
/// Let \c T be <tt>result\<void(Expr, State, Data)\>::::type</tt>.
/// Return <tt>T(a0, a1,... aN)</tt>.
///
- /// \param expr The current expression
- /// \param state The current state
- /// \param data An arbitrary data
+ /// \param e The current expression
+ /// \param s The current state
+ /// \param d An arbitrary data
result_type operator ()(
- typename impl::expr_param expr
- , typename impl::state_param state
- , typename impl::data_param data
+ typename impl::expr_param e
+ , typename impl::state_param s
+ , typename impl::data_param d
) const
{
- proto::detail::ignore_unused(expr);
- proto::detail::ignore_unused(state);
- proto::detail::ignore_unused(data);
+ proto::detail::ignore_unused(e);
+ proto::detail::ignore_unused(s);
+ proto::detail::ignore_unused(d);
return detail::construct<result_type>(
#define TMP(Z, M, DATA) \
detail::as_lvalue( \
typename when<_, BOOST_PP_CAT(A, M)> \
- ::template impl<Expr, State, Data>()(expr, state, data) \
+ ::template impl<Expr, State, Data>()(e, s, d) \
)
BOOST_PP_ENUM(N, TMP, DATA)
#undef TMP
@@ -415,16 +415,16 @@
typedef proto::expr<Tag, Args, Arity> result_type;
result_type operator ()(
- typename impl::expr_param expr
- , typename impl::state_param state
- , typename impl::data_param data
+ typename impl::expr_param e
+ , typename impl::state_param s
+ , typename impl::data_param d
) const
{
return proto::expr<Tag, Args, Arity>::make(
#define TMP(Z, M, DATA) \
detail::as_lvalue( \
typename when<_, BOOST_PP_CAT(A, M)> \
- ::template impl<Expr, State, Data>()(expr, state, data) \
+ ::template impl<Expr, State, Data>()(e, s, d) \
)
BOOST_PP_ENUM(N, TMP, DATA)
#undef TMP
Modified: trunk/boost/proto/transform/pass_through.hpp
==============================================================================
--- trunk/boost/proto/transform/pass_through.hpp (original)
+++ trunk/boost/proto/transform/pass_through.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -51,7 +51,7 @@
, State \
, Data \
>()( \
- expr.proto_base().BOOST_PP_CAT(child, N), state, data \
+ e.proto_base().BOOST_PP_CAT(child, N), s, d \
)
#define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PROTO_MAX_ARITY, <boost/proto/transform/pass_through.hpp>))
@@ -66,16 +66,16 @@
{
typedef Expr result_type;
- /// \param expr An expression
- /// \return \c expr
+ /// \param e An expression
+ /// \return \c e
/// \throw nothrow
typename pass_through_impl::expr_param operator()(
- typename pass_through_impl::expr_param expr
+ typename pass_through_impl::expr_param e
, typename pass_through_impl::state_param
, typename pass_through_impl::data_param
) const
{
- return expr;
+ return e;
}
};
@@ -168,9 +168,9 @@
> result_type;
result_type operator ()(
- typename pass_through_impl::expr_param expr
- , typename pass_through_impl::state_param state
- , typename pass_through_impl::data_param data
+ typename pass_through_impl::expr_param e
+ , typename pass_through_impl::state_param s
+ , typename pass_through_impl::data_param d
) const
{
result_type that = {
Modified: trunk/boost/proto/transform/when.hpp
==============================================================================
--- trunk/boost/proto/transform/when.hpp (original)
+++ trunk/boost/proto/transform/when.hpp 2008-11-11 13:41:49 EST (Tue, 11 Nov 2008)
@@ -168,18 +168,18 @@
/// whether <tt>is_callable\<R\>::::value</tt> is \c true or
/// \c false.
///
- /// \param expr The current expression
- /// \param state The current state
- /// \param data An arbitrary data
+ /// \param e The current expression
+ /// \param s The current state
+ /// \param d An arbitrary data
/// \pre <tt>matches\<Expr, Grammar\>::::value</tt> is \c true
- /// \return <tt>result\<void(Expr, State, Data)\>::::impl()(expr, state, data)</tt>
+ /// \return <tt>result\<void(Expr, State, Data)\>::::impl()(e, s, d)</tt>
result_type operator ()(
- typename impl::expr_param expr
- , typename impl::state_param state
- , typename impl::data_param data
+ typename impl::expr_param e
+ , typename impl::state_param s
+ , typename impl::data_param d
) const
{
- return typename which::template impl<Expr, State, Data>()(expr, state, data);
+ return typename which::template impl<Expr, State, Data>()(e, s, d);
}
};
};
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