Refactoring

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@636 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2013-05-03 20:18:05 +00:00
parent 8d2fb9c94c
commit 54c08c53a6

View file

@ -52,33 +52,33 @@ namespace detail
, public action< R, R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) > , public action< R, R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) >
{ {
BOOST_PP_REPEAT(MOCK_NUM_ARGS, BOOST_PP_REPEAT(MOCK_NUM_ARGS,
MOCK_EXPECTATION_TYPEDEF, BOOST_PP_EMPTY) MOCK_EXPECTATION_TYPEDEF, _)
public: public:
#ifndef MOCK_NUM_ARGS_0 #ifndef MOCK_NUM_ARGS_0
expectation() expectation()
: BOOST_PP_REPEAT(MOCK_NUM_ARGS, : BOOST_PP_REPEAT(MOCK_NUM_ARGS,
MOCK_EXPECTATION_INITIALIZE, BOOST_PP_EMPTY) MOCK_EXPECTATION_INITIALIZE, _)
{} {}
template< BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, typename Constraint_) > template< BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, typename Constraint_) >
expectation& with( expectation& with(
BOOST_PP_ENUM_BINARY_PARAMS(MOCK_NUM_ARGS, Constraint_, c) ) BOOST_PP_ENUM_BINARY_PARAMS(MOCK_NUM_ARGS, Constraint_, c) )
{ {
BOOST_PP_REPEAT(MOCK_NUM_ARGS, BOOST_PP_REPEAT(MOCK_NUM_ARGS,
MOCK_EXPECTATION_WITH, BOOST_PP_EMPTY) MOCK_EXPECTATION_WITH, _)
return *this; return *this;
} }
#endif #endif
bool is_valid( bool is_valid(
BOOST_PP_REPEAT(MOCK_NUM_ARGS, BOOST_PP_REPEAT(MOCK_NUM_ARGS,
MOCK_EXPECTATION_ARGS, BOOST_PP_EMPTY) ) const MOCK_EXPECTATION_ARGS, _) ) const
{ {
return ! i_->exhausted() return ! i_->exhausted()
BOOST_PP_REPEAT(MOCK_NUM_ARGS, BOOST_PP_REPEAT(MOCK_NUM_ARGS,
MOCK_EXPECTATION_IS_VALID, BOOST_PP_EMPTY); MOCK_EXPECTATION_IS_VALID, _);
} }
BOOST_PP_REPEAT(MOCK_MAX_SEQUENCES, BOOST_PP_REPEAT(MOCK_MAX_SEQUENCES,
MOCK_EXPECTATION_IN, BOOST_PP_EMPTY) MOCK_EXPECTATION_IN, _)
expectation& once() expectation& once()
{ {
@ -119,14 +119,14 @@ namespace detail
#ifndef MOCK_NUM_ARGS_0 #ifndef MOCK_NUM_ARGS_0
<< ".with( " << ".with( "
<< BOOST_PP_REPEAT(MOCK_NUM_ARGS, << BOOST_PP_REPEAT(MOCK_NUM_ARGS,
MOCK_EXPECTATION_SERIALIZE, BOOST_PP_EMPTY) MOCK_EXPECTATION_SERIALIZE, _)
<< " )" << " )"
#endif #endif
; ;
} }
private: private:
BOOST_PP_REPEAT( BOOST_PP_REPEAT(
MOCK_NUM_ARGS, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY) MOCK_NUM_ARGS, MOCK_EXPECTATION_MEMBER, _)
}; };
} }
} // mock } // mock