make apply lambda-enabled

[SVN r17248]
This commit is contained in:
Aleksey Gurtovoy
2003-02-06 10:35:43 +00:00
parent ab9463baf1
commit 3f1849142b
5 changed files with 267 additions and 400 deletions

View File

@@ -13,15 +13,13 @@ struct apply;
template< typename F > template< typename F >
struct apply0 : F struct apply0 : F
{ {
}; static int const arity = 1; typedef F arg1;
friend class apply0_rebind;
template<> typedef apply0_rebind rebind;
struct apply0< arg<-1> > };
{ class apply0_rebind { public: template< typename U1 > struct apply { typedef typename apply0<U1>::type type;
template< typename F > struct apply };
: F
{
};
}; };
template< template<
@@ -143,20 +141,14 @@ struct apply1
, T1 , T1
>::type >::type
{ {
}; static int const arity = 2; typedef F arg1;
typedef T1 arg2;
template<> friend class apply1_rebind;
struct apply1< arg<-1>,arg<-1> > typedef apply1_rebind rebind;
{ };
template< class apply1_rebind { public: template< typename U1, typename U2 > struct apply { typedef typename apply1< U1,U2 >::type type;
typename F, typename T1 };
>
struct apply
: F::template apply<
T1
>
{
};
}; };
template< template<
@@ -260,20 +252,15 @@ struct apply2
, T1, T2 , T1, T2
>::type >::type
{ {
}; static int const arity = 3; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply2< arg<-1>,arg<-1>,arg<-1> > friend class apply2_rebind;
{ typedef apply2_rebind rebind;
template< };
typename F, typename T1, typename T2 class apply2_rebind { public: template< typename U1, typename U2, typename U3 > struct apply { typedef typename apply2< U1,U2,U3 >::type type;
> };
struct apply
: F::template apply<
T1, T2
>
{
};
}; };
template< template<
@@ -358,20 +345,16 @@ struct apply3
, T1, T2, T3 , T1, T2, T3
>::type >::type
{ {
}; static int const arity = 4; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply3< arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ friend class apply3_rebind;
template< typedef apply3_rebind rebind;
typename F, typename T1, typename T2, typename T3 };
> class apply3_rebind { public: template< typename U1, typename U2, typename U3, typename U4 > struct apply { typedef typename apply3< U1,U2,U3,U4 >::type type;
struct apply };
: F::template apply<
T1, T2, T3
>
{
};
}; };
template< template<
@@ -437,20 +420,17 @@ struct apply4
, T1, T2, T3, T4 , T1, T2, T3, T4
>::type >::type
{ {
}; static int const arity = 5; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply4< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ typedef T4 arg5;
template< friend class apply4_rebind;
typename F, typename T1, typename T2, typename T3, typename T4 typedef apply4_rebind rebind;
> };
struct apply class apply4_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5 > struct apply { typedef typename apply4< U1,U2,U3,U4,U5 >::type type;
: F::template apply< };
T1, T2, T3, T4
>
{
};
}; };
template< template<
@@ -500,21 +480,18 @@ struct apply5
, T1, T2, T3, T4, T5 , T1, T2, T3, T4, T5
>::type >::type
{ {
}; static int const arity = 6; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply5< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ typedef T4 arg5;
template< typedef T5 arg6;
typename F, typename T1, typename T2, typename T3, typename T4 friend class apply5_rebind;
, typename T5 typedef apply5_rebind rebind;
> };
struct apply class apply5_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 > struct apply { typedef typename apply5< U1,U2,U3,U4,U5,U6 >::type type;
: F::template apply< };
T1, T2, T3, T4, T5
>
{
};
}; };
// primary template (not a specialization!) // primary template (not a specialization!)

View File

