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

Fix C++98 compatibility

Browse source 
Arguments are now passed by (const) reference and not unconditionally as
rvalue references
This commit is contained in:
Alexander Grund 2018-11-16 15:23:18 +01:00
parent 272d49f27c
commit 21a62d0de7
11 changed files with 77 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/turtle/constraint.hpp
View file

@ -20,6 +20,8 @@
#include <boost/preprocessor/repetition/enum.hpp>
#include <boost/preprocessor/array.hpp>
#include <boost/move/move.hpp>
#include <boost/type_traits/decay.hpp>
#include <boost/type_traits/add_const.hpp>
namespace mock
{
@ -145,8 +147,8 @@ namespace detail
} \
const mock::constraint< detail::Name > Name;
#define MOCK_CONSTRAINT_ASSIGN(z, n, d) \
expected##n( e##n )
#define MOCK_CONSTRAINT_ASSIGN(z, n, Args) \
expected##n( boost::forward< T##n >( BOOST_PP_ARRAY_ELEM(n, Args) ) )
#define MOCK_CONSTRAINT_UNWRAP_REF(z, n, d) \
boost::unwrap_ref( expected##n )
@ -154,11 +156,14 @@ namespace detail
#define MOCK_CONSTRAINT_FORMAT(z, n, d) \
BOOST_PP_IF(n, << ", " <<,) mock::format( c.expected##n )
#define MOCK_CONSTRAINT_MEMBER_TYPE(n) \
typename boost::decay< typename boost::add_const< Expected_##n >::type >::type
#define MOCK_CONSTRAINT_MEMBER(z, n, d) \
Expected_##n expected##n;
MOCK_CONSTRAINT_MEMBER_TYPE(n) expected##n;
#define MOCK_CONSTRAINT_CREF_PARAM(z, n, Args) \
const typename boost::unwrap_reference< Expected_##n >::type& \
const typename boost::unwrap_reference< MOCK_CONSTRAINT_MEMBER_TYPE(n) >::type& \
BOOST_PP_ARRAY_ELEM(n, Args)
#define MOCK_CONSTRAINT_ARG(z, n, Args) \
@ -173,9 +178,10 @@ namespace detail
template< BOOST_PP_ENUM_PARAMS(n, typename Expected_) > \
struct Name \
{ \
template< BOOST_PP_ENUM_PARAMS(n, typename T) > \
explicit Name( \
BOOST_PP_ENUM_BINARY_PARAMS(n, Expected_, e) ) \
: BOOST_PP_ENUM(n, MOCK_CONSTRAINT_ASSIGN, _) \
BOOST_PP_ENUM(n, MOCK_CONSTRAINT_ARG, (n, Args)) ) \
: BOOST_PP_ENUM(n, MOCK_CONSTRAINT_ASSIGN, (n, Args)) \
{} \
template< typename Actual > \
bool operator()( const Actual& actual ) const \

40
include/turtle/constraints.hpp
View file

@ -170,10 +170,33 @@ namespace detail
: expected_( detail::addressof( boost::unwrap_ref( expected ) ) )
{}
template< typename Actual >
bool operator()( BOOST_RV_REF(Actual) actual,
typename boost::disable_if<
boost::is_convertible< Actual*,
typename
boost::unwrap_reference< Expected >::type
>
>::type* = 0 ) const
{
*expected_ = boost::move(actual);
return true;
}
template< typename Actual >
bool operator()( Actual& actual,
typename boost::disable_if<
boost::is_convertible< Actual*,
typename
boost::unwrap_reference< Expected >::type
>
>::type* = 0 ) const
{
*expected_ = static_cast< BOOST_RV_REF(Actual) >(actual);
return true;
}
template< typename Actual >
bool operator()( const Actual& actual,
typename boost::disable_if<
boost::is_convertible<
const Actual*,
boost::is_convertible< Actual*,
typename
boost::unwrap_reference< Expected >::type
>
@ -183,19 +206,6 @@ namespace detail
return true;
}
template< typename Actual >
bool operator()( BOOST_RV_REF(Actual) actual,
typename boost::disable_if<
boost::is_convertible<
const Actual*,
typename
boost::unwrap_reference< Expected >::type
>
>::type* = 0 ) const
{
*expected_ = boost::move( actual );
return true;
}
template< typename Actual >
bool operator()( Actual& actual,
typename boost::enable_if<
boost::is_convertible< Actual*,

4
include/turtle/detail/action.hpp
View file

@ -105,7 +105,7 @@ namespace detail
}
template< typename Value >
void moves( BOOST_RV_REF(Value) v )
void moves( BOOST_FWD_REF(Value) v )
{
this->set(
boost::bind(
@ -137,7 +137,7 @@ namespace detail
value_imp( BOOST_RV_REF(value_type) t )
: t_( boost::move( t ) )
{}
value_imp( const T& t )
value_imp( const value_type& t )
: t_( t )
{}
template< typename Y >

21
include/turtle/detail/expectation_template.hpp
View file

@ -12,10 +12,10 @@
BOOST_PP_COMMA_IF(n) c##n##_( c##n )
#define MOCK_EXPECTATION_MEMBER(z, n, d) \
matcher< T##n, Constraint_##n > c##n##_;
matcher< typename boost::remove_reference< T##n >::type, Constraint_##n > c##n##_;
#define MOCK_EXPECTATION_IS_VALID(z, n, d) \
BOOST_PP_IF(n, &&,) c##n##_( boost::forward< T##n >( a##n ) )
BOOST_PP_IF(n, &&,) c##n##_( a##n )
#define MOCK_EXPECTATION_SERIALIZE(z, n, d) \
BOOST_PP_IF(n, << ", " <<,) c##n##_
@ -24,10 +24,10 @@
BOOST_PP_IF(n, << ", " <<,) "any"
#define MOCK_EXPECTATION_PARAM(z, n, Args) \
boost::forward< T##n >( a##n )
a##n
#define MOCK_RV_REF_ARG(z, n, d) \
BOOST_RV_REF(T##n) a##n
#define MOCK_ARG_TYPE(z, n, d) \
typename ::mock::detail::ref_arg< T##n >::type a##n
namespace mock
{
@ -42,7 +42,7 @@ namespace detail
{
private:
virtual bool operator()(
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_RV_REF, _) )
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_ARG_TYPE, _) )
{
return true;
}
@ -76,7 +76,7 @@ namespace detail
private:
virtual bool operator()(
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_RV_REF_ARG, _) )
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_ARG_TYPE, _) )
{
return BOOST_PP_REPEAT(MOCK_NUM_ARGS,
MOCK_EXPECTATION_IS_VALID, _);
@ -106,7 +106,7 @@ namespace detail
private:
virtual bool operator()(
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_RV_REF_ARG, _) )
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_ARG_TYPE, _) )
{
return f_( BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_EXPECTATION_PARAM, _) );
}
@ -204,7 +204,7 @@ namespace detail
}
bool is_valid(
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_RV_REF_ARG, _) ) const
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_ARG_TYPE, _) ) const
{
return !invocation_->exhausted()
&& (*matcher_)( BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_EXPECTATION_PARAM, _) );
@ -268,5 +268,4 @@ namespace detail
#undef MOCK_EXPECTATION_SERIALIZE
#undef MOCK_EXPECTATION_SERIALIZE_ANY
#undef MOCK_EXPECTATION_PARAM
#undef MOCK_RV_REF_ARG
#undef MOCK_RV_REF
#undef MOCK_ARG_TYPE

