Move expression classes into own file

This commit is contained in:
Phil Nash 2012-05-11 08:03:05 +01:00
parent d10d2d3485
commit a6855f7eab
3 changed files with 212 additions and 191 deletions

View file

@ -8,6 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
#include "catch_expression.hpp"
#include "catch_resultinfo_builder.hpp"
#include "catch_tostring.hpp"
#include "catch_resultinfo.hpp"
@ -24,197 +25,7 @@ namespace Catch
struct TestFailureException{};
struct DummyExceptionType_DontUse{};
template<typename T>
class Expression
{
void operator = ( const Expression& );
public:
///////////////////////////////////////////////////////////////////////////
Expression
(
ResultInfoBuilder& result,
T lhs
)
: m_result( result ),
m_lhs( lhs )
{
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator ==
(
const RhsT& rhs
)
{
return m_result.captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator !=
(
const RhsT& rhs
)
{
return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator <
(
const RhsT& rhs
)
{
return m_result.captureExpression<Internal::IsLessThan>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator >
(
const RhsT& rhs
)
{
return m_result.captureExpression<Internal::IsGreaterThan>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator <=
(
const RhsT& rhs
)
{
return m_result.captureExpression<Internal::IsLessThanOrEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator >=
(
const RhsT& rhs
)
{
return m_result.captureExpression<Internal::IsGreaterThanOrEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
ResultInfoBuilder& operator ==
(
bool rhs
)
{
return m_result.captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
ResultInfoBuilder& operator !=
(
bool rhs
)
{
return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
operator ResultInfoBuilder&
()
{
return m_result.captureBoolExpression( m_lhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator +
(
const RhsT&
);
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator -
(
const RhsT&
);
private:
ResultInfoBuilder& m_result;
T m_lhs;
};
template<typename LhsT>
class PtrExpression
{
public:
///////////////////////////////////////////////////////////////////////////
PtrExpression
(
ResultInfoBuilder& result,
const LhsT* lhs
)
: m_result( &result ),
m_lhs( lhs )
{}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator ==
(
const RhsT* rhs
)
{
return m_result->captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
// This catches NULL
ResultInfoBuilder& operator ==
(
LhsT* rhs
)
{
return m_result->captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator !=
(
const RhsT* rhs
)
{
return m_result->captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
// This catches NULL
ResultInfoBuilder& operator !=
(
LhsT* rhs
)
{
return m_result->captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
operator ResultInfoBuilder&
()
{
return m_result->captureBoolExpression( m_lhs );
}
private:
ResultInfoBuilder* m_result;
const LhsT* m_lhs;
};
class ResultBuilder
{
public: