mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@316 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-05-09 21:48:01 +00:00
parent 07f4a1e89f
commit 14e80c37dc
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libraries/turtle/args.hpp
View file

@ -59,7 +59,7 @@ namespace detail
BOOST_PP_ARRAY_ELEM(2, d) ) BOOST_PP_ARRAY_ELEM(2, d) )
#define MOCK_ARGS(n, S, tpn) \ #define MOCK_ARGS(n, S, tpn) \
BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_ARG_PROXY, (3, (n, S, tpn))) BOOST_PP_REPEAT(n, MOCK_ARG_PROXY, (3, (n, S, tpn)))
#define MOCK_DECL(M, n, S, c, tpn) \ #define MOCK_DECL(M, n, S, c, tpn) \
tpn boost::function_types::result_type< S >::type M( \ tpn boost::function_types::result_type< S >::type M( \

14
src/libraries/turtle/expectation.hpp
View file

@ -186,32 +186,32 @@ namespace detail
, public action< BOOST_DEDUCED_TYPENAME \ , public action< BOOST_DEDUCED_TYPENAME \
boost::function_types::result_type< Signature >::type, Signature > \ boost::function_types::result_type< Signature >::type, Signature > \
{ \ { \
BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_TYPEDEF, BOOST_PP_EMPTY) \ BOOST_PP_REPEAT(n, MOCK_EXPECTATION_TYPEDEF, BOOST_PP_EMPTY) \
public: \ public: \
expectation() \ expectation() \
: BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_CONSTRUCTOR, BOOST_PP_EMPTY) \ : BOOST_PP_REPEAT(n, MOCK_EXPECTATION_CONSTRUCTOR, BOOST_PP_EMPTY) \
{} \ {} \
template< BOOST_PP_ENUM_PARAMS(n, typename Constraint) > \ template< BOOST_PP_ENUM_PARAMS(n, typename Constraint) > \
expectation& with( BOOST_PP_ENUM_BINARY_PARAMS(n, Constraint, c) ) \ expectation& with( BOOST_PP_ENUM_BINARY_PARAMS(n, Constraint, c) ) \
{ \ { \
BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_WITH, BOOST_PP_EMPTY) \ BOOST_PP_REPEAT(n, MOCK_EXPECTATION_WITH, BOOST_PP_EMPTY) \
return *this; \ return *this; \
} \ } \
bool is_valid( BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_ARGS, BOOST_PP_EMPTY) ) const \ bool is_valid( BOOST_PP_REPEAT(n, MOCK_EXPECTATION_ARGS, BOOST_PP_EMPTY) ) const \
{ \ { \
return ! i_->exhausted() \ return ! i_->exhausted() \
BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_IS_VALID, BOOST_PP_EMPTY); \ BOOST_PP_REPEAT(n, MOCK_EXPECTATION_IS_VALID, BOOST_PP_EMPTY); \
} \ } \
MOCK_EXPECTATION_METHODS \ MOCK_EXPECTATION_METHODS \
friend std::ostream& operator<<( std::ostream& s, const expectation& m ) \ friend std::ostream& operator<<( std::ostream& s, const expectation& m ) \
{ \ { \
return s << (m.i_->exhausted() ? 'v' : '.') << ' ' << *m.i_ << ".with( " \ return s << (m.i_->exhausted() ? 'v' : '.') << ' ' << *m.i_ << ".with( " \
<< \ << \
BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_SERIALIZE, BOOST_PP_EMPTY) \ BOOST_PP_REPEAT(n, MOCK_EXPECTATION_SERIALIZE, BOOST_PP_EMPTY) \
<< " )"; \ << " )"; \
} \ } \
private: \ private: \
BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY) \ BOOST_PP_REPEAT(n, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY) \
}; };
BOOST_PP_REPEAT_FROM_TO(1, MOCK_NUM_ARGS, MOCK_EXPECTATION, BOOST_PP_EMPTY) BOOST_PP_REPEAT_FROM_TO(1, MOCK_NUM_ARGS, MOCK_EXPECTATION, BOOST_PP_EMPTY)

4
src/libraries/turtle/function.hpp
View file