@@ -13,15 +13,13 @@ struct apply;
template< typename F > template< typename F >
struct apply0 : F struct apply0 : F
{ {
}; static int const arity = 1; typedef F arg1;
friend class apply0_rebind;
template<> typedef apply0_rebind rebind;
struct apply0< arg<-1> > };
{ class apply0_rebind { public: template< typename U1 > struct apply { typedef typename apply0<U1>::type type;
template< typename F > struct apply };
: F
{
};
}; };
template< template<
@@ -143,20 +141,14 @@ struct apply1
, T1 , T1
>::type >::type
{ {
}; static int const arity = 2; typedef F arg1;
typedef T1 arg2;
template<> friend class apply1_rebind;
struct apply1< arg<-1>,arg<-1> > typedef apply1_rebind rebind;
{ };
template< class apply1_rebind { public: template< typename U1, typename U2 > struct apply { typedef typename apply1< U1,U2 >::type type;
typename F, typename T1 };
>
struct apply
: F::template apply<
T1
>
{
};
}; };
template< template<
@@ -260,20 +252,15 @@ struct apply2
, T1, T2 , T1, T2
>::type >::type
{ {
}; static int const arity = 3; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply2< arg<-1>,arg<-1>,arg<-1> > friend class apply2_rebind;
{ typedef apply2_rebind rebind;
template< };
typename F, typename T1, typename T2 class apply2_rebind { public: template< typename U1, typename U2, typename U3 > struct apply { typedef typename apply2< U1,U2,U3 >::type type;
> };
struct apply
: F::template apply<
T1, T2
>
{
};
}; };
template< template<
@@ -358,20 +345,16 @@ struct apply3
, T1, T2, T3 , T1, T2, T3
>::type >::type
{ {
}; static int const arity = 4; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply3< arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ friend class apply3_rebind;
template< typedef apply3_rebind rebind;
typename F, typename T1, typename T2, typename T3 };
> class apply3_rebind { public: template< typename U1, typename U2, typename U3, typename U4 > struct apply { typedef typename apply3< U1,U2,U3,U4 >::type type;
struct apply };
: F::template apply<
T1, T2, T3
>
{
};
}; };
template< template<
@@ -437,20 +420,17 @@ struct apply4
, T1, T2, T3, T4 , T1, T2, T3, T4
>::type >::type
{ {
}; static int const arity = 5; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply4< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ typedef T4 arg5;
template< friend class apply4_rebind;
typename F, typename T1, typename T2, typename T3, typename T4 typedef apply4_rebind rebind;
> };
struct apply class apply4_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5 > struct apply { typedef typename apply4< U1,U2,U3,U4,U5 >::type type;
: F::template apply< };
T1, T2, T3, T4
>
{
};
}; };
template< template<
@@ -500,21 +480,18 @@ struct apply5
, T1, T2, T3, T4, T5 , T1, T2, T3, T4, T5
>::type >::type
{ {
}; static int const arity = 6; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply5< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ typedef T4 arg5;
template< typedef T5 arg6;
typename F, typename T1, typename T2, typename T3, typename T4 friend class apply5_rebind;
, typename T5 typedef apply5_rebind rebind;
> };
struct apply class apply5_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 > struct apply { typedef typename apply5< U1,U2,U3,U4,U5,U6 >::type type;
: F::template apply< };
T1, T2, T3, T4, T5
>
{
};
}; };
// primary template (not a specialization!) // primary template (not a specialization!)

View File

