3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reformatted expression

This commit is contained in:
Phil Nash 2012-05-11 08:16:12 +01:00
parent a6855f7eab
commit c9ba82b503
1 changed files with 19 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
include/internal/catch_expression.hpp
View File

@ -20,115 +20,58 @@ class Expression
void operator = ( const Expression& );
public:
///////////////////////////////////////////////////////////////////////////
Expression
(
ResultInfoBuilder& result,
T lhs
)
Expression( ResultInfoBuilder& result, T lhs )
: m_result( result ),
m_lhs( lhs )
{
}
{}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator ==
(
const RhsT& rhs
)
{
ResultInfoBuilder& operator == ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator !=
(
const RhsT& rhs
)
{
ResultInfoBuilder& operator != ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator <
(
const RhsT& rhs
)
{
ResultInfoBuilder& operator < ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsLessThan>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator >
(
const RhsT& rhs
)
{
ResultInfoBuilder& operator > ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsGreaterThan>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator <=
(
const RhsT& rhs
)
{
ResultInfoBuilder& operator <= ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsLessThanOrEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator >=
(
const RhsT& rhs
)
{
ResultInfoBuilder& operator >= ( const RhsT& rhs ) {
return m_result.captureExpression<Internal::IsGreaterThanOrEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
ResultInfoBuilder& operator ==
(
bool rhs
)
{
ResultInfoBuilder& operator == ( bool rhs ) {
return m_result.captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
ResultInfoBuilder& operator !=
(
bool rhs
)
{
ResultInfoBuilder& operator != ( bool rhs ) {
return m_result.captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
operator ResultInfoBuilder&
()
{
operator ResultInfoBuilder& () {
return m_result.captureBoolExpression( m_lhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator +
(
const 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&
);
STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( const RhsT& );
private:
ResultInfoBuilder& m_result;
@ -140,64 +83,35 @@ class PtrExpression
{
public:
///////////////////////////////////////////////////////////////////////////
PtrExpression
(
ResultInfoBuilder& result,
const LhsT* lhs
)
PtrExpression ( ResultInfoBuilder& result, const LhsT* lhs )
: m_result( &result ),
m_lhs( lhs )
{}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator ==
(
const RhsT* rhs
)
{
ResultInfoBuilder& operator == ( const RhsT* rhs ) {
return m_result->captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
// This catches NULL
ResultInfoBuilder& operator ==
(
LhsT* rhs
)
{
ResultInfoBuilder& operator == ( LhsT* rhs ) {
return m_result->captureExpression<Internal::IsEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
template<typename RhsT>
ResultInfoBuilder& operator !=
(
const RhsT* rhs
)
{
ResultInfoBuilder& operator != ( const RhsT* rhs ) {
return m_result->captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
// This catches NULL
ResultInfoBuilder& operator !=
(
LhsT* rhs
)
{
ResultInfoBuilder& operator != ( LhsT* rhs ) {
return m_result->captureExpression<Internal::IsNotEqualTo>( m_lhs, rhs );
}
///////////////////////////////////////////////////////////////////////////
operator ResultInfoBuilder&
()
{
operator ResultInfoBuilder& () {
return m_result->captureBoolExpression( m_lhs );
}
private:
ResultInfoBuilder* m_result;
const LhsT* m_lhs;