Subject: [Boost-commit] svn:boost r70218 - in trunk: boost/phoenix/core boost/phoenix/scope boost/phoenix/statement libs/phoenix/test/operator libs/phoenix/test/scope status
From: thom.heller_at_[hidden]
Date: 2011-03-20 05:23:29
Author: theller
Date: 2011-03-20 05:23:22 EDT (Sun, 20 Mar 2011)
New Revision: 70218
URL: http://svn.boost.org/trac/boost/changeset/70218
Log:
[phoenix]
- took car of some more failing tests
Text files modified:
trunk/boost/phoenix/core/function_equal.hpp | 4 +++-
trunk/boost/phoenix/scope/lambda.hpp | 18 +++++++++++++-----
trunk/boost/phoenix/scope/let.hpp | 27 +++++++++++++++++++++------
trunk/boost/phoenix/statement/try_catch.hpp | 22 ++++++++++++----------
trunk/libs/phoenix/test/operator/self_tests.cpp | 2 +-
trunk/libs/phoenix/test/scope/dynamic_tests.cpp | 2 +-
trunk/status/explicit-failures-markup.xml | 2 +-
7 files changed, 52 insertions(+), 25 deletions(-)
Modified: trunk/boost/phoenix/core/function_equal.hpp
==============================================================================
--- trunk/boost/phoenix/core/function_equal.hpp (original)
+++ trunk/boost/phoenix/core/function_equal.hpp 2011-03-20 05:23:22 EDT (Sun, 20 Mar 2011)
@@ -68,7 +68,9 @@
proto::terminal<proto::_>
, compare(
proto::_value
- , proto::_value(proto::_state)
+ , proto::call<
+ proto::_value(proto::_state)
+ >
)
>
, proto::otherwise<test(proto::_, proto::_state)>
Modified: trunk/boost/phoenix/scope/lambda.hpp
==============================================================================
--- trunk/boost/phoenix/scope/lambda.hpp (original)
+++ trunk/boost/phoenix/scope/lambda.hpp 2011-03-20 05:23:22 EDT (Sun, 20 Mar 2011)
@@ -131,11 +131,19 @@
: proto::call<
evaluator(
proto::_child_c<2>
- , proto::call<functional::context(
- mpl::true_()
- , detail::scope_is_nullary_actions()
- )>
- , proto::make<int()>
+ , proto::call<
+ functional::context(
+ proto::make<
+ mpl::true_()
+ >
+ , proto::make<
+ detail::scope_is_nullary_actions()
+ >
+ )
+ >
+ , proto::make<
+ int()
+ >
)
>
{};
Modified: trunk/boost/phoenix/scope/let.hpp
==============================================================================
--- trunk/boost/phoenix/scope/let.hpp (original)
+++ trunk/boost/phoenix/scope/let.hpp 2011-03-20 05:23:22 EDT (Sun, 20 Mar 2011)
@@ -164,14 +164,29 @@
struct is_nullary::when<rule::let, Dummy>
: proto::make<
mpl::and_<
- detail::local_var_def_is_nullary<proto::_value(proto::_child_c<0>), _context>()
+ proto::make<
+ detail::local_var_def_is_nullary<
+ proto::call<
+ proto::_value(proto::_child_c<0>)
+ >
+ , _context
+ >()
+ >
, evaluator(
proto::_child_c<1>
- , vector2<
- mpl::true_
- , detail::scope_is_nullary_actions
- >()
- , int()
+ , proto::call<
+ functional::context(
+ proto::make<
+ mpl::true_()
+ >
+ , proto::make<
+ detail::scope_is_nullary_actions()
+ >
+ )
+ >
+ , proto::make<
+ int()
+ >
)
>()
>
Modified: trunk/boost/phoenix/statement/try_catch.hpp
==============================================================================
--- trunk/boost/phoenix/statement/try_catch.hpp (original)
+++ trunk/boost/phoenix/statement/try_catch.hpp 2011-03-20 05:23:22 EDT (Sun, 20 Mar 2011)
@@ -116,26 +116,28 @@
: proto::or_<
proto::when<
rule::catch_all
- , evaluator(proto::_child_c<0>, proto::_data, int())
+ , evaluator(proto::_child_c<0>, proto::_data, proto::make<int()>)
>
, proto::when<
rule::catch_
- , evaluator(proto::_child_c<1>, proto::_data, int())
+ , evaluator(proto::_child_c<1>, proto::_data, proto::make<int()>)
>
, proto::when<
rule::try_catch
, mpl::and_<
- evaluator(proto::_child_c<0>, proto::_data, int())
+ evaluator(proto::_child_c<0>, proto::_data, proto::make<int()>)
, proto::fold<
- proto::functional::pop_front(proto::_)
- , mpl::true_()
+ proto::call<proto::functional::pop_front(proto::_)>
+ , proto::make<mpl::true_()>
, mpl::and_<
proto::_state
- , try_catch_is_nullary(
- proto::_
- , int()
- , proto::_data
- )
+ , proto::call<
+ try_catch_is_nullary(
+ proto::_
+ , proto::make<int()>
+ , proto::_data
+ )
+ >
>()
>
>()
Modified: trunk/libs/phoenix/test/operator/self_tests.cpp
==============================================================================
--- trunk/libs/phoenix/test/operator/self_tests.cpp (original)
+++ trunk/libs/phoenix/test/operator/self_tests.cpp 2011-03-20 05:23:22 EDT (Sun, 20 Mar 2011)
@@ -52,7 +52,7 @@
BOOST_TEST((arg1[3])(v) == "d");
map<string, int> m;
- (arg1["Kimpo"] = arg2)(m, x);
+ (arg1[std::string("Kimpo")] = arg2)(m, x);
BOOST_TEST(m["Kimpo"] == x);
}
Modified: trunk/libs/phoenix/test/scope/dynamic_tests.cpp
==============================================================================
--- trunk/libs/phoenix/test/scope/dynamic_tests.cpp (original)
+++ trunk/libs/phoenix/test/scope/dynamic_tests.cpp 2011-03-20 05:23:22 EDT (Sun, 20 Mar 2011)
@@ -49,7 +49,7 @@
{ // Second stack frame
dynamic_frame<my_dynamic::self_type> frame(clos);
(clos.num = 987)();
- (clos.message = "Abracadabra ")();
+ (clos.message = std::string("Abracadabra "))();
(clos.real = clos.num * 1e30)();
{ // Third stack frame
Modified: trunk/status/explicit-failures-markup.xml
==============================================================================
--- trunk/status/explicit-failures-markup.xml (original)
+++ trunk/status/explicit-failures-markup.xml 2011-03-20 05:23:22 EDT (Sun, 20 Mar 2011)
@@ -2656,7 +2656,7 @@
<toolset name="sun-5.9"/>
<toolset name="sun-5.10"/>
<toolset name="borland-*"/>
- <toolset name="vacpp"/>
+ <toolset name="vacpp*"/>
<note author="Thomas Heller" id="phoenix-incompatible compilers">
These compilers don't work with phoenix.
This is due to the fact that phoenix uses proto