boost/phoenix
2
0
Fork 0
mirror of https://github.com/boostorg/phoenix.git synced 2026-02-14 00:52:09 +00:00
Code Issues Projects Releases Wiki Activity

some cleaning up

Browse Source 
[SVN r66645]
This commit is contained in:
Thomas Heller
2010-11-19 15:01:52 +00:00
parent ff0e3a7893
commit ec368a0a88
2 changed files with 2 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
include/boost/phoenix/core/unpack.hpp
View File

@@ -79,71 +79,6 @@ namespace boost { namespace phoenix
>::value>
struct unpack_impl;
/*
template <typename Expr, typename State, typename Data, typename Seq, typename Fun, typename R>
struct unpack_impl<Expr, State, Data, Seq, Fun, R(), 0>
: proto::transform_impl<Expr, State, Data>
{
struct fun_type : proto::when<proto::_, Fun> {};
typedef proto::call<R()> which;
typedef typename which::template impl<Expr, State, Data>::result_type result_type;
result_type
operator()(
typename unpack_impl::expr_param e
, typename unpack_impl::state_param s
, typename unpack_impl::data_param d
) const
{
return typename which::template impl<Expr, State, Data>()(e, s, d);
}
};
template <typename Expr, typename State, typename Data, typename Seq, typename Fun, typename R>
struct unpack_impl<Expr, State, Data, Seq, Fun, R(unpack), 0>
: proto::transform_impl<Expr, State, Data>
{
struct fun_type : proto::when<proto::_, Fun> {};
typedef proto::call<R()> which;
typedef typename which::template impl<Expr, State, Data>::result_type result_type;
result_type
operator()(
typename unpack_impl::expr_param e
, typename unpack_impl::state_param s
, typename unpack_impl::data_param d
) const
{
return typename which::template impl<Expr, State, Data>()(e, s, d);
}
};
template <typename Expr, typename State, typename Data, typename Seq, typename Fun, typename R, typename A0>
struct unpack_impl<Expr, State, Data, Seq, Fun, R(A0, unpack), 0>
: proto::transform_impl<Expr, State, Data>
{
struct fun_type : proto::when<proto::_, Fun> {};
typedef proto::call<R(A0)> which;
typedef typename which::template impl<Expr, State, Data>::result_type result_type;
result_type
operator()(
typename unpack_impl::expr_param e
, typename unpack_impl::state_param s
, typename unpack_impl::data_param d
) const
{
return typename which::template impl<Expr, State, Data>()(e, s, d);
}
};
*/
#define M5(_, N, __) fun_type(fusion_at_c< N >(Seq))
#define M1(Z, N, ARITY) \

28
include/boost/phoenix/operator/member.hpp
View File

@@ -3,20 +3,12 @@
#ifndef PHOENIX_OPERATOR_MEMBER_HPP
#define PHOENIX_OPERATOR_MEMBER_HPP
/*#include <boost/get_pointer.hpp>
#include <boost/phoenix/core/actor.hpp>
#include <boost/phoenix/core/compose.hpp>
#include <boost/phoenix/core/domain.hpp>
#include <boost/phoenix/core/mem_obj_ptr.hpp>
#include <boost/proto/make_expr.hpp>
#include <boost/proto/tags.hpp>
#include <boost/type_traits/is_member_object_pointer.hpp>*/
#include <boost/get_pointer.hpp>
#include <boost/phoenix/core/expression.hpp>
#include <boost/phoenix/core/unpack.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>
#include <boost/get_pointer.hpp>
namespace boost { namespace phoenix
{
@@ -26,20 +18,6 @@ namespace boost { namespace phoenix
PHOENIX_DEFINE_EXPRESSION_VARARG(mem_fun_ptr, (meta_grammar), PHOENIX_LIMIT)
/*
namespace rule
{
struct mem_fun_ptr
: proto::nary_expr<tag::mem_fun_ptr, proto::vararg<meta_grammar> >
{};
}
template <typename Dummy>
struct meta_grammar::case_<tag::mem_fun_ptr, Dummy>
: proto::when<rule::mem_fun_ptr, proto::external_transform>
{};
*/
template <typename Object, typename MemPtr>
typename enable_if<
is_member_function_pointer<MemPtr>
@@ -53,8 +31,6 @@ namespace boost { namespace phoenix
struct mem_fun_ptr_eval
: proto::callable
{
//typedef int result_type;
template<typename Sig>
struct result;
@@ -74,7 +50,7 @@ namespace boost { namespace phoenix
template <typename Dummy>
struct default_actions::when<rule::mem_fun_ptr, Dummy>
: proto::call<mem_fun_ptr_eval(_env, unpack)>//(proto::_, evaluator(proto::_, _env)))>
: proto::call<mem_fun_ptr_eval(_env, unpack)>
{};
}}