diff options
Diffstat (limited to 'boost/phoenix/operator/member.hpp')
| -rw-r--r-- | boost/phoenix/operator/member.hpp | 108 |
1 files changed, 32 insertions, 76 deletions
diff --git a/boost/phoenix/operator/member.hpp b/boost/phoenix/operator/member.hpp index a489d46b26..211b0ba86b 100644 --- a/boost/phoenix/operator/member.hpp +++ b/boost/phoenix/operator/member.hpp @@ -1,5 +1,11 @@ +/*============================================================================== + Copyright (c) 2005-2010 Joel de Guzman + Copyright (c) 2010 Thomas Heller + Copyright (c) 2016 Kohei Takahashi -#if !BOOST_PHOENIX_IS_ITERATING + 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 BOOST_PHOENIX_OPERATOR_MEMBER_HPP #define BOOST_PHOENIX_OPERATOR_MEMBER_HPP @@ -9,38 +15,32 @@ #include <boost/phoenix/core/domain.hpp> #include <boost/phoenix/core/meta_grammar.hpp> #include <boost/phoenix/core/call.hpp> -#include <boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp> -#include <boost/phoenix/support/iterate.hpp> +#include <boost/phoenix/core/expression.hpp> #include <boost/type_traits/remove_reference.hpp> #include <boost/type_traits/is_member_function_pointer.hpp> #include <boost/proto/operators.hpp> +#include <boost/phoenix/support/iterate.hpp> -#if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES) - -#include <boost/phoenix/operator/preprocessed/member.hpp> - +#ifdef BOOST_PHOENIX_NO_VARIADIC_EXPRESSION +# include <boost/phoenix/operator/detail/cpp03/mem_fun_ptr_expr.hpp> #else - -#if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES) -#pragma wave option(preserve: 2, line: 0, output: "preprocessed/member_" BOOST_PHOENIX_LIMIT_STR ".hpp") -#endif - -/*============================================================================== - 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) -==============================================================================*/ - -#if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES) -#pragma wave option(preserve: 1) +BOOST_PHOENIX_DEFINE_EXPRESSION_VARARG( + (boost)(phoenix)(mem_fun_ptr) + , (meta_grammar)(meta_grammar) + , _ +) #endif #include <boost/phoenix/operator/detail/define_operator.hpp> namespace boost { namespace phoenix { +#if defined(BOOST_PHOENIX_NO_VARIADIC_OPERATOR) + #include <boost/phoenix/operator/detail/cpp03/mem_fun_ptr_gen.hpp> +#else + // TODO +#endif + BOOST_PHOENIX_BINARY_OPERATORS((mem_ptr)) template<> @@ -68,7 +68,11 @@ namespace boost { namespace phoenix > struct mem_fun_ptr_eval; - #include <boost/phoenix/operator/detail/mem_fun_ptr_eval_result_of.hpp> +#if defined(BOOST_PHOENIX_NO_VARIADIC_OPERATOR) + #include <boost/phoenix/operator/detail/cpp03/mem_fun_ptr_eval_result_of.hpp> +#else + // TODO +#endif } struct mem_fun_ptr_eval @@ -76,17 +80,11 @@ namespace boost { namespace phoenix template<typename Sig> struct result; - #define BOOST_PHOENIX_MEMBER_EVAL(Z, N, D) \ - BOOST_PP_COMMA_IF(BOOST_PP_NOT(BOOST_PP_EQUAL(N, 2))) \ - boost::phoenix::eval(BOOST_PP_CAT(a, N), ctx) \ - /**/ - - #define BOOST_PHOENIX_ITERATION_PARAMS \ - (3, (2, BOOST_PHOENIX_LIMIT, \ - <boost/phoenix/operator/member.hpp>)) \ - /**/ - #include BOOST_PHOENIX_ITERATE() - #undef BOOST_PHOENIX_MEMBER_EVAL +#if defined(BOOST_PHOENIX_NO_VARIADIC_OPERATOR) + #include <boost/phoenix/operator/detail/cpp03/mem_fun_ptr_eval.hpp> +#else + // TODO +#endif }; template <typename Dummy> @@ -97,46 +95,4 @@ namespace boost { namespace phoenix #include <boost/phoenix/operator/detail/undef_operator.hpp> -#if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES) -#pragma wave option(output: null) -#endif - -#endif // BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES - -#endif - -#else // BOOST_PHOENIX_IS_ITERATING - - template <typename This, BOOST_PHOENIX_typename_A, typename Context> - struct result<This(BOOST_PHOENIX_A, Context)> - : result<This(BOOST_PHOENIX_A_const_ref, Context)> - {}; - - template <typename This, BOOST_PHOENIX_typename_A, typename Context> - struct result<This(BOOST_PHOENIX_A_ref, Context)> - : result_of::mem_fun_ptr_eval<Context, BOOST_PHOENIX_A> - {}; - - template <BOOST_PHOENIX_typename_A, typename Context> - typename result_of::mem_fun_ptr_eval<Context, BOOST_PHOENIX_A>::type - operator()( - BOOST_PHOENIX_A_const_ref_a - , Context const & ctx - ) const - { - return - ( - get_pointer(boost::phoenix::eval(a0, ctx)) - ->*boost::phoenix::eval(a1, ctx) - )( - BOOST_PP_REPEAT_FROM_TO( - 2 - , BOOST_PHOENIX_ITERATION - , BOOST_PHOENIX_MEMBER_EVAL - , BOOST_PHOENIX_ITERATION - ) - ); - } - - #endif |