7
include/turtle/detail/function.hpp
View file

@ -29,6 +29,7 @@
#include <boost/preprocessor/comparison/greater.hpp>
#include <boost/test/utils/basic_cstring/basic_cstring.hpp>
#include <boost/test/utils/lazy_ostream.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/call_traits.hpp>
#include <boost/make_shared.hpp>
@ -43,6 +44,12 @@ namespace mock
{
namespace detail
{
template< typename T >
struct ref_arg
{
typedef typename boost::add_reference<T>::type type;
};
template< typename R, typename E >
struct wrapper_base
{

6
include/turtle/detail/function_impl_template.hpp
View file

@ -183,9 +183,9 @@ namespace detail
this->e_->throws( t );
}
template< typename TT >
void moves( BOOST_RV_REF(TT) t )
void moves( BOOST_FWD_REF(TT) t )
{
this->e_->moves( boost::move( t ) );
this->e_->moves( boost::forward<TT>( t ) );
}
lock lock_;
@ -217,7 +217,7 @@ namespace detail
for( expectations_cit it = expectations_.begin();
it != expectations_.end(); ++it )
if( it->is_valid(
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_FORWARD, _) ) )
BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, t) ) )
{
if( ! it->invoke() )
{

2
include/turtle/detail/function_template.hpp
View file

@ -9,7 +9,7 @@
#include "function_impl_template.hpp"
#define MOCK_FORWARD(z, n, d) \
boost::forward< T##n >( t##n )
boost::move_if_not_lvalue_reference< T##n >( t##n )
namespace mock
{

9
include/turtle/detail/matcher_base_template.hpp
View file

@ -6,8 +6,8 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#define MOCK_RV_REF(z, n, d) \
BOOST_RV_REF(T##n)
#define MOCK_ARG_TYPE(z, n, d) \
typename ::mock::detail::ref_arg< T##n >::type a##n
namespace mock
{
@ -24,7 +24,7 @@ namespace detail
virtual ~matcher_base() {}
virtual bool operator()(
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_RV_REF, _) ) = 0;
BOOST_PP_ENUM(MOCK_NUM_ARGS, MOCK_ARG_TYPE, _) ) = 0;
friend std::ostream& operator<<(
std::ostream& s, const matcher_base& m )
@ -38,3 +38,6 @@ namespace detail
};
}
} // mock
#undef MOCK_ARG_TYPE
#undef MOCK_REF_ARG_TYPEDEF

