|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68430 - in sandbox/SOC/2010/phoenix3/boost/phoenix: core fusion object operator operator/preprocessed scope statement
From: thom.heller_at_[hidden]
Date: 2011-01-25 05:54:36
Author: theller
Date: 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
New Revision: 68430
URL: http://svn.boost.org/trac/boost/changeset/68430
Log:
introduced context, contexts contain the environment and the actions
Text files modified:
sandbox/SOC/2010/phoenix3/boost/phoenix/core/arity.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/core/environment.hpp | 111 +++++++++++++++++++++++++++++----------
sandbox/SOC/2010/phoenix3/boost/phoenix/core/is_nullary.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/core/meta_grammar.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/core/terminal.hpp | 9 +-
sandbox/SOC/2010/phoenix3/boost/phoenix/fusion/at.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/object/const_cast.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/object/construct.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/object/delete.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/object/dynamic_cast.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/object/new.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/object/reinterpret_cast.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/object/static_cast.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_10.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_20.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_30.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_40.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_50.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp | 8 +-
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/let.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/local_variable.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scoped_environment.hpp | 16 +---
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/do_while.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/for.hpp | 10 +-
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/if.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/switch.hpp | 6 +-
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/throw.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/try_catch.hpp | 4
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/while.hpp | 2
31 files changed, 141 insertions(+), 95 deletions(-)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/arity.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/arity.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/arity.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -57,7 +57,7 @@
, mpl::int_<0>
, mpl::max<
proto::_state
- , evaluator(proto::_, _env)
+ , evaluator(proto::_, _context)
>()
>
{};
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/environment.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/environment.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/environment.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -60,40 +60,27 @@
BOOST_PHOENIX_GET_ENVIRONMENT(actions, 1)
#undef BOOST_PHOENIX_GET_ENVIRONMENT
+ }
- struct args_at
+ struct _context
+ : proto::transform<_context>
+ {
+ template <typename Expr, typename State, typename Data>
+ struct impl
+ : proto::transform_impl<Expr, State, Data>
{
- BOOST_PROTO_CALLABLE()
-
- template <typename Sig>
- struct result;
+ typedef fusion::vector2<State, Data> result_type;
- template <typename This, typename N, typename Env>
- struct result<This(N, Env)>
- : result<This(N, Env const&)>
- {};
-
- template <typename This, typename N, typename Env>
- struct result<This(N, Env &)>
- : fusion::result_of::at<
- typename boost::remove_reference<
- typename fusion::result_of::at<
- Env
- , mpl::int_<0>
- >::type
- >::type
- , typename proto::detail::uncvref<N>::type
- >
- {};
-
- template <typename N, typename Env>
- typename result<args_at(N, Env &)>::type
- operator()(N const & n, Env& env) const
+ result_type operator()(
+ typename impl::expr_param
+ , typename impl::state_param s
+ , typename impl::data_param d
+ ) const
{
- return proto::functional::at()(args()(env), n);
+ return fusion::vector2<State, Data>(s, d);
}
};
- }
+ };
struct _env
: proto::transform<_env>
@@ -102,19 +89,83 @@
struct impl
: proto::transform_impl<Expr, State, Data>
{
- typedef fusion::vector2<State, Data> result_type;
+ typedef State result_type;
result_type operator()(
typename impl::expr_param
, typename impl::state_param s
+ , typename impl::data_param
+ ) const
+ {
+ return s;
+ }
+ };
+ };
+
+ template <typename Expr, typename State>
+ struct _env::impl<Expr, State, int>
+ : proto::transform_impl<Expr, State, int>
+ {
+ typedef
+ typename fusion::result_of::at_c<
+ typename boost::remove_reference<State>::type
+ , 0
+ >::type
+ result_type;
+
+ result_type operator()(
+ typename impl::expr_param
+ , typename impl::state_param s
+ , typename impl::data_param
+ ) const
+ {
+ return fusion::at_c<0>(s);
+ }
+ };
+
+ /*
+ struct _actions
+ : proto::transform<_actions>
+ {
+ template <typename Expr, typename State, typename Data>
+ struct impl
+ : proto::transform_impl<Expr, State, Data>
+ {
+ typedef Data result_type;
+
+ result_type operator()(
+ typename impl::expr_param
+ , typename impl::state_param
, typename impl::data_param d
) const
{
- return fusion::vector2<State, Data>(s, d);
+ return d;
}
};
};
+ template <typename Expr, typename State>
+ struct _actions::impl<Expr, State, int>
+ : proto::transform_impl<Expr, State, int>
+ {
+ typedef
+ typename fusion::result_of::at_c<
+ typename boost::remove_reference<State>::type
+ , 1
+ >::type
+ result_type;
+
+ result_type operator()(
+ typename impl::expr_param
+ , typename impl::state_param s
+ , typename impl::data_param
+ ) const
+ {
+ return fusion::at_c<1>(s);
+ }
+ };
+*/
+
template <typename T, typename Enable = void>
struct is_environment : fusion::traits::is_sequence<T> {};
}}
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/is_nullary.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/is_nullary.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/is_nullary.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -32,7 +32,7 @@
, mpl::true_()
, mpl::and_<
proto::_state
- , evaluator(proto::_, _env)
+ , evaluator(proto::_, _context)
>()
>
{};
@@ -48,7 +48,7 @@
: proto::lazy<
result_of::is_nullary<custom_terminal<proto::_value> >(
proto::_
- , _env
+ , _context
)
>
{};
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/meta_grammar.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/meta_grammar.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/meta_grammar.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -53,6 +53,8 @@
// construct
struct default_actions
{
+ typedef void is_phoenix_action;
+
template <typename Rule, typename Dummy = void>
struct when
: proto::_default<meta_grammar>
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/terminal.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/terminal.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/terminal.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -45,7 +45,7 @@
template <typename Grammar>
struct default_actions::when<rule::custom_terminal, Grammar>
- : proto::lazy<custom_terminal<proto::_value>(proto::_value, _env)>
+ : proto::lazy<custom_terminal<proto::_value>(proto::_value, _context)>
{};
namespace detail
@@ -59,10 +59,9 @@
template <typename Grammar>
struct default_actions::when<rule::argument, Grammar>
: proto::call<
- functional::args_at(
- //mpl::prior<boost::is_placeholder<proto::_value>()>()
- detail::placeholder_idx<boost::is_placeholder<proto::_value>()>()
- , _env
+ proto::functional::at(
+ _env
+ , detail::placeholder_idx<boost::is_placeholder<proto::_value>()>()
)
>
{};
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/fusion/at.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/fusion/at.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/fusion/at.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -26,7 +26,7 @@
struct default_actions::when<rule::at_c, Dummy>
: proto::call<
proto::functional::at(
- evaluator(proto::_child_c<1>, _env)
+ evaluator(proto::_child_c<1>, _context)
, proto::_value(proto::_child_c<0>)
)
>
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/object/const_cast.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/object/const_cast.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/object/const_cast.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -38,8 +38,8 @@
struct default_actions::when<rule::const_cast_, Dummy>
: proto::lazy<
const_cast_eval<
- evaluator(proto::_child_c<0>, _env)
- >(_env, proto::_child_c<1>)
+ evaluator(proto::_child_c<0>, _context)
+ >(_context, proto::_child_c<1>)
>
{};
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/object/construct.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/object/construct.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/object/construct.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -48,7 +48,7 @@
> \
, proto::lazy< \
construct_eval<proto::_value(proto::_child_c<0>)>( \
- _env \
+ _context \
, BOOST_PP_ENUM_SHIFTED( \
BOOST_PP_INC(N) \
, PHOENIX_CONSTRUCT_CHILD \
@@ -67,7 +67,7 @@
, proto::lazy<
construct_eval<
proto::_value(proto::_child_c<0>)
- >(_env)
+ >(_context)
>
>
, BOOST_PP_ENUM_SHIFTED(PHOENIX_COMPOSITE_LIMIT, PHOENIX_CONSTRUCT_CALL, _)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/object/delete.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/object/delete.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/object/delete.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -45,13 +45,13 @@
result_type
operator()(Env& env, P const& p) const
{
- /*return*/ delete eval(p, env);
+ delete eval(p, env);
}
};
template <typename Dummy>
struct default_actions::when<rule::delete_, Dummy>
- : proto::call<delete_eval(_env, proto::_child_c<0>)>
+ : proto::call<delete_eval(_context, proto::_child_c<0>)>
{};
template <typename P>
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/object/dynamic_cast.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/object/dynamic_cast.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/object/dynamic_cast.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -38,8 +38,8 @@
struct default_actions::when<rule::dynamic_cast_, Dummy>
: proto::lazy<
dynamic_cast_eval<
- evaluator(proto::_child_c<0>, _env)
- >(_env, proto::_child_c<1>)
+ evaluator(proto::_child_c<0>, _context)
+ >(_context, proto::_child_c<1>)
>
{};
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/object/new.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/object/new.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/object/new.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -49,7 +49,7 @@
> \
, proto::lazy< \
new_eval<proto::_value(proto::_child_c<0>)>( \
- _env \
+ _context \
, BOOST_PP_ENUM_SHIFTED( \
BOOST_PP_INC(N) \
, PHOENIX_NEW_CHILD \
@@ -68,7 +68,7 @@
, proto::lazy<
new_eval<
proto::_value(proto::_child_c<0>)
- >(_env)
+ >(_context)
>
>
, BOOST_PP_ENUM_SHIFTED(PHOENIX_COMPOSITE_LIMIT, PHOENIX_NEW_CALL, _)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/object/reinterpret_cast.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/object/reinterpret_cast.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/object/reinterpret_cast.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -37,8 +37,8 @@
template <typename Dummy>
struct default_actions::when<rule::reinterpret_cast_, Dummy>
: proto::lazy<
- reinterpret_cast_eval<evaluator(proto::_child_c<0>, _env)
- >(_env, proto::_child_c<1>)>
+ reinterpret_cast_eval<evaluator(proto::_child_c<0>, _context)
+ >(_context, proto::_child_c<1>)>
{};
template <typename T, typename U>
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/object/static_cast.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/object/static_cast.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/object/static_cast.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -37,8 +37,8 @@
template <typename Dummy>
struct default_actions::when<rule::static_cast_, Dummy>
: proto::lazy<
- static_cast_eval<evaluator(proto::_child_c<0>, _env)
- >(_env, proto::_child_c<1>)>
+ static_cast_eval<evaluator(proto::_child_c<0>, _context)
+ >(_context, proto::_child_c<1>)>
{};
template <typename T, typename U>
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -115,7 +115,7 @@
template <typename Dummy>
struct default_actions::when<rule::mem_fun_ptr, Dummy>
- : proto::call<mem_fun_ptr_eval(_env, proto::_)>
+ : proto::call<mem_fun_ptr_eval(_context, proto::_)>
{};
}}
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_10.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_10.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_10.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -452,6 +452,6 @@
};
template <typename Dummy>
struct default_actions::when<rule::mem_fun_ptr, Dummy>
- : proto::call<mem_fun_ptr_eval(_env, proto::_)>
+ : proto::call<mem_fun_ptr_eval(_context, proto::_)>
{};
}}
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_20.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_20.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_20.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -892,6 +892,6 @@
};
template <typename Dummy>
struct default_actions::when<rule::mem_fun_ptr, Dummy>
- : proto::call<mem_fun_ptr_eval(_env, proto::_)>
+ : proto::call<mem_fun_ptr_eval(_context, proto::_)>
{};
}}
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_30.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_30.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_30.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -1332,6 +1332,6 @@
};
template <typename Dummy>
struct default_actions::when<rule::mem_fun_ptr, Dummy>
- : proto::call<mem_fun_ptr_eval(_env, proto::_)>
+ : proto::call<mem_fun_ptr_eval(_context, proto::_)>
{};
}}
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_40.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_40.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_40.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -1772,6 +1772,6 @@
};
template <typename Dummy>
struct default_actions::when<rule::mem_fun_ptr, Dummy>
- : proto::call<mem_fun_ptr_eval(_env, proto::_)>
+ : proto::call<mem_fun_ptr_eval(_context, proto::_)>
{};
}}
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_50.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_50.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator/preprocessed/member_50.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -2212,6 +2212,6 @@
};
template <typename Dummy>
struct default_actions::when<rule::mem_fun_ptr, Dummy>
- : proto::call<mem_fun_ptr_eval(_env, proto::_)>
+ : proto::call<mem_fun_ptr_eval(_context, proto::_)>
{};
}}
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -148,7 +148,7 @@
struct default_actions::when<rule::dynamic_member, Dummy>
: proto::call<
dynamic_member_eval(
- _env
+ _context
, proto::_value(proto::_child_c<0>)
, proto::_value(proto::_child_c<1>)
)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -169,7 +169,7 @@
struct default_actions::when<rule::lambda, Dummy>
: proto::call<
lambda_eval(
- _env
+ _context
, proto::_value(proto::_child_c<0>)
, proto::_child_c<1>
, proto::_child_c<2>
@@ -238,7 +238,7 @@
rule::local_var_def_list
, meta_grammar
>
- , detail::local_var_def_is_nullary(proto::_child_c<0>, _env)// mpl::true_()//evaluator(proto::_child_c<1>, _env)
+ , detail::local_var_def_is_nullary(proto::_child_c<0>, _context)// mpl::true_()//evaluator(proto::_child_c<1>, _context)
>
>
{};
@@ -435,14 +435,14 @@
: proto::or_<
proto::when<
expression::lambda_actor<meta_grammar>
- , lambda_actor_eval(_env, proto::_child_c<0>)
+ , lambda_actor_eval(_context, proto::_child_c<0>)
>
, proto::when<
expression::lambda_actor<
rule::local_var_def_list
, meta_grammar
>
- , lambda_actor_eval(_env, proto::_child_c<0>, proto::_child_c<1>)
+ , lambda_actor_eval(_context, proto::_child_c<0>, proto::_child_c<1>)
>
>
{};
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/let.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/scope/let.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/let.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -110,7 +110,7 @@
template <typename Dummy>
struct default_actions::when<rule::let, Dummy>
- : proto::call<let_eval(_env, proto::_child_c<0>, proto::_child_c<1>)>
+ : proto::call<let_eval(_context, proto::_child_c<0>, proto::_child_c<1>)>
{};
template <typename Locals = void, typename Dummy = void>
@@ -172,7 +172,7 @@
struct is_nullary::when<rule::let, Dummy>
: proto::make<
mpl::and_<
- detail::local_var_def_is_nullary(proto::_child_c<0>, _env)
+ detail::local_var_def_is_nullary(proto::_child_c<0>, _context)
, evaluator(
proto::_child_c<1>
, fusion::vector2<
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/local_variable.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/scope/local_variable.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/local_variable.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -208,7 +208,7 @@
, proto::when<
rule::local_var_def
, evaluator(
- proto::_child_c<1>
+ proto::_right
, fusion::vector2<
mpl::true_
, boost::phoenix::is_nullary
@@ -453,7 +453,7 @@
template <typename Dummy>
struct default_actions::when<rule::local_variable, Dummy>
- : proto::call<local_var_eval(proto::_value(proto::_child_c<0>), _env)>
+ : proto::call<local_var_eval(proto::_value(proto::_child_c<0>), _context)>
{};
namespace local_names
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scoped_environment.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scoped_environment.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scoped_environment.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -58,16 +58,14 @@
{ \
typedef \
typename boost::remove_reference< \
- typename boost::result_of< \
- functional::args(typename Seq::env_type) \
- >::type \
+ typename fusion::result_of::at_c<typename Seq::env_type, 0>::type \
>::type \
env_type; \
typedef typename fusion::result_of::INTRINSIC<env_type>::type type; \
\
static type call(Seq & seq) \
{ \
- return fusion::INTRINSIC(seq); \
+ return fusion::INTRINSIC(seq.env); \
} \
} \
/**/
@@ -81,9 +79,7 @@
{
typedef
typename boost::remove_reference<
- typename boost::result_of<
- functional::args(typename Seq::env_type)
- >::type
+ typename fusion::result_of::at_c<typename Seq::env_type, 0>::type
>::type
env_type;
typedef
@@ -96,16 +92,14 @@
{
typedef
typename boost::remove_reference<
- typename boost::result_of<
- functional::args(typename Seq::env_type)
- >::type
+ typename fusion::result_of::at_c<typename Seq::env_type, 0>::type
>::type
env_type;
typedef typename fusion::result_of::at<env_type, N>::type type;
static type call(Seq & seq)
{
- return fusion::at<N>(functional::args()(seq.env));
+ return fusion::at<N>(fusion::at_c<0>(seq.env));
}
};
};
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/do_while.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/do_while.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/do_while.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -37,7 +37,7 @@
struct default_actions::when<rule::do_while, Dummy>
: proto::call<
do_while_eval(
- _env
+ _context
, proto::_child_c<0> // Cond
, proto::_child_c<1> // Do
)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/for.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/for.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/for.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -25,21 +25,21 @@
typedef void result_type;
template <
- typename Env
+ typename Context
, typename Init
, typename Cond
, typename Step
, typename Do>
result_type
operator()(
- Env& env
+ Context& ctx
, Init const& init
, Cond const& cond
, Step const& step
, Do const& do_) const
{
- for(eval(init, env); eval(cond, env); eval(step, env))
- eval(do_, env);
+ for(eval(init, ctx); eval(cond, ctx); eval(step, ctx))
+ eval(do_, ctx);
}
};
@@ -47,7 +47,7 @@
struct default_actions::when<rule::for_, Dummy>
: proto::call<
for_eval(
- _env
+ _context
, proto::_child_c<0> // Cond
, proto::_child_c<1> // Init
, proto::_child_c<2> // Step
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/if.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/if.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/if.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -78,7 +78,7 @@
struct default_actions::when<rule::if_, Dummy>
: proto::call<
if_else_eval(
- _env
+ _context
, proto::_child_c<0> // Cond
, proto::_child_c<1> // Then
)
@@ -89,7 +89,7 @@
struct default_actions::when<rule::if_else, Dummy>
: proto::call<
if_else_eval(
- _env
+ _context
, proto::_child_c<0> // Cond
, proto::_child_c<1> // Then
, proto::_child_c<2> // Else
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/switch.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/switch.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/switch.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -148,8 +148,8 @@
struct is_nullary::when<rule::switch_, Dummy>
: proto::make<
mpl::and_<
- evaluator(proto::_child_c<0>, _env)
- , detail::switch_case_is_nullary(proto::_child_c<1>, _env)
+ evaluator(proto::_child_c<0>, _context)
+ , detail::switch_case_is_nullary(proto::_child_c<1>, _context)
>()
>
{};
@@ -189,7 +189,7 @@
struct default_actions::when<rule::switch_, Dummy>
: proto::call<
switch_eval(
- _env
+ _context
, proto::_child_c<0> // Cond
, proto::_child_c<1> // Cases
)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/throw.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/throw.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/throw.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -66,12 +66,12 @@
template <typename Dummy>
struct default_actions::when<rule::rethrow_, Dummy>
- : proto::call<throw_eval(_env)>
+ : proto::call<throw_eval(_context)>
{};
template <typename Dummy>
struct default_actions::when<rule::throw_, Dummy>
- : proto::call<throw_eval(_env, proto::_child_c<0>)>
+ : proto::call<throw_eval(_context, proto::_child_c<0>)>
{};
expression::throw_<>::type const
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/try_catch.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/try_catch.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/try_catch.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -109,7 +109,7 @@
BOOST_PP_ENUM_PARAMS(N, proto::_ BOOST_PP_INTERCEPT) \
> \
, try_catch_eval( \
- _env \
+ _context \
, BOOST_PP_ENUM( \
N \
, PHOENIX_TRY_CATCH_CHILD \
@@ -250,7 +250,7 @@
template <typename Dummy>
struct is_nullary::when<rule::try_catch, Dummy>
- : proto::call<detail::try_catch_is_nullary(proto::_, int(), _env)>
+ : proto::call<detail::try_catch_is_nullary(proto::_, int(), _context)>
{};
template <typename TryCatch, typename Exception>
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/while.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/while.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/while.hpp 2011-01-25 05:54:07 EST (Tue, 25 Jan 2011)
@@ -37,7 +37,7 @@
struct default_actions::when<rule::while_, Dummy>
: proto::call<
while_eval(
- _env
+ _context
, proto::_child_c<0> // Cond
, proto::_child_c<1> // Do
)
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