@@ -7,15 +7,12 @@ namespace mpl {
template< typename F > template< typename F >
struct apply0 : F struct apply0 : F
{ {
}; enum { arity = 1 }; typedef F arg1;
friend class apply0_rebind;
template<> typedef apply0_rebind rebind;
struct apply0< arg<-1> > };
{ class apply0_rebind { public: template< typename U1 > struct apply : apply0<U1> { };
template< typename F > struct apply
: F
{
};
}; };
// workaround for the ETI bug // workaround for the ETI bug
@@ -55,6 +52,13 @@ struct apply1
T1 T1
> >
{ {
enum { arity = 2 }; typedef F arg1;
typedef T1 arg2;
friend class apply1_rebind;
typedef apply1_rebind rebind;
};
class apply1_rebind { public: template< typename U1, typename U2 > struct apply : apply1< U1,U2 > { };
}; };
// workaround for ETI bug // workaround for ETI bug
@@ -64,20 +68,6 @@ struct apply1< int,int >
typedef int type; typedef int type;
}; };
template<>
struct apply1< arg<-1>,arg<-1> >
{
template<
typename F, typename T1
>
struct apply
: aux::msvc_apply1<F>::template result_<
T1
>
{
};
};
namespace aux { namespace aux {
template< typename F> template< typename F>
@@ -108,6 +98,14 @@ struct apply2
T1, T2 T1, T2
> >
{ {
enum { arity = 3 }; typedef F arg1;
typedef T1 arg2;
typedef T2 arg3;
friend class apply2_rebind;
typedef apply2_rebind rebind;
};
class apply2_rebind { public: template< typename U1, typename U2, typename U3 > struct apply : apply2< U1,U2,U3 > { };
}; };
// workaround for ETI bug // workaround for ETI bug
@@ -117,20 +115,6 @@ struct apply2< int,int,int >
typedef int type; typedef int type;
}; };
template<>
struct apply2< arg<-1>,arg<-1>,arg<-1> >
{
template<
typename F, typename T1, typename T2
>
struct apply
: aux::msvc_apply2<F>::template result_<
T1, T2
>
{
};
};
namespace aux { namespace aux {
template< typename F> template< typename F>
@@ -161,6 +145,15 @@ struct apply3
T1, T2, T3 T1, T2, T3
> >
{ {
enum { arity = 4 }; typedef F arg1;
typedef T1 arg2;
typedef T2 arg3;
typedef T3 arg4;
friend class apply3_rebind;
typedef apply3_rebind rebind;
};
class apply3_rebind { public: template< typename U1, typename U2, typename U3, typename U4 > struct apply : apply3< U1,U2,U3,U4 > { };
}; };
// workaround for ETI bug // workaround for ETI bug
@@ -170,20 +163,6 @@ struct apply3< int,int,int,int >
typedef int type; typedef int type;
}; };
template<>
struct apply3< arg<-1>,arg<-1>,arg<-1>,arg<-1> >
{
template<
typename F, typename T1, typename T2, typename T3
>
struct apply
: aux::msvc_apply3<F>::template result_<
T1, T2, T3
>
{
};
};
namespace aux { namespace aux {
template< typename F> template< typename F>
@@ -220,6 +199,16 @@ struct apply4
T1, T2, T3, T4 T1, T2, T3, T4
> >
{ {
enum { arity = 5 }; typedef F arg1;
typedef T1 arg2;
typedef T2 arg3;
typedef T3 arg4;
typedef T4 arg5;
friend class apply4_rebind;
typedef apply4_rebind rebind;
};
class apply4_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5 > struct apply : apply4< U1,U2,U3,U4,U5 > { };
}; };
// workaround for ETI bug // workaround for ETI bug
@@ -229,20 +218,6 @@ struct apply4< int,int,int,int,int >
typedef int type; typedef int type;
}; };
template<>
struct apply4< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> >
{
template<
typename F, typename T1, typename T2, typename T3, typename T4
>
struct apply
: aux::msvc_apply4<F>::template result_<
T1, T2, T3, T4
>
{
};
};
namespace aux { namespace aux {
template< typename F> template< typename F>
@@ -282,6 +257,17 @@ struct apply5
T1, T2, T3, T4, T5 T1, T2, T3, T4, T5
> >
{ {
enum { arity = 6 }; typedef F arg1;
typedef T1 arg2;
typedef T2 arg3;
typedef T3 arg4;
typedef T4 arg5;
typedef T5 arg6;
friend class apply5_rebind;
typedef apply5_rebind rebind;
};
class apply5_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 > struct apply : apply5< U1,U2,U3,U4,U5,U6 > { };
}; };
// workaround for ETI bug // workaround for ETI bug
@@ -291,21 +277,6 @@ struct apply5< int,int,int,int,int,int >
typedef int type; typedef int type;
}; };
template<>
struct apply5< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> >
{
template<
typename F, typename T1, typename T2, typename T3, typename T4
, typename T5
>
struct apply
: aux::msvc_apply5<F>::template result_<
T1, T2, T3, T4, T5
>
{
};
};
} // namespace mpl } // namespace mpl
} // namespace boost } // namespace boost

View File