8
include/turtle/matcher.hpp
View file

@ -71,6 +71,10 @@ namespace mock
{
return c_( boost::forward< Actual >( actual ) );
}
bool operator()( Actual& actual )
{
return c_( actual );
}
friend std::ostream& operator<<(
std::ostream& s, const matcher& m )
{
@ -95,6 +99,10 @@ namespace mock
{
return c_( boost::forward< Actual >( actual ) );
}
bool operator()( Actual& actual )
{
return c_( actual );
}
friend std::ostream& operator<<(
std::ostream& s, const matcher& m )
{

2
include/turtle/mock.hpp
View file

@ -87,7 +87,7 @@
BOOST_PP_COMMA_IF(n) d, n >::type >( p##n )
#define MOCK_FORWARD_PARAMS(n, S, tpn) \
BOOST_PP_REPEAT(n, MOCK_FORWARD_PARAM, \
boost::forward< MOCK_PARAM(S, tpn))
boost::move_if_not_lvalue_reference< MOCK_PARAM(S, tpn))
#define MOCK_METHOD_AUX(M, n, S, t, c, tpn) \
MOCK_DECL(M, n, S, c, tpn) \
{ \

3
test/test_constraints.cpp
View file

@ -8,6 +8,7 @@
#include <turtle/constraints.hpp>
#include <boost/test/auto_unit_test.hpp>
#include <boost/typeof/typeof.hpp>
BOOST_AUTO_TEST_CASE( all_comparison_constraints_can_be_instanciated )
{
@ -47,7 +48,7 @@ BOOST_AUTO_TEST_CASE( equal_constraint )
BOOST_CHECK( ! mock::equal( std::string( "string" ) ).c_( "not string" ) );
{
std::string s;
auto c = mock::equal( boost::cref( s ) );
BOOST_AUTO( c, mock::equal( boost::cref( s ) ) );
s = "string";
BOOST_CHECK( c.c_( "string" ) );
}