Update of /cvsroot/boost/boost/libs/fusion/test/functional
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21739/functional
Modified Files:
invoke.cpp make_unfused_generic.cpp
make_unfused_lvalue_args.cpp make_unfused_rvalue_args.cpp
unfused_generic.cpp unfused_lvalue_args.cpp
unfused_rvalue_args.cpp unfused_typed.cpp
Log Message:
makes unfused_* work through boost::result_of only
Index: invoke.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/fusion/test/functional/invoke.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- invoke.cpp 11 Jun 2007 06:59:05 -0000 1.2
+++ invoke.cpp 13 Jul 2007 14:06:49 -0000 1.3
@@ -10,11 +10,11 @@
#include <boost/fusion/functional/invocation/invoke.hpp>
#include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/functional/adapter/detail/has_type.hpp>
-
#include <memory>
#include <boost/noncopyable.hpp>
+#include <boost/type_traits/is_same.hpp>
+
#include <boost/mpl/int.hpp>
#include <boost/fusion/sequence/container/vector.hpp>
@@ -337,25 +337,19 @@
void result_type_tests()
{
- using boost::fusion::detail::has_type;
+ using boost::is_same;
- BOOST_TEST(( has_type<
- fusion::result_of::invoke<int (*)(), fusion::vector0 >
- >::value ));
- BOOST_TEST(( has_type<
- fusion::result_of::invoke<int (*)(...), fusion::vector1<int> >
- >::value ));
- BOOST_TEST(( ! has_type<
- fusion::result_of::invoke<int (*)(), fusion::vector1<int> >
+ BOOST_TEST(( is_same<
+ fusion::result_of::invoke<int (*)(), fusion::vector0 >::type, int
>::value ));
- BOOST_TEST(( has_type<
- fusion::result_of::invoke<int (members::*)(), fusion::vector1<members*>
>
+ BOOST_TEST(( is_same<
+ fusion::result_of::invoke<int (*)(...), fusion::vector1<int> >::type,
int
>::value ));
- BOOST_TEST(( has_type<
- fusion::result_of::invoke<int (members::*)(...),
fusion::vector2<members*,int> >
+ BOOST_TEST(( is_same<
+ fusion::result_of::invoke<int (members::*)(), fusion::vector1<members*>
>::type, int
>::value ));
- BOOST_TEST(( ! has_type<
- fusion::result_of::invoke<int (members::*)(),
fusion::vector2<members*,int> >
+ BOOST_TEST(( is_same<
+ fusion::result_of::invoke<int (members::*)(...),
fusion::vector2<members*,int> >::type, int
>::value ));
}
Index: make_unfused_generic.cpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/fusion/test/functional/make_unfused_generic.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- make_unfused_generic.cpp 12 Jul 2007 09:08:46 -0000 1.3
+++ make_unfused_generic.cpp 13 Jul 2007 14:06:49 -0000 1.4
@@ -42,7 +42,7 @@
struct result;
template <class Self, class Seq>
- struct result< Self(Seq) >
+ struct result< Self(Seq &) >
: mpl::if_< mpl::and_< fusion::result_of::empty<Seq>, RemoveNullary >,
boost::blank, mpl::identity<long> >::type
{ };
Index: make_unfused_lvalue_args.cpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/fusion/test/functional/make_unfused_lvalue_args.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- make_unfused_lvalue_args.cpp 12 Jul 2007 09:08:46 -0000 1.3
+++ make_unfused_lvalue_args.cpp 13 Jul 2007 14:06:50 -0000 1.4
@@ -41,7 +41,7 @@
struct result;
template <class Self, class Seq>
- struct result< Self(Seq) >
+ struct result< Self(Seq &) >
: mpl::if_< mpl::and_< fusion::result_of::empty<Seq>, RemoveNullary >,
boost::blank, mpl::identity<long> >::type
{ };
Index: make_unfused_rvalue_args.cpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/fusion/test/functional/make_unfused_rvalue_args.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- make_unfused_rvalue_args.cpp 12 Jul 2007 09:08:46 -0000 1.3
+++ make_unfused_rvalue_args.cpp 13 Jul 2007 14:06:50 -0000 1.4
@@ -39,7 +39,7 @@
struct result;
template <class Self, class Seq>
- struct result< Self(Seq) >
+ struct result< Self(Seq &) >
: mpl::if_< mpl::and_< fusion::result_of::empty<Seq>, RemoveNullary >,
boost::blank, mpl::identity<long> >::type
{ };
Index: unfused_generic.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/fusion/test/functional/unfused_generic.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- unfused_generic.cpp 12 Jul 2007 09:08:46 -0000 1.3
+++ unfused_generic.cpp 13 Jul 2007 14:06:50 -0000 1.4
@@ -10,19 +10,14 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/fusion/functional/adapter/detail/has_type.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/bool.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/utility/result_of.hpp>
-#include <boost/fusion/sequence/intrinsic/empty.hpp>
#include <boost/fusion/algorithm/iteration/fold.hpp>
namespace fusion = boost::fusion;
@@ -31,7 +26,7 @@
using boost::noncopyable;
typedef mpl::true_ no_nullary_call;
-template <class Base = boost::blank, class RemoveNullary = mpl::false_>
+template <class Base = boost::blank>
struct test_func
: Base
{
@@ -39,9 +34,8 @@
struct result;
template <class Self, class Seq>
- struct result< Self(Seq) >
- : mpl::if_< mpl::and_< fusion::result_of::empty<Seq>, RemoveNullary >,
- boost::blank, mpl::identity<long> >::type
+ struct result< Self (Seq) >
+ : mpl::identity<long>
{ };
template <typename Seq>
@@ -62,8 +56,6 @@
struct fold_op
{
- typedef long result_type;
-
template <typename T>
long operator()(T const & elem, long value) const
{
@@ -76,22 +68,23 @@
elem += sizeof(T);
return value;
}
+
+ template <typename Sig>
+ struct result;
+
+ template <class Self, typename T0, typename T1> struct result<
Self(T0,T1) >
+ : mpl::identity<long>
+ { };
};
};
void result_type_tests()
{
using boost::is_same;
- using boost::fusion::detail::has_type;
-
- typedef fusion::unfused_generic< test_func<noncopyable, no_nullary_call> >
test_func_1;
- typedef fusion::unfused_generic< test_func<noncopyable> > test_func_0;
- BOOST_TEST(( has_type< test_func_0::result<test_func_0()> >::value ));
- BOOST_TEST(( has_type< test_func_1::result<test_func_1(int)> >::value ));
- BOOST_TEST(( ! has_type< test_func_1::result<test_func_1() > >::value ));
- BOOST_TEST(( is_same< boost::result_of< test_func_0() >::type, long
>::value ));
- BOOST_TEST(( is_same< boost::result_of< test_func_1(int) >::type, long
>::value ));
+ typedef fusion::unfused_generic< test_func<> > t;
+ BOOST_TEST(( is_same< boost::result_of< t () >::type, long >::value ));
+ BOOST_TEST(( is_same< boost::result_of< t (int) >::type, long >::value ));
}
int main()
Index: unfused_lvalue_args.cpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/fusion/test/functional/unfused_lvalue_args.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- unfused_lvalue_args.cpp 12 Jul 2007 09:08:46 -0000 1.3
+++ unfused_lvalue_args.cpp 13 Jul 2007 14:06:50 -0000 1.4
@@ -12,9 +12,6 @@
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/bool.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/utility/result_of.hpp>
@@ -26,9 +23,8 @@
namespace mpl = boost::mpl;
using boost::noncopyable;
-typedef mpl::true_ no_nullary_call;
-template <class Base = boost::blank, class RemoveNullary = mpl::false_>
+template <class Base = boost::blank>
struct test_func
: Base
{
@@ -37,8 +33,7 @@
template <class Self, class Seq>
struct result< Self(Seq) >
- : mpl::if_< mpl::and_< fusion::result_of::empty<Seq>, RemoveNullary >,
- boost::blank, mpl::identity<long> >::type
+ : mpl::identity<long>
{ };
template <typename Seq>
@@ -73,16 +68,10 @@
void result_type_tests()
{
using boost::is_same;
- using boost::fusion::detail::has_type;
- typedef fusion::unfused_lvalue_args< test_func<noncopyable,
no_nullary_call> > test_func_1;
- typedef fusion::unfused_lvalue_args< test_func<noncopyable> > test_func_0;
-
- BOOST_TEST(( has_type< test_func_0::result<test_func_0()> >::value ));
- BOOST_TEST(( has_type< test_func_1::result<test_func_1(int)> >::value ));
- BOOST_TEST(( ! has_type< test_func_1::result<test_func_1()> >::value ));
- BOOST_TEST(( is_same< boost::result_of< test_func_0() >::type, long
>::value ));
- BOOST_TEST(( is_same< boost::result_of< test_func_1(int) >::type, long
>::value ));
+ typedef fusion::unfused_lvalue_args< test_func<> > t;
+ BOOST_TEST(( is_same< boost::result_of< t () >::type, long >::value ));
+ BOOST_TEST(( is_same< boost::result_of< t (int) >::type, long >::value ));
}
int main()
Index: unfused_rvalue_args.cpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/fusion/test/functional/unfused_rvalue_args.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- unfused_rvalue_args.cpp 12 Jul 2007 09:08:46 -0000 1.3
+++ unfused_rvalue_args.cpp 13 Jul 2007 14:06:50 -0000 1.4
@@ -12,14 +12,10 @@
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/bool.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/utility/result_of.hpp>
-#include <boost/fusion/sequence/intrinsic/empty.hpp>
#include <boost/fusion/algorithm/iteration/fold.hpp>
namespace fusion = boost::fusion;
@@ -28,7 +24,7 @@
using boost::noncopyable;
typedef mpl::true_ no_nullary_call;
-template <class Base = boost::blank, class RemoveNullary = mpl::false_>
+template <class Base = boost::blank>
struct test_func
: Base
{
@@ -37,8 +33,7 @@
template <class Self, class Seq>
struct result< Self(Seq) >
- : mpl::if_< mpl::and_< fusion::result_of::empty<Seq>, RemoveNullary >,
- boost::blank, mpl::identity<long> >::type
+ : mpl::identity<long>
{ };
template <typename Seq>
@@ -72,16 +67,10 @@
void result_type_tests()
{
using boost::is_same;
- using boost::fusion::detail::has_type;
- typedef fusion::unfused_rvalue_args< test_func<noncopyable,
no_nullary_call> > test_func_1;
- typedef fusion::unfused_rvalue_args< test_func<noncopyable> > test_func_0;
-
- BOOST_TEST(( has_type< test_func_0::result<test_func_0()> >::value ));
- BOOST_TEST(( has_type< test_func_1::result<test_func_1(int)> >::value ));
- BOOST_TEST(( ! has_type< test_func_1::result<test_func_1()> >::value ));
- BOOST_TEST(( is_same< boost::result_of< test_func_0() >::type, long
>::value ));
- BOOST_TEST(( is_same< boost::result_of< test_func_1(int) >::type, long
>::value ));
+ typedef fusion::unfused_rvalue_args< test_func<> > t;
+ BOOST_TEST(( is_same< boost::result_of< t () >::type, long >::value ));
+ BOOST_TEST(( is_same< boost::result_of< t (int) >::type, long >::value ));
}
int main()
Index: unfused_typed.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/fusion/test/functional/unfused_typed.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- unfused_typed.cpp 12 Jul 2007 09:08:46 -0000 1.5
+++ unfused_typed.cpp 13 Jul 2007 14:06:50 -0000 1.6
@@ -14,15 +14,10 @@
#include <boost/utility/result_of.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/apply.hpp>
-#include <boost/mpl/vector.hpp>
#include <boost/mpl/identity.hpp>
-#include <boost/mpl/equal_to.hpp>
#include <boost/utility/result_of.hpp>
-#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/algorithm/iteration/fold.hpp>
namespace fusion = boost::fusion;
@@ -33,12 +28,7 @@
typedef fusion::vector<long &,int,char> types;
-typedef mpl::always< mpl::true_ > unconstrained;
-
-typedef mpl::equal_to< fusion::result_of::size<_>,
- fusion::result_of::size<types> > non_variadic;
-
-template <class Base = boost::blank, class Validation = unconstrained>
+template <class Base = boost::blank>
struct test_func
: Base
{
@@ -46,9 +36,8 @@
struct result;
template <class Self, class Seq>
- struct result<Self(Seq)>
- : mpl::if_< typename mpl::apply<Validation, Seq>::type,
- mpl::identity<long>, boost::blank >::type
+ struct result< Self(Seq) >
+ : mpl::identity<long>
{ };
template <typename Seq>
@@ -89,16 +78,10 @@
void result_type_tests()
{
using boost::is_same;
- using boost::fusion::detail::has_type;
- typedef fusion::unfused_typed< test_func<noncopyable, non_variadic>, types
> test_func_3;
- typedef fusion::unfused_typed< test_func<noncopyable>, types > test_func_0;
-
- BOOST_TEST(( has_type< test_func_0::result<test_func_0()> >::value ));
- BOOST_TEST(( has_type< test_func_3::result<test_func_3(long &, int, char)>
>::value ));
- BOOST_TEST(( ! has_type< test_func_3::result<test_func_3()> >::value ));
- BOOST_TEST(( is_same< boost::result_of< test_func_0() >::type, long
>::value ));
- BOOST_TEST(( is_same< boost::result_of< test_func_3(long &, int, char)
>::type, long >::value ));
+ typedef fusion::unfused_typed< test_func<>, types > t;
+ BOOST_TEST(( is_same< boost::result_of< t () >::type, long >::value ));
+ BOOST_TEST(( is_same< boost::result_of< t (int) >::type, long >::value ));
}
#if defined(BOOST_MSVC) && BOOST_MSVC < 1400
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
