3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #132

Browse Source
This commit is contained in:
Phil Nash
2012-10-28 20:57:21 +00:00
parent 2f92db9898
commit 134e45b3ad
4 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/internal/catch_expression_lhs.hpp
View File

@@ -13,13 +13,7 @@
namespace Catch {
struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
template<typename T>
inline void setResultIfBoolean( ExpressionResultBuilder&, const T& ) {}
inline void setResultIfBoolean( ExpressionResultBuilder& result, bool value ) {
result.setResultType( value );
}
struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
// Wraps the LHS of an expression and captures the operator and RHS (if any) - wrapping them all
// in an ExpressionResultBuilder object
@@ -28,9 +22,7 @@ class ExpressionLhs {
void operator = ( const ExpressionLhs& );
public:
ExpressionLhs( T lhs ) : m_lhs( lhs ) {
setResultIfBoolean( m_result.setLhs( Catch::toString( lhs ) ), lhs );
}
ExpressionLhs( T lhs ) : m_lhs( lhs ) {}
template<typename RhsT>
ExpressionResultBuilder& operator == ( const RhsT& rhs ) {
@@ -71,7 +63,11 @@ public:
}
ExpressionResultBuilder& negate( bool shouldNegate ) {
return m_result.negate( shouldNegate );
bool value = m_lhs ? true : false;
return m_result
.setLhs( Catch::toString( value ) )
.setResultType( value )
.negate( shouldNegate );
}
// Only simple binary expressions are allowed on the LHS.
@@ -86,6 +82,7 @@ private:
ExpressionResultBuilder& captureExpression( const RhsT& rhs ) {
return m_result
.setResultType( Internal::compare<Op>( m_lhs, rhs ) )
.setLhs( Catch::toString( m_lhs ) )
.setRhs( Catch::toString( rhs ) )
.setOp( Internal::OperatorTraits<Op>::getName() );
}