LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2025-01-12 14:08:24 +01:00
Code Issues Releases Wiki Activity

clef: cleaning

Browse Source 
- use alias
- rename a few things, simplify
- some clang format
- add eval to ref wrapper
- correct evaluator general (return const &, no copy)
- correct declaration order of struct and operator OP
This commit is contained in:
Olivier Parcollet 2014-02-08 13:09:09 +01:00
parent 3f62825559
commit 7e1f2eb34b
1 changed files with 147 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
triqs/clef/clef.hpp
View File

@ -36,7 +36,7 @@
#define TRIQS_CLEF_MAXNARGS 8 #define TRIQS_CLEF_MAXNARGS 8
namespace triqs { namespace clef { namespace triqs { namespace clef {
typedef unsigned long long ull_t; using ull_t = unsigned long long;
namespace tags { struct function_class{}; struct function{}; struct subscript{}; struct terminal{}; struct if_else{}; struct unary_op{}; struct binary_op{}; } namespace tags { struct function_class{}; struct function{}; struct subscript{}; struct terminal{}; struct if_else{}; struct unary_op{}; struct binary_op{}; }
// Compute the type to put in the expression tree. // Compute the type to put in the expression tree.
@ -45,11 +45,13 @@ namespace triqs { namespace clef {
template<typename T> struct force_copy_in_expr : std::false_type{}; template<typename T> struct force_copy_in_expr : std::false_type{};
template<typename T> struct force_copy_in_expr<T const> : force_copy_in_expr<T>{}; template<typename T> struct force_copy_in_expr<T const> : force_copy_in_expr<T>{};
template< class T > struct expr_storage_t {typedef T type;}; template< class T > struct expr_storage_impl {typedef T type;};
template< class T > struct expr_storage_t<T&> : std::conditional<force_copy_in_expr<T>::value, typename std::remove_const<T>::type ,std::reference_wrapper<T>>{}; template< class T > struct expr_storage_impl<T&> : std::conditional<force_copy_in_expr<T>::value, typename std::remove_const<T>::type ,std::reference_wrapper<T>>{};
template< class T > struct expr_storage_t<T&&> {typedef T type;}; template< class T > struct expr_storage_impl<T&&> {typedef T type;};
template< class T > struct expr_storage_t<const T&&> {typedef T type;}; template< class T > struct expr_storage_impl<const T&&> {typedef T type;};
template< class T > struct expr_storage_t<const T> {typedef T type;}; template< class T > struct expr_storage_impl<const T> {typedef T type;};
template <class T> using expr_storage_t = typename expr_storage_impl<T>::type; // helper type
/* --------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------
* Placeholder and corresponding traits * Placeholder and corresponding traits
@ -70,7 +72,7 @@ namespace triqs { namespace clef {
template <int N, typename U> struct pair { template <int N, typename U> struct pair {
U rhs; U rhs;
static constexpr int p = N; static constexpr int p = N;
typedef typename remove_cv_ref <U>::type value_type; using value_type = typename remove_cv_ref<U>::type;
}; };
// ph_set is a trait that given a pack of type, returns the set of placeholders they contain // ph_set is a trait that given a pack of type, returns the set of placeholders they contain
@ -101,7 +103,7 @@ namespace triqs { namespace clef {
* --------------------------------------------------------------------------------------------------- */ * --------------------------------------------------------------------------------------------------- */
template<typename Tag, typename... T> struct expr { template<typename Tag, typename... T> struct expr {
// T can be U, U & (a reference or a value). // T can be U, U & (a reference or a value).
typedef std::tuple<T...> childs_t; using childs_t = std::tuple<T...>;
childs_t childs; childs_t childs;
expr(expr const & x) = default; expr(expr const & x) = default;
expr(expr && x) noexcept : childs(std::move(x.childs)) {} expr(expr && x) noexcept : childs(std::move(x.childs)) {}
@ -109,11 +111,11 @@ namespace triqs { namespace clef {
template<typename... Args> expr(Tag, Args&&...args) : childs(std::forward<Args>(args)...) {} template<typename... Args> expr(Tag, Args&&...args) : childs(std::forward<Args>(args)...) {}
// [] returns a new lazy expression, with one more layer // [] returns a new lazy expression, with one more layer
template<typename Args> template<typename Args>
expr<tags::subscript, expr, typename expr_storage_t<Args>::type > operator[](Args && args) const expr<tags::subscript, expr, expr_storage_t<Args> > operator[](Args && args) const
{ return {tags::subscript(), *this,std::forward<Args>(args)};} { return {tags::subscript(), *this,std::forward<Args>(args)};}
// () also ... // () also ...
template< typename... Args > template< typename... Args >
expr<tags::function, expr, typename expr_storage_t<Args>::type...> operator()(Args && ... args) const expr<tags::function, expr, expr_storage_t<Args>...> operator()(Args && ... args) const
{ return {tags::function(), *this,std::forward<Args>(args)...};} { return {tags::function(), *this,std::forward<Args>(args)...};}
// assignement is in general deleted // assignement is in general deleted
expr & operator= (expr const &) = delete; // no ordinary assignment expr & operator= (expr const &) = delete; // no ordinary assignment
@ -158,13 +160,20 @@ namespace triqs { namespace clef {
// all binary operators.... // all binary operators....
#define TRIQS_CLEF_OPERATION(TAG, OP) \ #define TRIQS_CLEF_OPERATION(TAG, OP) \
namespace tags { struct TAG : binary_op { static const char * name() { return BOOST_PP_STRINGIZE(OP);} };}\ namespace tags { \
template<> struct operation<tags::TAG> {\ struct TAG : binary_op { \
template<typename L, typename R> auto operator()(L && l, R && r) const DECL_AND_RETURN ( _cl(std::forward<L>(l)) OP _cl(std::forward<R>(r)));\ static const char* name() { return BOOST_PP_STRINGIZE(OP); } \
}; \ }; \
} \
template <typename L, typename R> \ template <typename L, typename R> \
typename std::enable_if<is_any_lazy<L,R>::value, expr<tags::TAG,typename expr_storage_t<L>::type,typename expr_storage_t<R>::type> >::type \ typename std::enable_if<is_any_lazy<L, R>::value, expr<tags::TAG, expr_storage_t<L>, expr_storage_t<R>>>::type operator OP( \
operator OP (L && l, R && r) { return {tags::TAG(),std::forward<L>(l),std::forward<R>(r)};}\ L&& l, R&& r) { \
return {tags::TAG(), std::forward<L>(l), std::forward<R>(r)}; \
} \
template <> struct operation<tags::TAG> { \
template <typename L, typename R> \
auto operator()(L&& l, R&& r) const DECL_AND_RETURN(_cl(std::forward<L>(l)) OP _cl(std::forward<R>(r))); \
};
TRIQS_CLEF_OPERATION(plus, +); TRIQS_CLEF_OPERATION(plus, +);
TRIQS_CLEF_OPERATION(minus, -); TRIQS_CLEF_OPERATION(minus, -);
@ -179,13 +188,18 @@ namespace triqs { namespace clef {
// all unary operators.... // all unary operators....
#define TRIQS_CLEF_OPERATION(TAG, OP) \ #define TRIQS_CLEF_OPERATION(TAG, OP) \
namespace tags { struct TAG : unary_op { static const char * name() { return BOOST_PP_STRINGIZE(OP);} };}\ namespace tags { \
struct TAG : unary_op { \
static const char* name() { return BOOST_PP_STRINGIZE(OP); } \
}; \
} \
template <typename L> \
typename std::enable_if<is_any_lazy<L>::value, expr<tags::TAG, expr_storage_t<L>>>::type operator OP(L&& l) { \
return {tags::TAG(), std::forward<L>(l)}; \
} \
template <> struct operation<tags::TAG> { \ template <> struct operation<tags::TAG> { \
template <typename L> auto operator()(L&& l) const DECL_AND_RETURN(OP _cl(std::forward<L>(l))); \ template <typename L> auto operator()(L&& l) const DECL_AND_RETURN(OP _cl(std::forward<L>(l))); \
};\ };
template<typename L>\
typename std::enable_if<is_any_lazy<L>::value, expr<tags::TAG,typename expr_storage_t<L>::type> >::type \
operator OP (L && l) { return {tags::TAG(),std::forward<L>(l)};}\
TRIQS_CLEF_OPERATION(negate, -); TRIQS_CLEF_OPERATION(negate, -);
TRIQS_CLEF_OPERATION(loginot, !); TRIQS_CLEF_OPERATION(loginot, !);
@ -199,71 +213,96 @@ namespace triqs { namespace clef {
}; };
// operator is : if_else( Condition, A, B) // operator is : if_else( Condition, A, B)
template<typename C, typename A, typename B> template<typename C, typename A, typename B>
expr<tags::if_else,typename expr_storage_t<C>::type,typename expr_storage_t<A>::type,typename expr_storage_t<B>::type> expr<tags::if_else,expr_storage_t<C>,expr_storage_t<A>,expr_storage_t<B>>
if_else(C && c, A && a, B && b) { return {tags::if_else(),std::forward<C>(c),std::forward<A>(a),std::forward<B>(b)};} if_else(C && c, A && a, B && b) { return {tags::if_else(),std::forward<C>(c),std::forward<A>(a),std::forward<B>(b)};}
/* --------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------
* Evaluation of the expression tree. * Evaluation of the expression tree.
* --------------------------------------------------------------------------------------------------- */ * --------------------------------------------------------------------------------------------------- */
template<typename ... T> struct _or; //template<typename ... T> struct _or;
template<typename T0, typename ... T> struct _or<T0,T...> : std::integral_constant<bool,T0::value || _or<T...>::value>{}; //template<typename T0, typename ... T> struct _or<T0,T...> : std::integral_constant<bool,T0::value || _or<T...>::value>{};
template<> struct _or<> : std::false_type{}; //template<> struct _or<> : std::false_type{};
// just to try
constexpr bool __or() { return false;}
template<typename ... B> constexpr bool __or(bool b, B... bs) { return b || __or(bs...); }
// Generic case : do nothing (for the leaf of the tree including placeholder) // Generic case : do nothing (for the leaf of the tree including placeholder)
template <typename T, typename... Pairs> struct evaluator { template <typename T, typename... Pairs> struct evaluator {
typedef is_any_lazy<T> is_lazy; static constexpr bool is_lazy = is_any_lazy<T>::value;
T operator()(T const & k, Pairs const &... pairs) { return k;} T const & operator()(T const& k, Pairs const&... pairs) const { return k; }
}; };
// placeholder // placeholder
template <int N, int i, typename T, typename... Pairs> struct evaluator<placeholder<N>, pair<i, T>, Pairs...> { template <int N, int i, typename T, typename... Pairs> struct evaluator<placeholder<N>, pair<i, T>, Pairs...> {
typedef evaluator< placeholder<N>, Pairs...> eval_t; using eval_t = evaluator<placeholder<N>, Pairs...>;
typedef typename eval_t::is_lazy is_lazy; static constexpr bool is_lazy = eval_t::is_lazy;
auto operator()(placeholder<N>, pair<i,T> const &, Pairs const& ... pairs) DECL_AND_RETURN( eval_t()(placeholder<N>(), pairs...)); auto operator()(placeholder<N>, pair<i, T> const&, Pairs const&... pairs) const
DECL_AND_RETURN(eval_t()(placeholder<N>(), pairs...));
}; };
template <int N, typename T, typename... Pairs> struct evaluator<placeholder<N>, pair<N, T>, Pairs...> { template <int N, typename T, typename... Pairs> struct evaluator<placeholder<N>, pair<N, T>, Pairs...> {
typedef std::false_type is_lazy; static constexpr bool is_lazy = false;
T operator()(placeholder<N>, pair<N,T> const & p, Pairs const& ...) { return p.rhs;} T operator()(placeholder<N>, pair<N, T> const& p, Pairs const&...) const { return p.rhs; }
}; };
template<typename Tag, bool IsLazy> struct operation2; // any object hold by reference wrapper is redirected to the evaluator of the object
template<typename Tag> struct operation2<Tag, true> { template <typename T, typename... Contexts> struct evaluator<std::reference_wrapper<T>, Contexts...> {
template<typename... Args> using ev_t = evaluator<T, Contexts...>;
expr<Tag,typename expr_storage_t<Args>::type ...> operator()(Args && ... args) const { static constexpr bool is_lazy = ev_t::is_lazy;
auto operator()(std::reference_wrapper<T> const& x, Contexts const&... contexts) const DECL_AND_RETURN(ev_t {}(x.get(), contexts...));
};
// dispatching the evaluation : if lazy, we make a new clef expression, if not we call the operation
template <typename Tag, bool IsLazy> struct op_dispatch;
template <typename Tag> struct op_dispatch<Tag, true> {
template <typename... Args> expr<Tag, expr_storage_t<Args>...> operator()(Args&&... args) const {
return {Tag(), std::forward<Args>(args)...}; return {Tag(), std::forward<Args>(args)...};
} }
}; };
template<typename Tag> struct operation2<Tag, false> {
template <typename Tag> struct op_dispatch<Tag, false> {
template <typename... Args> template <typename... Args>
auto operator()(Args&&... args) const DECL_AND_RETURN(operation<Tag>()(std::forward<Args>(args)...)); auto operator()(Args&&... args) const DECL_AND_RETURN(operation<Tag>()(std::forward<Args>(args)...));
//void operator() (...) const {}
}; };
// general expr node // general expr node
#ifdef TRIQS_USE_C14_DRAFT__
template <typename Tag, typename... Childs, typename... Pairs> struct evaluator<expr<Tag, Childs...>, Pairs...> {
static constexpr bool is_lazy = __or(evaluator<Childs, Pairs...>::is_lazy...);
auto operator()(expr<Tag, Childs...> const& ex, Pairs const&... pairs) const {
auto eval_in_context = [&pairs](auto const& _child) { return eval(_child, pairs); };
return triqs::tuple::apply_compose(op_dispatch<Tag, is_lazy>{}, eval_in_context, ex.childs);
}
};
#else
// WORKAROUND FOR C++11 compilers
template<int arity, typename Expr, typename... Pairs> struct evaluator_node_gal; template<int arity, typename Expr, typename... Pairs> struct evaluator_node_gal;
template <typename Tag, typename... Childs, typename... Pairs> struct evaluator_node_gal<1, expr<Tag, Childs...>, Pairs...> { template <typename Tag, typename... Childs, typename... Pairs> struct evaluator_node_gal<1, expr<Tag, Childs...>, Pairs...> {
typedef _or<typename evaluator<Childs, Pairs...>::is_lazy... > is_lazy; static constexpr bool is_lazy = __or(evaluator<Childs, Pairs...>::is_lazy...);
typedef operation2<Tag, is_lazy::value > OPTYPE;
auto operator()(expr<Tag, Childs...> const& ex, Pairs const&... pairs) const auto operator()(expr<Tag, Childs...> const& ex, Pairs const&... pairs) const
DECL_AND_RETURN (OPTYPE()(eval(std::get<0>(ex.childs),pairs...))); DECL_AND_RETURN(op_dispatch<Tag, is_lazy> {}(eval(std::get<0>(ex.childs), pairs...)));
}; };
template <typename Tag, typename... Childs, typename... Pairs> struct evaluator_node_gal<2, expr<Tag, Childs...>, Pairs...> { template <typename Tag, typename... Childs, typename... Pairs> struct evaluator_node_gal<2, expr<Tag, Childs...>, Pairs...> {
typedef _or<typename evaluator<Childs, Pairs...>::is_lazy... > is_lazy; static constexpr bool is_lazy = __or(evaluator<Childs, Pairs...>::is_lazy...);
typedef operation2<Tag, is_lazy::value > OPTYPE; auto operator()(expr<Tag, Childs...> const& ex, Pairs const&... pairs) const DECL_AND_RETURN(op_dispatch<Tag, is_lazy> {
auto operator()(expr<Tag, Childs...> const & ex, Pairs const & ... pairs) const }(eval(std::get<0>(ex.childs), pairs...), eval(std::get<1>(ex.childs), pairs...)));
DECL_AND_RETURN (OPTYPE()(eval(std::get<0>(ex.childs),pairs...),eval(std::get<1>(ex.childs),pairs...)));
}; };
// the general case for more than 2 nodes. I put 1 and 2 nodes apart, just because it is the most frequent
// and macros yield more obscure error messages in case of a pb ...
#define AUX(z, p, unused) eval(std::get<p>(ex.childs), pairs...) #define AUX(z, p, unused) eval(std::get<p>(ex.childs), pairs...)
#define IMPL(z, NN, unused) \ #define IMPL(z, NN, unused) \
template <typename Tag, typename... Childs, typename... Pairs> struct evaluator_node_gal<NN, expr<Tag, Childs...>, Pairs...> { \ template <typename Tag, typename... Childs, typename... Pairs> struct evaluator_node_gal<NN, expr<Tag, Childs...>, Pairs...> { \
typedef _or<typename evaluator<Childs, Pairs...>::is_lazy... > is_lazy;\ static constexpr bool is_lazy = __or(evaluator<Childs, Pairs...>::is_lazy...); \
typedef operation2<Tag, is_lazy::value > OPTYPE;\
auto operator()(expr<Tag, Childs...> const& ex, Pairs const&... pairs) const \ auto operator()(expr<Tag, Childs...> const& ex, Pairs const&... pairs) const \
DECL_AND_RETURN ( OPTYPE()(BOOST_PP_ENUM(NN,AUX,nil)));\ DECL_AND_RETURN(op_dispatch<Tag, is_lazy> {}(BOOST_PP_ENUM(NN, AUX, nil))); \
}; };
BOOST_PP_REPEAT_FROM_TO(3,BOOST_PP_INC(TRIQS_CLEF_MAXNARGS), IMPL, nil); BOOST_PP_REPEAT_FROM_TO(3,BOOST_PP_INC(TRIQS_CLEF_MAXNARGS), IMPL, nil);
#undef AUX #undef AUX
@ -271,6 +310,8 @@ namespace triqs { namespace clef {
template<typename Tag, typename... Childs, typename... Pairs> template<typename Tag, typename... Childs, typename... Pairs>
struct evaluator<expr<Tag, Childs...>, Pairs...> : evaluator_node_gal<sizeof...(Childs), expr<Tag, Childs...>, Pairs...>{}; struct evaluator<expr<Tag, Childs...>, Pairs...> : evaluator_node_gal<sizeof...(Childs), expr<Tag, Childs...>, Pairs...>{};
#endif
// The general eval function for expressions // The general eval function for expressions
template<typename T, typename... Pairs> template<typename T, typename... Pairs>
@ -304,13 +345,14 @@ namespace triqs { namespace clef {
namespace result_of { namespace result_of {
template< typename Expr, typename ... Phs> struct make_function { template< typename Expr, typename ... Phs> struct make_function {
typedef make_fun_impl<typename remove_cv_ref<Expr>::type,Phs::index...> type; using type = make_fun_impl<typename remove_cv_ref<Expr>::type, Phs::index...>;
}; };
} }
template< typename Expr, int... Is,typename... Pairs> struct evaluator<make_fun_impl<Expr,Is...>, Pairs...> { template< typename Expr, int... Is,typename... Pairs> struct evaluator<make_fun_impl<Expr,Is...>, Pairs...> {
typedef evaluator<Expr,Pairs...> e_t; using e_t = evaluator<Expr, Pairs...>;
typedef std::integral_constant<bool, ph_set< make_fun_impl<Expr,Is...> >::value != ph_set<Pairs...>::value> is_lazy; //using is_lazy = std::integral_constant<bool, ph_set<make_fun_impl<Expr, Is...>>::value != ph_set<Pairs...>::value>;
static constexpr bool is_lazy = (ph_set<make_fun_impl<Expr, Is...>>::value != ph_set<Pairs...>::value);
auto operator()(make_fun_impl<Expr,Is...> const & f, Pairs const & ... pairs) const DECL_AND_RETURN( make_function( e_t()(f.ex, pairs...),placeholder<Is>()...)); auto operator()(make_fun_impl<Expr,Is...> const & f, Pairs const & ... pairs) const DECL_AND_RETURN( make_function( e_t()(f.ex, pairs...),placeholder<Is>()...));
}; };
@ -407,7 +449,7 @@ namespace triqs { namespace clef {
* --------------------------------------------------------------------------------------------------- */ * --------------------------------------------------------------------------------------------------- */
// make a node with the ref, unless it is an rvalue (which is moved). // make a node with the ref, unless it is an rvalue (which is moved).
template<typename T> expr<tags::terminal,typename expr_storage_t<T>::type > template<typename T> expr<tags::terminal,expr_storage_t<T> >
make_expr(T && x){ return {tags::terminal(), std::forward<T>(x)};} make_expr(T && x){ return {tags::terminal(), std::forward<T>(x)};}
// make a node from a copy of the object // make a node from a copy of the object
@ -423,7 +465,7 @@ namespace triqs { namespace clef {
namespace _result_of { namespace _result_of {
template< typename Obj, typename... Args > struct make_expr_call : template< typename Obj, typename... Args > struct make_expr_call :
std::enable_if< is_any_lazy<Args...>::value, expr<tags::function,typename expr_storage_t<Obj>::type, typename expr_storage_t<Args>::type ...> > { std::enable_if< is_any_lazy<Args...>::value, expr<tags::function,expr_storage_t<Obj>, expr_storage_t<Args> ...> > {
static_assert (((arity<Obj>::value==-1) || (arity<Obj>::value == sizeof...(Args))), "Object called with a wrong number of arguments"); static_assert (((arity<Obj>::value==-1) || (arity<Obj>::value == sizeof...(Args))), "Object called with a wrong number of arguments");
}; };
} }
@ -438,7 +480,7 @@ namespace triqs { namespace clef {
namespace _result_of { namespace _result_of {
template< typename Obj, typename Arg> struct make_expr_subscript : template< typename Obj, typename Arg> struct make_expr_subscript :
std::enable_if< is_any_lazy<Arg>::value, expr<tags::subscript,typename expr_storage_t<Obj>::type, typename expr_storage_t<Arg>::type> > {}; std::enable_if< is_any_lazy<Arg>::value, expr<tags::subscript,expr_storage_t<Obj>, expr_storage_t<Arg>> > {};
} }
template< typename Obj, typename Arg> template< typename Obj, typename Arg>
typename _result_of::make_expr_subscript<Obj,Arg>::type typename _result_of::make_expr_subscript<Obj,Arg>::type
@ -452,7 +494,7 @@ namespace triqs { namespace clef {
template<typename F> class function; template<typename F> class function;
template<typename ReturnType, typename... T> class function<ReturnType(T...)> : tags::function_class { template<typename ReturnType, typename... T> class function<ReturnType(T...)> : tags::function_class {
typedef std::function<ReturnType(T...)> std_function_type; using std_function_type = std::function<ReturnType(T...)>;
mutable std::shared_ptr <void> _exp; // CLEAN THIS MUTABLE ? mutable std::shared_ptr <void> _exp; // CLEAN THIS MUTABLE ?
mutable std::shared_ptr < std_function_type > _fnt_ptr; mutable std::shared_ptr < std_function_type > _fnt_ptr;
public: public:
@ -483,16 +525,18 @@ namespace triqs { namespace clef {
* --------------------------------------------------------------------------------------------------- */ * --------------------------------------------------------------------------------------------------- */
#define TRIQS_CLEF_MAKE_FNT_LAZY(name) \ #define TRIQS_CLEF_MAKE_FNT_LAZY(name) \
struct name##_lazy_impl { \ struct name##_lazy_impl { \
template<typename... A> auto operator()(A&&... a) const DECL_AND_RETURN (name(std::forward<A>(a)...));\ template <typename... A> auto operator()(A&&... a) const -> decltype(name(std::forward<A>(a)...)); \
}; \ }; \
template< typename... A> \ template <typename... A> auto name(A&&... a) DECL_AND_RETURN(make_expr_call(name##_lazy_impl(), std::forward<A>(a)...)); \
auto name( A&& ... a) DECL_AND_RETURN(make_expr_call(name##_lazy_impl(),std::forward<A>(a)...)); template <typename... A> auto name##_lazy_impl::operator()(A&&... a) const DECL_AND_RETURN(name(std::forward<A>(a)...));
#define TRIQS_CLEF_IMPLEMENT_LAZY_METHOD(TY, name) \ #define TRIQS_CLEF_IMPLEMENT_LAZY_METHOD(TY, name) \
struct __clef_lazy_method_impl_##name { \ struct __clef_lazy_method_impl_##name { \
TY* _x; \ TY* _x; \
template <typename... A> auto operator()(A&&... a) const DECL_AND_RETURN(_x -> name(std::forward<A>(a)...)); \ template <typename... A> auto operator()(A&&... a) const DECL_AND_RETURN(_x -> name(std::forward<A>(a)...)); \
friend std::ostream & operator<<(std::ostream & out, __clef_lazy_method_impl_##name const & x) { return out<<BOOST_PP_STRINGIZE(TY)<<"."<<BOOST_PP_STRINGIZE(name);}\ friend std::ostream& operator<<(std::ostream& out, __clef_lazy_method_impl_##name const& x) { \
return out << BOOST_PP_STRINGIZE(TY) << "." << BOOST_PP_STRINGIZE(name); \
} \
}; \ }; \
template <typename... A> \ template <typename... A> \
auto name(A&&... a) DECL_AND_RETURN(make_expr_call(__clef_lazy_method_impl_##name{this}, std::forward<A>(a)...)); auto name(A&&... a) DECL_AND_RETURN(make_expr_call(__clef_lazy_method_impl_##name{this}, std::forward<A>(a)...));
@ -505,7 +549,6 @@ namespace triqs { namespace clef {
auto operator()(Args&&... args) & DECL_AND_RETURN(make_expr_call(*this, std::forward<Args>(args)...)); \ auto operator()(Args&&... args) & DECL_AND_RETURN(make_expr_call(*this, std::forward<Args>(args)...)); \
\ \
template <typename... Args> \ template <typename... Args> \
auto operator()(Args&&... args ) && DECL_AND_RETURN(make_expr_call (std::move(*this),std::forward<Args>(args)...));\ auto operator()(Args&&... args) && DECL_AND_RETURN(make_expr_call(std::move(*this), std::forward<Args>(args)...));
}} // namespace triqs::clef }} // namespace triqs::clef
#endif #endif