@@ -11,15 +11,12 @@ template< int arity_ > struct apply_impl_chooser;
template< typename F > template< typename F >
struct apply0 : F struct apply0 : F
{ {
}; enum { arity = 1 }; typedef F arg1;
friend class apply0_rebind;
template<> typedef apply0_rebind rebind;
struct apply0< arg<-1> > };
{ class apply0_rebind { public: template< typename U1 > struct apply : apply0<U1> { };
template< typename F > struct apply
: F
{
};
}; };
namespace aux { namespace aux {
@@ -49,20 +46,13 @@ struct apply1
T1 T1
> >
{ {
}; enum { arity = 2 }; typedef F arg1;
typedef T1 arg2;
template<> friend class apply1_rebind;
struct apply1< arg<-1>,arg<-1> > typedef apply1_rebind rebind;
{ };
template< class apply1_rebind { public: template< typename U1, typename U2 > struct apply : apply1< U1,U2 > { };
typename F, typename T1
>
struct apply
: F::template apply<
T1
>
{
};
}; };
namespace aux { namespace aux {
@@ -92,20 +82,14 @@ struct apply2
T1, T2 T1, T2
> >
{ {
}; enum { arity = 3 }; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply2< arg<-1>,arg<-1>,arg<-1> > friend class apply2_rebind;
{ typedef apply2_rebind rebind;
template< };
typename F, typename T1, typename T2 class apply2_rebind { public: template< typename U1, typename U2, typename U3 > struct apply : apply2< U1,U2,U3 > { };
>
struct apply
: F::template apply<
T1, T2
>
{
};
}; };
namespace aux { namespace aux {
@@ -135,20 +119,15 @@ struct apply3
T1, T2, T3 T1, T2, T3
> >
{ {
}; enum { arity = 4 }; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply3< arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ friend class apply3_rebind;
template< typedef apply3_rebind rebind;
typename F, typename T1, typename T2, typename T3 };
> class apply3_rebind { public: template< typename U1, typename U2, typename U3, typename U4 > struct apply : apply3< U1,U2,U3,U4 > { };
struct apply
: F::template apply<
T1, T2, T3
>
{
};
}; };
namespace aux { namespace aux {
@@ -178,20 +157,16 @@ struct apply4
T1, T2, T3, T4 T1, T2, T3, T4
> >
{ {
}; enum { arity = 5 }; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply4< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ typedef T4 arg5;
template< friend class apply4_rebind;
typename F, typename T1, typename T2, typename T3, typename T4 typedef apply4_rebind rebind;
> };
struct apply class apply4_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5 > struct apply : apply4< U1,U2,U3,U4,U5 > { };
: F::template apply<
T1, T2, T3, T4
>
{
};
}; };
namespace aux { namespace aux {
@@ -222,21 +197,17 @@ struct apply5
T1, T2, T3, T4, T5 T1, T2, T3, T4, T5
> >
{ {
}; enum { arity = 6 }; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply5< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ typedef T4 arg5;
template< typedef T5 arg6;
typename F, typename T1, typename T2, typename T3, typename T4 friend class apply5_rebind;
, typename T5 typedef apply5_rebind rebind;
> };
struct apply class apply5_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 > struct apply : apply5< U1,U2,U3,U4,U5,U6 > { };
: F::template apply<
T1, T2, T3, T4, T5
>
{
};
}; };
namespace aux { namespace aux {

View File

@@ -11,15 +11,12 @@ template< int arity_ > struct apply_impl_chooser;
template< typename F > template< typename F >
struct apply0 : F struct apply0 : F
{ {
}; static int const arity = 1; typedef F arg1;
friend class apply0_rebind;
template<> typedef apply0_rebind rebind;
struct apply0< arg<-1> > };
{ class apply0_rebind { public: template< typename U1 > struct apply : apply0<U1> { };
template< typename F > struct apply
: F
{
};
}; };
namespace aux { namespace aux {
@@ -49,20 +46,13 @@ struct apply1
T1 T1
> >
{ {
}; static int const arity = 2; typedef F arg1;
typedef T1 arg2;
template<> friend class apply1_rebind;
struct apply1< arg<-1>,arg<-1> > typedef apply1_rebind rebind;
{ };
template< class apply1_rebind { public: template< typename U1, typename U2 > struct apply : apply1< U1,U2 > { };
typename F, typename T1
>
struct apply
: F::template apply<
T1
>
{
};
}; };
namespace aux { namespace aux {
@@ -92,20 +82,14 @@ struct apply2
T1, T2 T1, T2
> >
{ {
}; static int const arity = 3; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply2< arg<-1>,arg<-1>,arg<-1> > friend class apply2_rebind;
{ typedef apply2_rebind rebind;
template< };
typename F, typename T1, typename T2 class apply2_rebind { public: template< typename U1, typename U2, typename U3 > struct apply : apply2< U1,U2,U3 > { };
>
struct apply
: F::template apply<
T1, T2
>
{
};
}; };
namespace aux { namespace aux {
@@ -135,20 +119,15 @@ struct apply3
T1, T2, T3 T1, T2, T3
> >
{ {
}; static int const arity = 4; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply3< arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ friend class apply3_rebind;
template< typedef apply3_rebind rebind;
typename F, typename T1, typename T2, typename T3 };
> class apply3_rebind { public: template< typename U1, typename U2, typename U3, typename U4 > struct apply : apply3< U1,U2,U3,U4 > { };
struct apply
: F::template apply<
T1, T2, T3
>
{
};
}; };
namespace aux { namespace aux {
@@ -178,20 +157,16 @@ struct apply4
T1, T2, T3, T4 T1, T2, T3, T4
> >
{ {
}; static int const arity = 5; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply4< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ typedef T4 arg5;
template< friend class apply4_rebind;
typename F, typename T1, typename T2, typename T3, typename T4 typedef apply4_rebind rebind;
> };
struct apply class apply4_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5 > struct apply : apply4< U1,U2,U3,U4,U5 > { };
: F::template apply<
T1, T2, T3, T4
>
{
};
}; };
namespace aux { namespace aux {
@@ -222,21 +197,17 @@ struct apply5
T1, T2, T3, T4, T5 T1, T2, T3, T4, T5
> >
{ {
}; static int const arity = 6; typedef F arg1;
typedef T1 arg2;
template<> typedef T2 arg3;
struct apply5< arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1>,arg<-1> > typedef T3 arg4;
{ typedef T4 arg5;
template< typedef T5 arg6;
typename F, typename T1, typename T2, typename T3, typename T4 friend class apply5_rebind;
, typename T5 typedef apply5_rebind rebind;
> };
struct apply class apply5_rebind { public: template< typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 > struct apply : apply5< U1,U2,U3,U4,U5,U6 > { };
: F::template apply<
T1, T2, T3, T4, T5
>
{
};
}; };
namespace aux { namespace aux {