Subject: [Boost-commit] svn:boost r67088 - in sandbox/SOC/2010/phoenix3: boost/phoenix boost/phoenix/core boost/phoenix/scope boost/phoenix/statement libs/phoenix/test libs/phoenix/test/scope libs/phoenix/test/statement
From: thom.heller_at_[hidden]
Date: 2010-12-07 14:31:14
Author: theller
Date: 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
New Revision: 67088
URL: http://svn.boost.org/trac/boost/changeset/67088
Log:
subdomained scope
Added:
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_actor.hpp (contents, props changed)
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_domain.hpp (contents, props changed)
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_grammar.hpp (contents, props changed)
Text files modified:
sandbox/SOC/2010/phoenix3/boost/phoenix/core/domain.hpp | 3
sandbox/SOC/2010/phoenix3/boost/phoenix/core/meta_grammar.hpp | 127 +++++++++++++++++++++++++++++++++++++++
sandbox/SOC/2010/phoenix3/boost/phoenix/operator.hpp | 16 ++--
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/let.hpp | 60 ++++--------------
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/local_variable.hpp | 45 +++++++++++--
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/try_catch.hpp | 16 ++--
sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile | 2
sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/let_tests.cpp | 30 ++++++++
sandbox/SOC/2010/phoenix3/libs/phoenix/test/statement/exceptions.cpp | 3
9 files changed, 222 insertions(+), 80 deletions(-)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/domain.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/domain.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/domain.hpp 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -24,7 +24,8 @@
struct phoenix_domain
: proto::domain<
proto::pod_generator<actor>
- , meta_grammar//proto::_
+ , meta_grammar
+ //, proto::_
, proto::default_domain
>
{
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 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -26,7 +26,7 @@
struct meta_grammar
: proto::switch_<meta_grammar>
{
- template <typename Tag, typename Grammar = meta_grammar>
+ template <typename Tag, typename Dummy = void>
struct case_
: proto::not_<proto::_>
{};
@@ -34,7 +34,127 @@
////////////////////////////////////////////////////////////////////////////
// An evaluation transform you can call to dispatch to different actions
+ namespace detail
+ {
+ template <typename Expr>
+ struct grammar_of
+ {
+ typedef typename proto::domain_of<Expr>::type domain_type;
+ typedef typename domain_type::proto_grammar domain_grammar;
+ typedef
+ typename mpl::if_<
+ is_same<domain_grammar, proto::_>
+ , meta_grammar
+ , domain_grammar
+ >::type
+ type;
+ };
+
+ template <typename Expr, typename State, typename Data>
+ struct evaluator_impl
+ : proto::transform_impl<Expr, State, Data>
+ {
+ typedef typename grammar_of<Expr>::type grammar_type;
+ typedef
+ typename grammar_type::
+ template impl<Expr, State, Data>::result_type
+ result_type;
+
+ result_type
+ operator()(
+ typename evaluator_impl::expr_param expr
+ , typename evaluator_impl::state_param state
+ , typename evaluator_impl::data_param data
+ )
+ {
+ //std::cout << "evaluator<Expr, State, Data>\n";
+ return
+ typename grammar_type::
+ template impl<Expr, State, Data>()(
+ expr, state, data
+ );
+ }
+ };
+
+ template <typename Expr, typename State>
+ struct evaluator_impl<Expr, State, int>
+ : proto::transform_impl<Expr, State, int>
+ {
+ typedef typename grammar_of<Expr>::type grammar_type;
+ typedef typename boost::result_of<functional::args(State)>::type args_type;
+ typedef typename boost::result_of<functional::actions(State)>::type actions_type;
+ typedef typename grammar_type::template impl<Expr, args_type, actions_type>::result_type result_type;
+
+ result_type
+ operator()(
+ typename evaluator_impl::expr_param expr
+ , typename evaluator_impl::state_param state
+ , typename evaluator_impl::data_param data
+ )
+ {
+ /*
+ std::cout << "evaluator<Expr, State, int>\n";
+ std::cout << typeid(grammar_type).name() << "\n";
+ std::cout << typeid(Expr).name() << "\n";
+ */
+ return
+ typename grammar_type::
+ template impl<Expr, args_type, actions_type>()(
+ expr, functional::args()(state), functional::actions()(state)
+ );
+ }
+ };
+
+ template <typename Expr, typename State>
+ struct evaluator_impl<Expr, State, State>
+ : proto::transform_impl<Expr, State, State>
+ {
+ typedef typename grammar_of<Expr>::type grammar_type;
+ typedef typename boost::result_of<functional::args(State)>::type args_type;
+ typedef typename boost::result_of<functional::actions(State)>::type actions_type;
+ typedef typename grammar_type::template impl<Expr, args_type, actions_type>::result_type result_type;
+
+ result_type
+ operator()(
+ typename evaluator_impl::expr_param expr
+ , typename evaluator_impl::state_param state
+ , typename evaluator_impl::data_param data
+ )
+ {
+ //std::cout << "evaluator<Expr, State, State>\n";
+ return typename grammar_type::template impl<Expr, args_type, actions_type>()(expr, functional::args()(state), functional::actions()(state));
+ }
+ };
+ }
+
struct evaluator
+ : proto::transform<evaluator>
+ {
+ template <typename Expr, typename State, typename Data>
+ struct impl
+ : detail::evaluator_impl<Expr, State, Data>
+ {};
+ /*
+ : proto::transform_impl<Expr, State, Data>
+ {
+ typedef typename boost::result_of<functional::args(State)>::type args_type;
+ typedef typename boost::result_of<functional::actions(State)>::type actions_type;
+ typedef typename meta_grammar::template impl<Expr, args_type, actions_type>::result_type result_type;
+
+ result_type
+ operator()(
+ typename impl::expr_param expr
+ , typename impl::state_param state
+ , typename impl::data_param data
+ )
+ {
+ return typename meta_grammar::template impl<Expr, args_type, actions_type>()(expr, functional::args()(state), functional::actions()(state));
+ //return meta_grammar()(expr
+ }
+ };
+ */
+ };
+ /*
: proto::call<
meta_grammar(
proto::_
@@ -43,14 +163,15 @@
)
>
{};
+ */
////////////////////////////////////////////////////////////////////////////
// Set of default actions. Extend this whenever you add a new phoenix construct
struct default_actions
{
- template <typename Rule, typename Grammar = meta_grammar>
+ template <typename Rule, typename Dummy = void>
struct when
- : proto::_default<Grammar>
+ : proto::_default<evaluator>
{};
};
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator.hpp 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -7,24 +7,22 @@
#ifndef PHOENIX_OPERATOR_HPP
#define PHOENIX_OPERATOR_HPP
-#define PHOENIX_UNARY_RULE(_, __, name) \
- template <typename Grammar> \
+#define PHOENIX_UNARY_RULE(__, ___, name) \
struct name \
- : proto::unary_expr<proto::tag::name, Grammar> \
+ : proto::unary_expr<proto::tag::name, proto::_> \
{}; \
/**/
-#define PHOENIX_BINARY_RULE(_, __, name) \
- template <typename Grammar> \
+#define PHOENIX_BINARY_RULE(__, ___, name) \
struct name \
- : proto::binary_expr<proto::tag::name, Grammar, Grammar> \
+ : proto::binary_expr<proto::tag::name, proto::_, proto::_> \
{}; \
/**/
#define PHOENIX_GRAMMAR(_, __, name) \
- template <typename Grammar> \
- struct meta_grammar::case_<proto::tag::name, Grammar> \
- : proto::when<rule::name<Grammar>, proto::external_transform> \
+ template <typename Dummy> \
+ struct meta_grammar::case_<proto::tag::name, Dummy> \
+ : proto::when<rule::name, proto::external_transform> \
{}; \
/**/
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 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -17,48 +17,10 @@
namespace boost { namespace phoenix
{
- struct let_grammar
- : proto::switch_<let_grammar>
- {
- template <typename Tag>
- struct case_ : meta_grammar::case_<Tag, let_grammar>
- {};
- };
-
- template <>
- struct let_grammar::case_<tag::local_variable>
- : proto::when<rule::local_variable, proto::external_transform>
- {};
-
- struct let_evaluator
- : proto::call<
- let_grammar(
- proto::_
- , functional::args(proto::_state)
- , functional::actions(proto::_state)
- )
- >
- {};
-
- struct let_actions
- {
- template <typename Rule>
- struct when
- : default_actions::when<Rule, let_grammar>
- {};
- };
-
- /*
- template <>
- struct meta_transform<let_actions>
- : let_grammar
- {};
- */
-
PHOENIX_DEFINE_EXPRESSION(
let
, (rule::local_var_def_list)
- (let_grammar)
+ (scope_grammar)
//(meta_grammar)
)
@@ -69,7 +31,9 @@
: proto::make<
mpl::and_<
detail::local_var_def_is_nullary(proto::_child_c<0>, _env)
- , mpl::true_()//let_evaluator(proto::_child_c<1>, _env)
+ //mpl::true_()
+ //, mpl::true_()//let_evaluator(proto::_child_c<1>, _env)
+ , evaluator(proto::_child_c<1>, _env, int())
>()
>
//: proto::make<mpl::true_()>
@@ -105,9 +69,10 @@
typedef
typename boost::result_of<
- let_evaluator(
+ evaluator(
Let const &
- , fusion::vector2<scoped_environment<Env, Env, locals_type&> &, let_actions>&//actions_type> &
+ , fusion::vector2<scoped_environment<Env, Env, locals_type&> &, actions_type> &
+ //, fusion::vector2<scoped_environment<Env, Env, locals_type&> &, let_actions>&//actions_type> &
)
>::type
type;
@@ -117,7 +82,6 @@
typename result<let_eval(Env&, Locals const &, Let const &)>::type
operator()(Env & env, Locals const & locals, Let const & let) const
{
- /*
typedef
typename proto::detail::uncvref<
typename boost::result_of<
@@ -125,7 +89,6 @@
>::type
>::type
actions_type;
- */
typedef
typename proto::detail::uncvref<
@@ -151,13 +114,16 @@
, l
);
- fusion::vector2<scoped_environment<Env, Env, locals_type &> &, let_actions>
- new_env(scoped_env, let_actions());//functional::actions()(env));
+ fusion::vector2<scoped_environment<Env, Env, locals_type &> &, actions_type>
+ //fusion::vector2<scoped_environment<Env, Env, locals_type &> &, let_actions>
+ new_env(scoped_env, functional::actions()(env));
+ //new_env(scoped_env, let_actions());//functional::actions()(env));
std::cout << ":(\n";
//std::cout << typeid(Let).name() << "\n";
- return let_evaluator()(let, new_env);
+ return evaluator()(let, new_env);
+ //return let_evaluator()(let, new_env);
//return eval(let, new_env);
}
};
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 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -10,6 +10,7 @@
#include <boost/phoenix/core/actor.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/scope/scope_actor.hpp>
#include <boost/phoenix/statement/sequence.hpp>
namespace boost { namespace phoenix
@@ -34,9 +35,23 @@
template <typename Key, typename _ = proto::is_proto_expr>
struct local_variable
{
- typedef expr<tag::local_variable, Key> expr_type;
+ typedef
+ typename proto::result_of::make_expr<
+ tag::local_variable
+ , default_domain_with_basic_expr
+ , Key
+ >::type
+ base_type;
+
+ typedef scope_actor<base_type> type;
+
+ typedef
+ typename proto::nary_expr<tag::local_variable, Key>::proto_grammar
+ proto_grammar;
+
+ /*typedef expr<tag::local_variable, Key> expr_type;
typedef typename expr_type::type type;
- typedef typename expr_type::proto_grammar proto_grammar;
+ typedef typename expr_type::proto_grammar proto_grammar;*/
//BOOST_PROTO_BASIC_EXTENDS(typename expr_type::type, local_variable, phoenix_domain)
};
/* : proto::transform<local_variable<Key>, int>
@@ -198,6 +213,12 @@
>
{};
}
+
+ template <typename Dummy>
+ struct scope_grammar::case_<tag::local_variable, Dummy>
+ : proto::when<rule::local_variable, proto::external_transform>
+ {};
+
namespace detail
{
template <typename Dummy>
@@ -214,19 +235,20 @@
struct local_var_def_is_nullary
: proto::or_<
proto::when<
- proto::comma<proto::_, proto::_>//local_var_def_is_nullary, rule::local_var_def>
+ proto::comma<local_var_def_is_nullary, rule::local_var_def>
, mpl::and_<
local_var_def_is_nullary(proto::_left, proto::_state)
//, mpl::false_()//, local_var_def_is_nullary(proto::_right, proto::_state)
//, evaluator(proto::_right(proto::_right), proto::_state)
//, is_nullary<proto::_right(proto::_right)>()
- , evaluator(proto::_right(proto::_right), fusion::vector2<fusion::vector0<>, detail::is_nullary_>())
+ , evaluator(proto::_right(proto::_right), fusion::vector2<fusion::vector0<>, detail::is_nullary_>(), int())
>()
>
, proto::when<
- proto::_
+ //proto::_
+ rule::local_var_def
//, mpl::false_()
- , evaluator(proto::_child_c<1>, fusion::vector2<fusion::vector0<>, detail::is_nullary_>())
+ , evaluator(proto::_child_c<1>, fusion::vector2<fusion::vector0<>, detail::is_nullary_>(), int())
//, is_nullary<proto::_child_c<1> >()
//, proto::lazy<is_nullary<custom_terminal<proto::_child_c<1> > >(proto::_child_c<1>, _env)>
>
@@ -266,7 +288,9 @@
proto::comma<find_local, rule::local_var_def>
, proto::if_<
proto::matches<proto::_left(proto::_right), proto::_data>()
- , evaluator(proto::_right(proto::_right), proto::_state)
+ //, evaluator(proto::_right(proto::_right), proto::_state)
+ , evaluator(proto::_right, proto::_state, int())
+ //, int()
, find_local(proto::_left, proto::_state, proto::_data)
>
>
@@ -274,7 +298,8 @@
rule::local_var_def
, proto::if_<
proto::matches<proto::_left, proto::_data>()
- , evaluator(proto::_right, proto::_state)
+ , evaluator(proto::_right, proto::_state, int())
+ //, int()
, detail::local_var_not_found()
>
>
@@ -351,6 +376,7 @@
typename mpl::eval_if<
is_scoped_environment<env_type>
, detail::get_local_result_impl<This, env_type, Env, Key>
+ //, mpl::identity<int>
, mpl::identity<detail::local_var_not_found>
>::type
type;
@@ -381,6 +407,9 @@
typename result<get_local<Key>(Env&)>::type
evaluate(Env & env, mpl::true_) const
{
+ //Key k;
+ //detail::find_local()(functional::args()(env).locals, env, k);
+ //return 5;
typedef
typename proto::detail::uncvref<
typename boost::result_of<
Added: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_actor.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_actor.hpp 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -0,0 +1,26 @@
+/*==============================================================================
+ Copyright (c) 2005-2010 Joel de Guzman
+ Copyright (c) 2010 Thomas Heller
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#ifndef PHOENIX_SCOPE_SCOPE_ACTOR_HPP
+#define PHOENIX_SCOPE_SCOPE_ACTOR_HPP
+
+#include <boost/phoenix/scope/scope_domain.hpp>
+#include <boost/phoenix/scope/scope_grammar.hpp>
+
+namespace boost { namespace phoenix
+{
+ template <typename Expr>
+ struct scope_actor
+ {
+ BOOST_PROTO_BASIC_EXTENDS(Expr, scope_actor<Expr>, scope_domain)
+ BOOST_PROTO_EXTENDS_ASSIGN()
+ BOOST_PROTO_EXTENDS_SUBSCRIPT()
+
+ };
+}}
+
+#endif
Added: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_domain.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_domain.hpp 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -0,0 +1,33 @@
+/*==============================================================================
+ Copyright (c) 2005-2010 Joel de Guzman
+ Copyright (c) 2010 Thomas Heller
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#ifndef PHOENIX_SCOPE_SCOPE_DOMAIN_HPP
+#define PHOENIX_SCOPE_SCOPE_DOMAIN_HPP
+
+namespace boost { namespace phoenix
+{
+ template <typename Expr>
+ struct scope_actor;
+
+ struct scope_grammar;
+
+ struct scope_domain
+ : proto::domain<
+ proto::pod_generator<scope_actor>
+ , scope_grammar
+ //, proto::_
+ //, proto::default_domain
+ , phoenix_domain
+ >
+ {
+ template <typename T>
+ struct as_child : as_expr<T>
+ {};
+ };
+}}
+
+#endif
Added: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_grammar.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scope_grammar.hpp 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -0,0 +1,23 @@
+/*==============================================================================
+ Copyright (c) 2005-2010 Joel de Guzman
+ Copyright (c) 2010 Thomas Heller
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#ifndef PHOENIX_SCOPE_SCOPE_GRAMMAR_HPP
+#define PHOENIX_SCOPE_SCOPE_GRAMMAR_HPP
+
+namespace boost { namespace phoenix
+{
+ struct scope_grammar
+ : proto::switch_<scope_grammar>
+ {
+ template <typename Tag, typename Dummy = void>
+ struct case_
+ : meta_grammar::case_<Tag, Dummy>
+ {};
+ };
+}}
+
+#endif
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 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -41,7 +41,7 @@
>
struct try_catch;
- #define PHOENIX_TRY_CATCH_EXPRESSION(Z, N, DATA) \
+ #define PHOENIX_TRY_CATCH_EXPRESSION(Z, N, DATA) \
template <typename Try BOOST_PP_COMMA_IF(N) PHOENIX_typename_A(N)> \
struct try_catch<Try BOOST_PP_COMMA_IF(N) PHOENIX_A(N)> \
: expr_ext< \
@@ -109,7 +109,7 @@
{
typedef void result_type;
-#define PHOENIX_TRY_CATCH_EVAL_R(Z, N, DATA) \
+ #define PHOENIX_TRY_CATCH_EVAL_R(Z, N, DATA) \
catch( \
typename proto::result_of::value< \
typename proto::result_of::child_c< \
@@ -123,7 +123,7 @@
} \
/**/
-#define PHOENIX_TRY_CATCH_EVAL(Z, N, DATA) \
+ #define PHOENIX_TRY_CATCH_EVAL(Z, N, DATA) \
template <typename Env, typename Try, PHOENIX_typename_A(N)> \
typename boost::enable_if< \
proto::matches<BOOST_PP_CAT(A, BOOST_PP_DEC(N)), rule::catch_> \
@@ -187,7 +187,7 @@
, proto::when<
rule::try_catch
, mpl::and_<
- evaluator(proto::_child_c<0>, proto::_data)
+ proto::call<evaluator(proto::_child_c<0>, proto::_data)>
, proto::fold<
proto::functional::pop_front(proto::_)
, mpl::true_()
@@ -251,16 +251,16 @@
}
};
- #define PHOENIX_CATCH_PUSH_BACK_R0(Z, N, DATA) \
+ #define PHOENIX_CATCH_PUSH_BACK_R0(Z, N, DATA) \
BOOST_PP_COMMA_IF(N) \
typename proto::result_of::child_c<TryCatch, N>::type \
/**/
- #define PHOENIX_CATCH_PUSH_BACK_R1(Z, N, DATA) \
+ #define PHOENIX_CATCH_PUSH_BACK_R1(Z, N, DATA) \
BOOST_PP_COMMA_IF(N) proto::child_c<N>(try_catch) \
/**/
- #define PHOENIX_CATCH_PUSH_BACK(Z, N, DATA) \
+ #define PHOENIX_CATCH_PUSH_BACK(Z, N, DATA) \
template <typename TryCatch, typename Exception, typename Expr> \
struct catch_push_back<TryCatch, Exception, Expr, N> \
{ \
@@ -343,7 +343,7 @@
}
};
- #define PHOENIX_CATCH_ALL_PUSH_BACK(Z, N, DATA) \
+ #define PHOENIX_CATCH_ALL_PUSH_BACK(Z, N, DATA) \
template <typename TryCatch, typename Expr> \
struct catch_all_push_back<TryCatch, Expr, N> \
{ \
Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -74,7 +74,7 @@
test-suite phoenix_scope :
# [ run scope/lambda_tests.cpp ]
- [ run scope/let_tests.cpp ]
+# [ run scope/let_tests.cpp ]
# [ run scope/dynamic_tests.cpp ]
# [ run scope/bug_000008.cpp : : : $(multi-threading) ]
;
Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/let_tests.cpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/let_tests.cpp (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/let_tests.cpp 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -35,10 +35,21 @@
using boost::phoenix::local_names::_x;
using boost::phoenix::local_names::_y;
using boost::phoenix::local_names::_z;
- std::cout << typeid(typename boost::proto::matches<Expr, boost::phoenix::let_grammar>::type).name() << "\n";
+ std::cout << typeid(typename boost::phoenix::detail::grammar_of<Expr>::type).name() << "\n";
+ std::cout << typeid(typename boost::proto::matches<Expr, boost::phoenix::scope_grammar>::type).name() << "\n";
std::cout << typeid(typename boost::proto::matches<Expr, boost::phoenix::meta_grammar>::type).name() << "\n";
std::cout << typeid(let(_a = 1, _b = 2, _c = 2, _d = 3, _e = 5)[expr]()).name() << "\n";
- let(_a = 1, _b = 2, _c = 2, _d = 3, _e = 5)[expr]();
+ //let(_a = 1/*, _b = 2, _c = 2, _d = 3, _e = 5*/)[expr]();
+ //let(_a = 1, _b = 2, _c = 2, _d = 3, _e = 5)[expr]();
+
+}
+
+template <typename Expr0, typename Expr1>
+void fpp_test(Expr0 const & expr0, Expr1 const & expr1)
+{
+ fpp_test(expr0);
+ fpp_test(expr1);
+ fpp_test(expr0 + expr1);
}
int
@@ -59,6 +70,13 @@
using boost::phoenix::local_names::_z;
using boost::phoenix::placeholders::arg1;
+ //fpp_test(_a);
+ /*
+ std::cout << typeid(_a).name() << "\n";
+ fpp_test(_a, _b);
+ //std::cout << typeid(_a + _b).name() << "\n";
+ */
+
{
int x = 1;
BOOST_TEST(
@@ -70,6 +88,7 @@
);
}
+ /*
{
int x = 1, y = 10;
BOOST_TEST(
@@ -145,16 +164,19 @@
BOOST_TEST(x == 999);
}
+ */
+ /*
{
BOOST_TEST(
let(_a = 1, _b = 2, _c = 3, _d = 4, _e = 5)
[
- _a + _b + _c + _d + _e
+ _a// + _b + _c + _d + _e
]
() == 1 + 2 + 3 + 4 + 5
);
}
+ */
#ifdef PHOENIX_SHOULD_NOT_COMPILE_TEST
{
@@ -195,11 +217,13 @@
BOOST_TEST( i == 0 );
}
+ /*
{
int i = 0;
let(_a = _1)[_a = _2](i, 2);
BOOST_TEST(i == 2);
}
+ */
return boost::report_errors();
}
Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/test/statement/exceptions.cpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/test/statement/exceptions.cpp (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/test/statement/exceptions.cpp 2010-12-07 14:31:12 EST (Tue, 07 Dec 2010)
@@ -68,6 +68,7 @@
{
bool caught_exception = false;
+
try_
[ throw_(runtime_error("error")) ]
.catch_all
@@ -77,6 +78,7 @@
{
bool caught_correct_exception = false;
+
try_
[ throw_(runtime_error("error")) ]
.catch_<string>()
@@ -89,6 +91,7 @@
{
bool caught_correct_exception = false;
+
try_
[ throw_(runtime_error("error")) ]
.catch_<string>()