Subject: [Boost-commit] svn:boost r68583 - in sandbox/SOC/2010/phoenix3: boost/phoenix/operator boost/phoenix/operator/detail boost/phoenix/scope boost/phoenix/statement boost/phoenix/stl/algorithm boost/phoenix/stl/container libs/phoenix/test libs/phoenix/test/scope
From: thom.heller_at_[hidden]
Date: 2011-01-31 08:09:46
Author: theller
Date: 2011-01-31 08:09:31 EST (Mon, 31 Jan 2011)
New Revision: 68583
URL: http://svn.boost.org/trac/boost/changeset/68583
Log:
self contained headers complete
Text files modified:
sandbox/SOC/2010/phoenix3/boost/phoenix/operator/detail/undef_operator.hpp | 2 +
sandbox/SOC/2010/phoenix3/boost/phoenix/operator/member.hpp | 6 +++
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/dynamic.hpp | 1
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp | 4 +
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/let.hpp | 3 +
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/local_variable.hpp | 2
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/scoped_environment.hpp | 3 -
sandbox/SOC/2010/phoenix3/boost/phoenix/scope/this.hpp | 23 ++++++++------
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/do_while.hpp | 2 +
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/for.hpp | 2 +
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/if.hpp | 7 +--
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/sequence.hpp | 4 +-
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/switch.hpp | 1
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/throw.hpp | 4 ++
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/try_catch.hpp | 2 +
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/while.hpp | 2 +
sandbox/SOC/2010/phoenix3/boost/phoenix/stl/algorithm/transformation.hpp | 1
sandbox/SOC/2010/phoenix3/boost/phoenix/stl/container/container.hpp | 13 ++++---
sandbox/SOC/2010/phoenix3/libs/phoenix/test/Jamfile | 62 ++++++++++++++++++++--------------------
sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/this.cpp | 23 +++++++++++++-
20 files changed, 106 insertions(+), 61 deletions(-)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/operator/detail/undef_operator.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/operator/detail/undef_operator.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/operator/detail/undef_operator.hpp 2011-01-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -4,3 +4,5 @@
#undef PHOENIX_GRAMMAR
#undef PHOENIX_UNARY_OPERATORS
#undef PHOENIX_BINARY_OPERATORS
+
+#undef PHOENIX_DEFINE_OPERATOR_HPP
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -3,8 +3,11 @@
#ifndef PHOENIX_OPERATOR_MEMBER_HPP
#define PHOENIX_OPERATOR_MEMBER_HPP
+#include <boost/phoenix/core/limits.hpp>
#include <boost/get_pointer.hpp>
+#include <boost/phoenix/core/domain.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
#include <boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp>
#include <boost/phoenix/support/iterate.hpp>
#include <boost/type_traits/is_member_function_pointer.hpp>
@@ -19,8 +22,11 @@
#ifndef PHOENIX_OPERATOR_MEMBER_HPP
#define PHOENIX_OPERATOR_MEMBER_HPP
+#include <boost/phoenix/core/limits.hpp>
#include <boost/get_pointer.hpp>
+#include <boost/phoenix/core/domain.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
#include <boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp>
#include <boost/phoenix/support/iterate.hpp>
#include <boost/type_traits/is_member_function_pointer.hpp>
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -14,6 +14,7 @@
#include <boost/noncopyable.hpp>
#include <boost/fusion/sequence/intrinsic/at.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
#include <boost/phoenix/support/iterate.hpp>
#include <boost/preprocessor/seq/for_each.hpp>
#include <boost/preprocessor/seq/fold_left.hpp>
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -11,8 +11,10 @@
#include <boost/phoenix/core/limits.hpp>
#include <boost/mpl/int.hpp>
-#include <boost/phoenix/core/actor.hpp>
+#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
#include <boost/phoenix/scope/local_variable.hpp>
+#include <boost/phoenix/scope/scoped_environment.hpp>
namespace boost { namespace phoenix
{
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -10,8 +10,9 @@
#define PHOENIX_SCOPE_LET_HPP
#include <boost/phoenix/core/limits.hpp>
+#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
#include <boost/phoenix/scope/scoped_environment.hpp>
-#include <boost/phoenix/core/actor.hpp>
#include <boost/phoenix/scope/local_variable.hpp>
#include <boost/phoenix/support/iterate.hpp>
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -8,7 +8,7 @@
#ifndef PHOENIX_SCOPE_LOCAL_VARIABLE_HPP
#define PHOENIX_SCOPE_LOCAL_VARIABLE_HPP
-#include <boost/phoenix/core/actor.hpp>
+#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/expression.hpp>
#include <boost/phoenix/core/reference.hpp>
#include <boost/phoenix/core/value.hpp>
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -8,6 +8,7 @@
#ifndef PHOENIX_SCOPE_SCOPED_ENVIRONMENT_HPP
#define PHOENIX_SCOPE_SCOPED_ENVIRONMENT_HPP
+#include <boost/phoenix/core/limits.hpp>
#include <boost/mpl/int.hpp>
#include <boost/fusion/sequence/sequence_facade.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
@@ -15,8 +16,6 @@
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/intrinsic/value_at.hpp>
#include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/phoenix/core/limits.hpp>
-#include <boost/phoenix/core/environment.hpp>
#include <boost/utility/result_of.hpp>
namespace boost { namespace phoenix
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/this.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/scope/this.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/this.hpp 2011-01-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -51,10 +51,10 @@
, proto::_
, proto::_
>
- , proto::_child_c<1>
+ , proto::_child_c<2>
>
>
- {};
+ {};
}
struct this_function_eval
@@ -73,9 +73,7 @@
struct result<This(Context &, T &, T0 &)>
{
typedef
- //typename boost::remove_reference<
- typename evaluator::impl<T &, Context &, int>::result_type
- //>::type
+ typename evaluator::impl<T &, Context &, int>::result_type
this_type;
typedef
@@ -84,7 +82,10 @@
typedef typename detail::last_non_this_actor::impl<this_type, int, int>::result_type checker;
- typedef typename boost::result_of<typename proto::detail::uncvref<checker>::type(arg0_type)>::type
+ typedef
+ typename proto::detail::uncvref<
+ typename boost::result_of<typename proto::detail::uncvref<checker>::type(arg0_type)>::type
+ >::type
type;
};
@@ -97,9 +98,7 @@
struct result<This(Context &, T &, T0 &, T1 &)>
{
typedef
- //typename boost::remove_reference<
- typename evaluator::impl<T &, Context &, int>::result_type
- //>::type
+ typename evaluator::impl<T &, Context &, int>::result_type
this_type;
typedef
@@ -112,7 +111,10 @@
typedef typename detail::last_non_this_actor::impl<this_type, int, int>::result_type checker;
- typedef typename boost::result_of<typename proto::detail::uncvref<checker>::type(arg0_type, arg1_type)>::type
+ typedef
+ typename proto::detail::uncvref<
+ typename boost::result_of<typename proto::detail::uncvref<checker>::type(arg0_type, arg1_type)>::type
+ >::type
type;
};
@@ -125,6 +127,7 @@
typedef typename detail::last_non_this_actor::impl<this_type, int, int>::result_type checker;
//std::cout << typeid(checker).name() << "\n";
+ //std::cout << typeid(checker).name() << "\n";
return eval(_this, ctx)(eval(t0, ctx));
}
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -8,7 +8,9 @@
#ifndef PHOENIX_STATEMENT_DO_WHILE_HPP
#define PHOENIX_STATEMENT_DO_WHILE_HPP
+#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
namespace boost { namespace phoenix
{
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -8,7 +8,9 @@
#ifndef PHOENIX_STATEMENT_FOR_HPP
#define PHOENIX_STATEMENT_FOR_HPP
+#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
namespace boost { namespace phoenix
{
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -9,11 +9,10 @@
#define PHOENIX_STATEMENT_IF_HPP
#include <boost/config.hpp>
-#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/actor.hpp>
-//#include <boost/phoenix/core/compose.hpp>
-
-//#include <boost/phoenix/support/element_at.hpp>
+#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
#ifdef BOOST_MSVC
#pragma warning(push)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/sequence.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/sequence.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/sequence.hpp 2011-01-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -10,9 +10,9 @@
#ifndef PHOENIX_STATEMENT_SEQUENCE_HPP
#define PHOENIX_STATEMENT_SEQUENCE_HPP
-#include <boost/config.hpp>
+#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/expression.hpp>
-#include <boost/phoenix/core/actor.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
namespace boost { namespace phoenix
{
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -13,7 +13,6 @@
#include <boost/phoenix/core/expression.hpp>
#include <boost/phoenix/core/is_nullary.hpp>
#include <boost/phoenix/support/iterate.hpp>
-#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/make_expr.hpp>
namespace boost { namespace phoenix
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -9,7 +9,11 @@
#ifndef PHOENIX_STATEMENT_THROW_HPP
#define PHOENIX_STATEMENT_THROW_HPP
+#include <boost/phoenix/core/limits.hpp>
+#include <boost/phoenix/core/actor.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/terminal.hpp>
namespace boost { namespace phoenix
{
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -12,6 +12,8 @@
#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
+#include <boost/phoenix/core/is_nullary.hpp>
#include <boost/proto/functional/fusion/pop_front.hpp>
namespace boost { namespace phoenix
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-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -8,7 +8,9 @@
#ifndef PHOENIX_STATEMENT_WHILE_HPP
#define PHOENIX_STATEMENT_WHILE_HPP
+#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/expression.hpp>
+#include <boost/phoenix/core/meta_grammar.hpp>
namespace boost { namespace phoenix
{
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/stl/algorithm/transformation.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/stl/algorithm/transformation.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/stl/algorithm/transformation.hpp 2011-01-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -14,6 +14,7 @@
#include <algorithm>
#include <numeric>
+#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/stl/algorithm/detail/has_sort.hpp>
#include <boost/phoenix/stl/algorithm/detail/has_remove.hpp>
#include <boost/phoenix/stl/algorithm/detail/has_remove_if.hpp>
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/stl/container/container.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/stl/container/container.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/stl/container/container.hpp 2011-01-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -8,12 +8,13 @@
#ifndef PHOENIX_STL_CONTAINER_CONTAINER_HPP
#define PHOENIX_STL_CONTAINER_CONTAINER_HPP
+#include <boost/phoenix/core/limits.hpp>
#include <boost/mpl/and.hpp>
#include <boost/mpl/not.hpp>
#include <boost/mpl/or.hpp>
+#include <boost/mpl/void.hpp>
#include <boost/phoenix/stl/container/detail/container.hpp>
#include <boost/phoenix/function/function.hpp>
-#include <boost/phoenix/core/actor.hpp>
#include <boost/type_traits/is_const.hpp>
namespace boost { namespace phoenix
@@ -265,7 +266,7 @@
namespace result_of
{
- template <typename C, typename Arg1, typename Arg2 = fusion::void_>
+ template <typename C, typename Arg1, typename Arg2 = mpl::void_>
struct erase
{
// BOOST_MSVC #if branch here in map_erase_result non-
@@ -408,8 +409,8 @@
template <
typename C
, typename Arg1
- , typename Arg2 = fusion::void_
- , typename Arg3 = fusion::void_
+ , typename Arg2 = mpl::void_
+ , typename Arg3 = mpl::void_
>
class insert
{
@@ -429,7 +430,7 @@
typedef
boost::mpl::eval_if<
boost::mpl::and_<
- boost::is_same<Arg3, fusion::void_>
+ boost::is_same<Arg3, mpl::void_>
, boost::mpl::not_<boost::is_same<Arg1, Arg2> > >
, iterator_of<C>
, boost::mpl::identity<void>
@@ -440,7 +441,7 @@
typedef typename
boost::mpl::eval_if<
- boost::is_same<Arg2, fusion::void_>
+ boost::is_same<Arg2, mpl::void_>
, choice_1
, choice_2
>::type
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 2011-01-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -126,13 +126,13 @@
[ run include/bind.cpp ]
[ run include/core.cpp ]
[ run include/function.cpp ]
-# [ run include/fusion.cpp ]
-# [ run include/object.cpp ]
-# [ run include/operator.cpp ]
-# [ run include/scope.cpp ]
-# [ run include/statement.cpp ]
-# [ run include/stl.cpp ]
- [ run include/bind/bind.cpp ]
+ [ run include/fusion.cpp ]
+ [ run include/object.cpp ]
+ [ run include/operator.cpp ]
+ [ run include/scope.cpp ]
+ [ run include/statement.cpp ]
+ [ run include/stl.cpp ]
+ [ run include/bind/bind.cpp : : : : bind_bind ]
[ run include/version.cpp ]
# [ run include/bind/bind_member_function.cpp ]
# [ run include/bind/bind_member_variable.cpp ]
@@ -153,7 +153,7 @@
[ run include/core/is_nullary.cpp ]
[ run include/core/limits.cpp ]
[ run include/core/actor.cpp ]
- [ run include/function/function.cpp ]
+ [ run include/function/function.cpp : : : : function_function ]
[ run include/fusion/at.cpp ]
[ run include/object/const_cast.cpp ]
[ run include/object/construct.cpp ]
@@ -168,28 +168,28 @@
[ run include/operator/if_else.cpp ]
[ run include/operator/io.cpp ]
[ run include/operator/logical.cpp ]
- [ run include/operator/member.cpp ]
+ [ run include/operator/member.cpp : : : : operator_member ]
[ run include/operator/self.cpp ]
-# [ run include/scope/dynamic.cpp ]
-# [ run include/scope/this.cpp ]
-# [ run include/scope/local_variable.cpp ]
-# [ run include/scope/scoped_environment.cpp ]
-# [ run include/scope/lambda.cpp ]
-# [ run include/scope/let.cpp ]
-# [ run include/statement/switch.cpp ]
-# [ run include/statement/do_while.cpp ]
-# [ run include/statement/try_catch.cpp ]
-# [ run include/statement/sequence.cpp ]
-# [ run include/statement/if.cpp ]
-# [ run include/statement/throw.cpp ]
-# [ run include/statement/while.cpp ]
-# [ run include/statement/for.cpp ]
-# [ run include/stl/algorithm/iteration.cpp ]
-# [ run include/stl/algorithm/querying.cpp ]
-# [ run include/stl/algorithm/transformation.cpp ]
-# [ run include/stl/container/container.cpp ]
-# [ run include/stl/algorithm.cpp ]
-# [ run include/stl/container.cpp ]
-# [ run include/support/preprocessor/round.cpp ]
-# [ run include/support/iterate.cpp ]
+ [ run include/scope/dynamic.cpp ]
+ [ run include/scope/lambda.cpp ]
+ [ run include/scope/let.cpp ]
+ [ run include/scope/local_variable.cpp ]
+ [ run include/scope/scoped_environment.cpp ]
+ [ run include/scope/this.cpp ]
+ [ run include/statement/do_while.cpp ]
+ [ run include/statement/for.cpp ]
+ [ run include/statement/if.cpp ]
+ [ run include/statement/sequence.cpp ]
+ [ run include/statement/switch.cpp ]
+ [ run include/statement/throw.cpp ]
+ [ run include/statement/try_catch.cpp ]
+ [ run include/statement/while.cpp ]
+ [ run include/stl/algorithm.cpp ]
+ [ run include/stl/container.cpp ]
+ [ run include/stl/container/container.cpp : : : : container_container ]
+ [ run include/stl/algorithm/iteration.cpp : : : : include_iteration ]
+ [ run include/stl/algorithm/querying.cpp : : : : include_querying ]
+ [ run include/stl/algorithm/transformation.cpp ]
+ [ run include/support/iterate.cpp ]
+ [ run include/support/preprocessor/round.cpp ]
;
Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/this.cpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/this.cpp (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/this.cpp 2011-01-31 08:09:31 EST (Mon, 31 Jan 2011)
@@ -3,6 +3,7 @@
#include <boost/phoenix/scope/this.hpp>
#include <boost/phoenix/statement.hpp>
#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/scope.hpp>
template <typename T0>
void f(T0 t)
@@ -35,10 +36,12 @@
using boost::phoenix::if_;
using boost::phoenix::if_else;
using boost::phoenix::val;
+ using boost::phoenix::let;
+ using boost::phoenix::nothing;
using boost::phoenix::arg_names::_1;
using boost::phoenix::arg_names::_2;
+ using boost::phoenix::local_names::_a;
- int res;
f((
if_(_1 == 0)
[
@@ -51,7 +54,15 @@
]
, val("")
));
-
+
+ f((
+ if_else(
+ _1 == 0
+ , _1
+ ,_this(_1 - 1)
+ )
+ ));
+
f(( // fac(n) = n * fac(n-1); fac(1) = 1
if_else(
_1 <= 1
@@ -60,6 +71,14 @@
)
));
+ f(( // fac(n) = n * fac(n-1); fac(1) = 1
+ if_else(
+ _1 > 1
+ , let(_a = _this(_1-1))[_1 * _a]
+ , 1
+ )
+ ));
+
f(( // fib(n) = fib(n-1) + fib(n-2); fib(0) = 0; fib(1) = 1
if_else(
_1 == 0