eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-05-25 22:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring ResultData out of ResultInfo/ Builder pt1

Browse source
This commit is contained in:
Phil Nash 2012-10-05 18:35:01 +01:00
parent 47f679ef21
commit 86e1915099
9 changed files with 131 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/internal/catch_expression.hpp
View file

@ -25,44 +25,44 @@ public:
template<typename RhsT>
ResultInfoBuilder& operator == ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
return captureExpression<Internal::IsEqualTo>( m_result, m_lhs, rhs );
}
template<typename RhsT>
ResultInfoBuilder& operator != ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
return captureExpression<Internal::IsNotEqualTo>( m_result, m_lhs, rhs );
}
template<typename RhsT>
ResultInfoBuilder& operator < ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsLessThan>( m_lhs, rhs );
return captureExpression<Internal::IsLessThan>( m_result, m_lhs, rhs );
}
template<typename RhsT>
ResultInfoBuilder& operator > ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsGreaterThan>( m_lhs, rhs );
return captureExpression<Internal::IsGreaterThan>( m_result, m_lhs, rhs );
}
template<typename RhsT>
ResultInfoBuilder& operator <= ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsLessThanOrEqualTo>( m_lhs, rhs );
return captureExpression<Internal::IsLessThanOrEqualTo>( m_result, m_lhs, rhs );
}
template<typename RhsT>
ResultInfoBuilder& operator >= ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsGreaterThanOrEqualTo>( m_lhs, rhs );
return captureExpression<Internal::IsGreaterThanOrEqualTo>( m_result, m_lhs, rhs );
}
ResultInfoBuilder& operator == ( bool rhs ) {
return m_result.captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
return captureExpression<Internal::IsEqualTo>( m_result, m_lhs, rhs );
}
ResultInfoBuilder& operator != ( bool rhs ) {
return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
return captureExpression<Internal::IsNotEqualTo>( m_result, m_lhs, rhs );
}
operator ResultInfoBuilder& () {
return m_result.captureBoolExpression( m_lhs );
return captureBoolExpression( m_result, m_lhs );
}
template<typename RhsT>