From 27a040d7ee10708fdd24c4f592643d6dbe6d6cff Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Wed, 14 Nov 2001 20:41:24 +0000 Subject: [PATCH] Pro7 support, better tests, less duplication [SVN r11694] --- bind_test.cpp | 299 +++++++++++++++++++++++--------------------------- 1 file changed, 137 insertions(+), 162 deletions(-) diff --git a/bind_test.cpp b/bind_test.cpp index 63493ed..facca6c 100644 --- a/bind_test.cpp +++ b/bind_test.cpp @@ -11,6 +11,7 @@ // Version 1.00.0002 (2001-09-02) // // Copyright (c) 2001 Peter Dimov and Multi Media Ltd. +// Copyright (c) 2001 David Abrahams // // Permission to copy, use, modify, sell and distribute this software // is granted provided this copyright notice appears in all copies. @@ -77,6 +78,58 @@ long f_9(long a, long b, long c, long d, long e, long f, long g, long h, long i) return a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g + 10000000 * h + 100000000 * i; } +long global_result; + +void fv_0() +{ + global_result = 17041L; +} + +void fv_1(long a) +{ + global_result = a; +} + +void fv_2(long a, long b) +{ + global_result = a + 10 * b; +} + +void fv_3(long a, long b, long c) +{ + global_result = a + 10 * b + 100 * c; +} + +void fv_4(long a, long b, long c, long d) +{ + global_result = a + 10 * b + 100 * c + 1000 * d; +} + +void fv_5(long a, long b, long c, long d, long e) +{ + global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e; +} + +void fv_6(long a, long b, long c, long d, long e, long f) +{ + global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f; +} + +void fv_7(long a, long b, long c, long d, long e, long f, long g) +{ + global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g; +} + +void fv_8(long a, long b, long c, long d, long e, long f, long g, long h) +{ + global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g + 10000000 * h; +} + +void fv_9(long a, long b, long c, long d, long e, long f, long g, long h, long i) +{ + global_result = a + 10 * b + 100 * c + 1000 * d + 10000 * e + 100000 * f + 1000000 * g + 10000000 * h + 100000000 * i; +} + void function_test() { using namespace boost; @@ -93,6 +146,17 @@ void function_test() BOOST_TEST( bind(f_7, _1, 2, 3, 4, 5, 6, 7)(i) == 7654321L ); BOOST_TEST( bind(f_8, _1, 2, 3, 4, 5, 6, 7, 8)(i) == 87654321L ); BOOST_TEST( bind(f_9, _1, 2, 3, 4, 5, 6, 7, 8, 9)(i) == 987654321L ); + + BOOST_TEST( (bind(fv_0)(i), (global_result == 17041L)) ); + BOOST_TEST( (bind(fv_1, _1)(i), (global_result == 1L)) ); + BOOST_TEST( (bind(fv_2, _1, 2)(i), (global_result == 21L)) ); + BOOST_TEST( (bind(fv_3, _1, 2, 3)(i), (global_result == 321L)) ); + BOOST_TEST( (bind(fv_4, _1, 2, 3, 4)(i), (global_result == 4321L)) ); + BOOST_TEST( (bind(fv_5, _1, 2, 3, 4, 5)(i), (global_result == 54321L)) ); + BOOST_TEST( (bind(fv_6, _1, 2, 3, 4, 5, 6)(i), (global_result == 654321L)) ); + BOOST_TEST( (bind(fv_7, _1, 2, 3, 4, 5, 6, 7)(i), (global_result == 7654321L)) ); + BOOST_TEST( (bind(fv_8, _1, 2, 3, 4, 5, 6, 7, 8)(i), (global_result == 87654321L)) ); + BOOST_TEST( (bind(fv_9, _1, 2, 3, 4, 5, 6, 7, 8, 9)(i), (global_result == 987654321L)) ); } // @@ -102,6 +166,7 @@ struct Y short operator()(short & r) const { return ++r; } int operator()(int a, int b) const { return a + 10 * b; } long operator() (long a, long b, long c) const { return a + 10 * b + 100 * c; } + void operator() (long a, long b, long c, const char*) const { global_result = a + 10 * b + 100 * c; } }; void function_object_test() @@ -116,6 +181,9 @@ void function_object_test() BOOST_TEST( bind(Y(), ref(i))() == 8 ); BOOST_TEST( bind(Y(), i, _1)(k) == 38 ); BOOST_TEST( bind(Y(), i, _1, 9)(k) == 938 ); +#if !defined(__MWERKS__) || __MWERKS__ > 0x2406 // Fails for this version of the compiler. + BOOST_TEST( (bind(Y(), i, _1, 9, "nothing")(k), (global_result == 938)) ); +#endif } // @@ -171,116 +239,6 @@ struct X int g8(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) const { g7(a1, a2, a3, a4, a5, a6, a7); g1(a8); return 0; } }; -void member_function_test() -{ - using namespace boost; - - X x; - - // 0 - - bind(&X::f0, &x)(); - bind(&X::f0, ref(x))(); - - bind(&X::g0, &x)(); - bind(&X::g0, x)(); - bind(&X::g0, ref(x))(); - - // 1 - - bind(&X::f1, &x, 1)(); - bind(&X::f1, ref(x), 1)(); - - bind(&X::g1, &x, 1)(); - bind(&X::g1, x, 1)(); - bind(&X::g1, ref(x), 1)(); - - // 2 - - bind(&X::f2, &x, 1, 2)(); - bind(&X::f2, ref(x), 1, 2)(); - - bind(&X::g2, &x, 1, 2)(); - bind(&X::g2, x, 1, 2)(); - bind(&X::g2, ref(x), 1, 2)(); - - // 3 - - bind(&X::f3, &x, 1, 2, 3)(); - bind(&X::f3, ref(x), 1, 2, 3)(); - - bind(&X::g3, &x, 1, 2, 3)(); - bind(&X::g3, x, 1, 2, 3)(); - bind(&X::g3, ref(x), 1, 2, 3)(); - - // 4 - - bind(&X::f4, &x, 1, 2, 3, 4)(); - bind(&X::f4, ref(x), 1, 2, 3, 4)(); - - bind(&X::g4, &x, 1, 2, 3, 4)(); - bind(&X::g4, x, 1, 2, 3, 4)(); - bind(&X::g4, ref(x), 1, 2, 3, 4)(); - - // 5 - - bind(&X::f5, &x, 1, 2, 3, 4, 5)(); - bind(&X::f5, ref(x), 1, 2, 3, 4, 5)(); - - bind(&X::g5, &x, 1, 2, 3, 4, 5)(); - bind(&X::g5, x, 1, 2, 3, 4, 5)(); - bind(&X::g5, ref(x), 1, 2, 3, 4, 5)(); - - // 6 - - bind(&X::f6, &x, 1, 2, 3, 4, 5, 6)(); - bind(&X::f6, ref(x), 1, 2, 3, 4, 5, 6)(); - - bind(&X::g6, &x, 1, 2, 3, 4, 5, 6)(); - bind(&X::g6, x, 1, 2, 3, 4, 5, 6)(); - bind(&X::g6, ref(x), 1, 2, 3, 4, 5, 6)(); - - // 7 - - bind(&X::f7, &x, 1, 2, 3, 4, 5, 6, 7)(); - bind(&X::f7, ref(x), 1, 2, 3, 4, 5, 6, 7)(); - - bind(&X::g7, &x, 1, 2, 3, 4, 5, 6, 7)(); - bind(&X::g7, x, 1, 2, 3, 4, 5, 6, 7)(); - bind(&X::g7, ref(x), 1, 2, 3, 4, 5, 6, 7)(); - - // 8 - - bind(&X::f8, &x, 1, 2, 3, 4, 5, 6, 7, 8)(); - bind(&X::f8, ref(x), 1, 2, 3, 4, 5, 6, 7, 8)(); - - bind(&X::g8, &x, 1, 2, 3, 4, 5, 6, 7, 8)(); - bind(&X::g8, x, 1, 2, 3, 4, 5, 6, 7, 8)(); - bind(&X::g8, ref(x), 1, 2, 3, 4, 5, 6, 7, 8)(); - - BOOST_TEST( x.hash == 23558 ); -} - -// - -void nested_bind_test() -{ - using namespace boost; - - int const x = 1; - int const y = 2; - - BOOST_TEST( bind(f_1, bind(f_1, _1))(x) == 1L ); - BOOST_TEST( bind(f_1, bind(f_2, _1, _2))(x, y) == 21L ); - BOOST_TEST( bind(f_2, bind(f_1, _1), bind(f_1, _1))(x) == 11L ); - BOOST_TEST( bind(f_2, bind(f_1, _1), bind(f_1, _2))(x, y) == 21L ); - BOOST_TEST( bind(f_1, bind(f_0))() == 17041L ); -} - -// - -// - struct V { mutable unsigned int hash; @@ -315,97 +273,114 @@ struct V void g8(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8) const { g7(a1, a2, a3, a4, a5, a6, a7); g1(a8); } }; -void void_returns_test() +template +void member_function_test(T x) { using namespace boost; - V v; - // 0 - bind(&V::f0, &v)(); - bind(&V::f0, ref(v))(); + bind(&T::f0, &x)(); + bind(&T::f0, ref(x))(); - bind(&V::g0, &v)(); - bind(&V::g0, v)(); - bind(&V::g0, ref(v))(); + bind(&T::g0, &x)(); + bind(&T::g0, x)(); + bind(&T::g0, ref(x))(); // 1 - bind(&V::f1, &v, 1)(); - bind(&V::f1, ref(v), 1)(); + bind(&T::f1, &x, 1)(); + bind(&T::f1, ref(x), 1)(); - bind(&V::g1, &v, 1)(); - bind(&V::g1, v, 1)(); - bind(&V::g1, ref(v), 1)(); + bind(&T::g1, &x, 1)(); + bind(&T::g1, x, 1)(); + bind(&T::g1, ref(x), 1)(); // 2 - bind(&V::f2, &v, 1, 2)(); - bind(&V::f2, ref(v), 1, 2)(); + bind(&T::f2, &x, 1, 2)(); + bind(&T::f2, ref(x), 1, 2)(); - bind(&V::g2, &v, 1, 2)(); - bind(&V::g2, v, 1, 2)(); - bind(&V::g2, ref(v), 1, 2)(); + bind(&T::g2, &x, 1, 2)(); + bind(&T::g2, x, 1, 2)(); + bind(&T::g2, ref(x), 1, 2)(); // 3 - bind(&V::f3, &v, 1, 2, 3)(); - bind(&V::f3, ref(v), 1, 2, 3)(); + bind(&T::f3, &x, 1, 2, 3)(); + bind(&T::f3, ref(x), 1, 2, 3)(); - bind(&V::g3, &v, 1, 2, 3)(); - bind(&V::g3, v, 1, 2, 3)(); - bind(&V::g3, ref(v), 1, 2, 3)(); + bind(&T::g3, &x, 1, 2, 3)(); + bind(&T::g3, x, 1, 2, 3)(); + bind(&T::g3, ref(x), 1, 2, 3)(); // 4 - bind(&V::f4, &v, 1, 2, 3, 4)(); - bind(&V::f4, ref(v), 1, 2, 3, 4)(); + bind(&T::f4, &x, 1, 2, 3, 4)(); + bind(&T::f4, ref(x), 1, 2, 3, 4)(); - bind(&V::g4, &v, 1, 2, 3, 4)(); - bind(&V::g4, v, 1, 2, 3, 4)(); - bind(&V::g4, ref(v), 1, 2, 3, 4)(); + bind(&T::g4, &x, 1, 2, 3, 4)(); + bind(&T::g4, x, 1, 2, 3, 4)(); + bind(&T::g4, ref(x), 1, 2, 3, 4)(); // 5 - bind(&V::f5, &v, 1, 2, 3, 4, 5)(); - bind(&V::f5, ref(v), 1, 2, 3, 4, 5)(); + bind(&T::f5, &x, 1, 2, 3, 4, 5)(); + bind(&T::f5, ref(x), 1, 2, 3, 4, 5)(); - bind(&V::g5, &v, 1, 2, 3, 4, 5)(); - bind(&V::g5, v, 1, 2, 3, 4, 5)(); - bind(&V::g5, ref(v), 1, 2, 3, 4, 5)(); + bind(&T::g5, &x, 1, 2, 3, 4, 5)(); + bind(&T::g5, x, 1, 2, 3, 4, 5)(); + bind(&T::g5, ref(x), 1, 2, 3, 4, 5)(); // 6 - bind(&V::f6, &v, 1, 2, 3, 4, 5, 6)(); - bind(&V::f6, ref(v), 1, 2, 3, 4, 5, 6)(); + bind(&T::f6, &x, 1, 2, 3, 4, 5, 6)(); + bind(&T::f6, ref(x), 1, 2, 3, 4, 5, 6)(); - bind(&V::g6, &v, 1, 2, 3, 4, 5, 6)(); - bind(&V::g6, v, 1, 2, 3, 4, 5, 6)(); - bind(&V::g6, ref(v), 1, 2, 3, 4, 5, 6)(); + bind(&T::g6, &x, 1, 2, 3, 4, 5, 6)(); + bind(&T::g6, x, 1, 2, 3, 4, 5, 6)(); + bind(&T::g6, ref(x), 1, 2, 3, 4, 5, 6)(); // 7 - bind(&V::f7, &v, 1, 2, 3, 4, 5, 6, 7)(); - bind(&V::f7, ref(v), 1, 2, 3, 4, 5, 6, 7)(); + bind(&T::f7, &x, 1, 2, 3, 4, 5, 6, 7)(); + bind(&T::f7, ref(x), 1, 2, 3, 4, 5, 6, 7)(); - bind(&V::g7, &v, 1, 2, 3, 4, 5, 6, 7)(); - bind(&V::g7, v, 1, 2, 3, 4, 5, 6, 7)(); - bind(&V::g7, ref(v), 1, 2, 3, 4, 5, 6, 7)(); + bind(&T::g7, &x, 1, 2, 3, 4, 5, 6, 7)(); + bind(&T::g7, x, 1, 2, 3, 4, 5, 6, 7)(); + bind(&T::g7, ref(x), 1, 2, 3, 4, 5, 6, 7)(); // 8 - bind(&V::f8, &v, 1, 2, 3, 4, 5, 6, 7, 8)(); - bind(&V::f8, ref(v), 1, 2, 3, 4, 5, 6, 7, 8)(); + bind(&T::f8, &x, 1, 2, 3, 4, 5, 6, 7, 8)(); + bind(&T::f8, ref(x), 1, 2, 3, 4, 5, 6, 7, 8)(); - bind(&V::g8, &v, 1, 2, 3, 4, 5, 6, 7, 8)(); - bind(&V::g8, v, 1, 2, 3, 4, 5, 6, 7, 8)(); - bind(&V::g8, ref(v), 1, 2, 3, 4, 5, 6, 7, 8)(); + bind(&T::g8, &x, 1, 2, 3, 4, 5, 6, 7, 8)(); + bind(&T::g8, x, 1, 2, 3, 4, 5, 6, 7, 8)(); + bind(&T::g8, ref(x), 1, 2, 3, 4, 5, 6, 7, 8)(); - BOOST_TEST( v.hash == 23558 ); + BOOST_TEST( x.hash == 23558 ); } -// +void nested_bind_test() +{ + using namespace boost; + + int const x = 1; + int const y = 2; + + BOOST_TEST( bind(f_1, bind(f_1, _1))(x) == 1L ); + BOOST_TEST( bind(f_1, bind(f_2, _1, _2))(x, y) == 21L ); + BOOST_TEST( bind(f_2, bind(f_1, _1), bind(f_1, _1))(x) == 11L ); + BOOST_TEST( bind(f_2, bind(f_1, _1), bind(f_1, _2))(x, y) == 21L ); + BOOST_TEST( bind(f_1, bind(f_0))() == 17041L ); + + BOOST_TEST( (bind(fv_1, bind(f_1, _1))(x), (global_result == 1L)) ); + BOOST_TEST( (bind(fv_1, bind(f_2, _1, _2))(x, y), (global_result == 21L)) ); + BOOST_TEST( (bind(fv_2, bind(f_1, _1), bind(f_1, _1))(x), (global_result == 11L)) ); + BOOST_TEST( (bind(fv_2, bind(f_1, _1), bind(f_1, _2))(x, y), (global_result == 21L)) ); + BOOST_TEST( (bind(fv_1, bind(f_0))(), (global_result == 17041L)) ); +} int test_main(int, char * []) { @@ -414,9 +389,9 @@ int test_main(int, char * []) #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) adaptable_function_object_test(); #endif - member_function_test(); + member_function_test(X()); + member_function_test(V()); nested_bind_test(); - void_returns_test(); return 0; }