@ -209,7 +209,7 @@ namespace mock
#define MOCK_EXPECTATION_CALL_CONTEXT(n) \ #define MOCK_EXPECTATION_CALL_CONTEXT(n) \
boost::unit_test::lazy_ostream::instance() \ boost::unit_test::lazy_ostream::instance() \
<< lazy_context( this ) \ << lazy_context( this ) \
<< "(" BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_FORMAT, BOOST_PP_DEC(n)) << ")" \ << "(" BOOST_PP_REPEAT(n, MOCK_EXPECTATION_FORMAT, BOOST_PP_DEC(n)) << ")" \
<< lazy_expectations( this ) << lazy_expectations( this )
#define MOCK_EXPECTATION_INVOKE(z, n, A) \ #define MOCK_EXPECTATION_INVOKE(z, n, A) \
{ \ { \
@ -238,7 +238,7 @@ namespace mock
MOCK_DECL(operator(), n, Signature, const, BOOST_DEDUCED_TYPENAME) \ MOCK_DECL(operator(), n, Signature, const, BOOST_DEDUCED_TYPENAME) \
MOCK_EXPECTATION_INVOKE(z, n, P) MOCK_EXPECTATION_INVOKE(z, n, P)
BOOST_PP_REPEAT_FROM_TO(0, MOCK_NUM_ARGS, MOCK_EXPECTATION_OPERATOR, ErrorPolicy::abort()) BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_EXPECTATION_OPERATOR, ErrorPolicy::abort())
void test() const void test() const
MOCK_EXPECTATION_INVOKE(, 0,) MOCK_EXPECTATION_INVOKE(, 0,)

8
src/libraries/turtle/mock.hpp
View file

@ -14,7 +14,7 @@
#include "function.hpp" #include "function.hpp"
#include "type_name.hpp" #include "type_name.hpp"
#include "args.hpp" #include "args.hpp"
#include <boost/preprocessor/repetition/repeat_from_to.hpp> #include <boost/preprocessor/repetition/repeat.hpp>
#include <boost/preprocessor/stringize.hpp> #include <boost/preprocessor/stringize.hpp>
#include <boost/function_types/parameter_types.hpp> #include <boost/function_types/parameter_types.hpp>
#include <boost/function_types/function_type.hpp> #include <boost/function_types/function_type.hpp>
@ -164,7 +164,7 @@ namespace detail
{ \ { \
return e( BOOST_PP_ENUM_PARAMS(n, p) ); \ return e( BOOST_PP_ENUM_PARAMS(n, p) ); \
} }
BOOST_PP_REPEAT_FROM_TO(0, MOCK_NUM_ARGS, MOCK_CALL, BOOST_PP_EMPTY) BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_CALL, BOOST_PP_EMPTY)
#undef MOCK_CALL #undef MOCK_CALL
} }
} }
@ -256,7 +256,7 @@ namespace detail
>::type \ >::type \
call( E BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, MOCK_CALL_INVALID_TYPE, BOOST_PP_EMPTY) ) \ call( E BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, MOCK_CALL_INVALID_TYPE, BOOST_PP_EMPTY) ) \
{} {}
BOOST_PP_REPEAT_FROM_TO(0, MOCK_NUM_ARGS, MOCK_CALL, BOOST_PP_EMPTY) BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_CALL, BOOST_PP_EMPTY)
#undef MOCK_CALL #undef MOCK_CALL
#undef MOCK_CALL_INVALID_TYPE #undef MOCK_CALL_INVALID_TYPE
} }
@ -272,7 +272,7 @@ namespace detail
BOOST_PP_ARRAY_ELEM(4, d)) BOOST_PP_ARRAY_ELEM(4, d))
#define MOCK_METHOD_STUB_ALT(M, S, t, c, tpn) \ #define MOCK_METHOD_STUB_ALT(M, S, t, c, tpn) \
BOOST_PP_REPEAT_FROM_TO(0, MOCK_NUM_ARGS, MOCK_METHOD_STUB_PROXY, (5,(M, S, t, c, tpn))) BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_METHOD_STUB_PROXY, (5,(M, S, t, c, tpn)))
#define MOCK_METHOD_EXT_ALT(M, S, t) \ #define MOCK_METHOD_EXT_ALT(M, S, t) \
MOCK_METHOD_STUB_ALT(M, S, t,,) \ MOCK_METHOD_STUB_ALT(M, S, t,,) \