Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhil Nash2011-03-09 09:33:33 +0000
committerPhil Nash2011-03-09 09:33:33 +0000
commite6ce1a39bb60df12db436da189a2fdb0dd6a81dc (patch)
tree3582f74a133fe93470f8d73276e192c3fbd7e228
parent0130dfac4139989c4860a7159573c03ed345d11a (diff)
downloadcatch3-e6ce1a39bb60df12db436da189a2fdb0dd6a81dc.tar.gz
Second attempt at signed/ unsigned
-rw-r--r--internal/catch_unsigned.hpp160
1 files changed, 100 insertions, 60 deletions
diff --git a/internal/catch_unsigned.hpp b/internal/catch_unsigned.hpp
index 38989bef..01e31a1a 100644
--- a/internal/catch_unsigned.hpp
+++ b/internal/catch_unsigned.hpp
@@ -17,89 +17,129 @@
namespace Catch
{
- template<typename T>
- struct SignTraits{};
-
- template<>
- struct SignTraits<int>
+ enum Operator
{
- typedef int SignedType;
- typedef unsigned int UnsignedType;
+ IsEqualTo,
+ IsNotEqualTo,
+ IsLessThan,
+ IsGreaterThan,
+ IsLessThanOrEqualTo,
+ IsGreaterThanOrEqualTo
};
- template<>
- struct SignTraits<unsigned int> : SignTraits<int>{};
- template<>
- struct SignTraits<long>
- {
- typedef long SignedType;
- typedef unsigned long UnsignedType;
- };
- template<>
- struct SignTraits<unsigned long> : SignTraits<long>{};
-
- template<>
- struct SignTraits<char>
- {
- typedef char SignedType;
- typedef unsigned char UnsignedType;
- };
- template<>
- struct SignTraits<unsigned char> : SignTraits<char>{};
+ template<typename T1, typename T2, Operator Op>
+ class Evaluator{};
- template<typename ActualT, typename TestT>
- struct IsType
+ template<typename T1, typename T2>
+ struct Evaluator<T1, T2, IsEqualTo>
{
- enum{ result = false };
+ static bool evaluate( const T1& lhs, const T2& rhs )
+ {
+ return lhs == rhs;
+ }
};
-
- template<typename T>
- struct IsType<T, T>
+ template<typename T1, typename T2>
+ struct Evaluator<T1, T2, IsNotEqualTo>
{
- enum{ result = true };
+ static bool evaluate( const T1& lhs, const T2& rhs )
+ {
+ return lhs != rhs;
+ }
};
-
- template<typename T1, typename T2, bool>
- struct MatchedSigns
+ template<typename T1, typename T2>
+ struct Evaluator<T1, T2, IsLessThan>
{
- static const T1& castLhs( const T1& lhs )
+ static bool evaluate( const T1& lhs, const T2& rhs )
{
- return lhs;
+ return lhs < rhs;
}
- static const T2& castRhs( const T2& rhs )
+ };
+ template<typename T1, typename T2>
+ struct Evaluator<T1, T2, IsGreaterThan>
+ {
+ static bool evaluate( const T1& lhs, const T2& rhs )
{
- return rhs;
+ return lhs > rhs;
}
};
-
template<typename T1, typename T2>
- struct MatchedSigns<T1, T2, false>
+ struct Evaluator<T1, T2, IsGreaterThanOrEqualTo>
{
- typedef typename SignTraits<T1>::SignedType Type1;
- typedef typename SignTraits<T2>::SignedType Type2;
-
- static Type1 castLhs( T1 lhs )
+ static bool evaluate( const T1& lhs, const T2& rhs )
{
- return static_cast<Type1>( lhs );
+ return lhs >= rhs;
}
- static Type2 castRhs( T2 rhs )
+ };
+ template<typename T1, typename T2>
+ struct Evaluator<T1, T2, IsLessThanOrEqualTo>
+ {
+ static bool evaluate( const T1& lhs, const T2& rhs )
{
- return static_cast<Type2>( rhs );
+ return lhs <= rhs;
}
};
- template<typename T1, typename T2>
- struct MatchSign
- : MatchedSigns< T1, T2,
- ( !IsType<T1, int>::result &&
- !IsType<T1, long>::result &&
- !IsType<T2, int>::result &&
- !IsType<T2, long>::result ) ||
- !std::numeric_limits<T1>::is_integer ||
- !std::numeric_limits<T2>::is_integer ||
- std::numeric_limits<T1>::is_signed == std::numeric_limits<T2>::is_signed >
+ template<Operator Op, typename T1, typename T2>
+ bool compare( const T1& lhs, const T2& rhs )
{
- };
+ return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
+ }
+
+ // unsigned X to int
+ template<Operator Op> bool compare( unsigned int lhs, int rhs )
+ {
+ return Evaluator<unsigned int, unsigned int, Op>::evaluate( lhs, static_cast<unsigned int>( rhs ) );
+ }
+ template<Operator Op> bool compare( unsigned long lhs, int rhs )
+ {
+ return Evaluator<unsigned long, unsigned int, Op>::evaluate( lhs, static_cast<unsigned int>( rhs ) );
+ }
+ template<Operator Op> bool compare( unsigned char lhs, int rhs )
+ {
+ return Evaluator<unsigned char, unsigned int, Op>::evaluate( lhs, static_cast<unsigned int>( rhs ) );
+ }
+
+ // unsigned X to long
+ template<Operator Op> bool compare( unsigned int lhs, long rhs )
+ {
+ return Evaluator<unsigned int, unsigned long, Op>::evaluate( lhs, static_cast<unsigned long>( rhs ) );
+ }
+ template<Operator Op> bool compare( unsigned long lhs, long rhs )
+ {
+ return Evaluator<unsigned long, unsigned long, Op>::evaluate( lhs, static_cast<unsigned long>( rhs ) );
+ }
+ template<Operator Op> bool compare( unsigned char lhs, long rhs )
+ {
+ return Evaluator<unsigned char, unsigned long, Op>::evaluate( lhs, static_cast<unsigned long>( rhs ) );
+ }
+
+ // int to unsigned X
+ template<Operator Op> bool compare( int lhs, unsigned int rhs )
+ {
+ return Evaluator<unsigned int, unsigned int, Op>::evaluate( static_cast<unsigned int>( lhs ), rhs );
+ }
+ template<Operator Op> bool compare( int lhs, unsigned long rhs )
+ {
+ return Evaluator<unsigned int, unsigned long, Op>::evaluate( static_cast<unsigned int>( lhs ), rhs );
+ }
+ template<Operator Op> bool compare( int lhs, unsigned char rhs )
+ {
+ return Evaluator<unsigned int, unsigned char, Op>::evaluate( static_cast<unsigned int>( lhs ), rhs );
+ }
+
+ // long to unsigned X
+ template<Operator Op> bool compare( long lhs, unsigned int rhs )
+ {
+ return Evaluator<unsigned long, unsigned int, Op>::evaluate( static_cast<unsigned long>( lhs ), rhs );
+ }
+ template<Operator Op> bool compare( long lhs, unsigned long rhs )
+ {
+ return Evaluator<unsigned long, unsigned long, Op>::evaluate( static_cast<unsigned long>( lhs ), rhs );
+ }
+ template<Operator Op> bool compare( long lhs, unsigned char rhs )
+ {
+ return Evaluator<unsigned long, unsigned char, Op>::evaluate( static_cast<unsigned long>( lhs ), rhs );
+ }
}
#endif // TWOBLUECUBES_CATCH_UNSIGNED_HPP_INCLUDED