diff options
| author | Phil Nash | 2012-10-24 22:09:01 +0100 |
|---|---|---|
| committer | Phil Nash | 2012-10-24 22:09:01 +0100 |
| commit | 8cca2f13699aa6aa5cd4a60e293f49a1bae54629 (patch) | |
| tree | bf6bb50e6e332104f6280889922823ae4af5e624 /include | |
| parent | e04e74f896c714de1f03a9cc006bcd071318ea11 (diff) | |
| download | catch3-8cca2f13699aa6aa5cd4a60e293f49a1bae54629.tar.gz | |
ExpressionBuilder ->ExpressionDecomposer
Expression -> ExpressionLhs
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_capture.hpp | 4 | ||||
| -rw-r--r-- | include/internal/catch_expression_builder.hpp | 31 | ||||
| -rw-r--r-- | include/internal/catch_expression_decomposer.hpp | 31 | ||||
| -rw-r--r-- | include/internal/catch_expression_lhs.hpp (renamed from include/internal/catch_expression.hpp) | 6 |
4 files changed, 36 insertions, 36 deletions
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index a1726f39..73ecc425 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -8,7 +8,7 @@ #ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED -#include "catch_expression_builder.hpp" +#include "catch_expression_decomposer.hpp" #include "catch_assertionresult_builder.h" #include "catch_interfaces_capture.h" #include "catch_debugger.hpp" @@ -97,7 +97,7 @@ inline bool isTrue( bool value ){ return value; } #define INTERNAL_CATCH_TEST( expr, shouldNegate, stopOnFailure, macroName ) \ do { try { \ INTERNAL_CATCH_ACCEPT_INFO( #expr, macroName, shouldNegate ); \ - INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder()->*expr ).negate( shouldNegate ), stopOnFailure, expr ); \ + INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionDecomposer()->*expr ).negate( shouldNegate ), stopOnFailure, expr ); \ } catch( Catch::TestFailureException& ) { \ throw; \ } catch( ... ) { \ diff --git a/include/internal/catch_expression_builder.hpp b/include/internal/catch_expression_builder.hpp deleted file mode 100644 index a3282b95..00000000 --- a/include/internal/catch_expression_builder.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Created by Phil on 11/5/2012. - * Copyright 2012 Two Blue Cubes Ltd. All rights reserved. - * - * Distributed under the Boost Software License, Version 1.0. (See accompanying - * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - */ -#ifndef TWOBLUECUBES_CATCH_EXPRESSION_BUILDER_HPP_INCLUDED -#define TWOBLUECUBES_CATCH_EXPRESSION_BUILDER_HPP_INCLUDED - -#include "catch_expression.hpp" -#include "catch_assertionresult_builder.h" - -namespace Catch { - -class ExpressionBuilder { -public: - - template<typename T> - Expression<const T&> operator->* ( const T & operand ) { - return Expression<const T&>( operand ); - } - - Expression<bool> operator->* ( bool value ) { - return Expression<bool>( value ); - } -}; - -} // end namespace Catch - -#endif // TWOBLUECUBES_CATCH_EXPRESSION_BUILDER_HPP_INCLUDED diff --git a/include/internal/catch_expression_decomposer.hpp b/include/internal/catch_expression_decomposer.hpp new file mode 100644 index 00000000..9dbd9833 --- /dev/null +++ b/include/internal/catch_expression_decomposer.hpp @@ -0,0 +1,31 @@ +/* + * Created by Phil on 11/5/2012. + * Copyright 2012 Two Blue Cubes Ltd. All rights reserved. + * + * Distributed under the Boost Software License, Version 1.0. (See accompanying + * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + */ +#ifndef TWOBLUECUBES_CATCH_EXPRESSION_DECOMPOSER_HPP_INCLUDED +#define TWOBLUECUBES_CATCH_EXPRESSION_DECOMPOSER_HPP_INCLUDED + +#include "catch_expression_lhs.hpp" +#include "catch_assertionresult_builder.h" + +namespace Catch { + +class ExpressionDecomposer { +public: + + template<typename T> + ExpressionLhs<const T&> operator->* ( const T & operand ) { + return ExpressionLhs<const T&>( operand ); + } + + ExpressionLhs<bool> operator->* ( bool value ) { + return ExpressionLhs<bool>( value ); + } +}; + +} // end namespace Catch + +#endif // TWOBLUECUBES_CATCH_EXPRESSION_DECOMPOSER_HPP_INCLUDED diff --git a/include/internal/catch_expression.hpp b/include/internal/catch_expression_lhs.hpp index 38b32d90..7d2cc733 100644 --- a/include/internal/catch_expression.hpp +++ b/include/internal/catch_expression_lhs.hpp @@ -19,11 +19,11 @@ namespace Catch { result.setResultType( value ); } template<typename T> -class Expression { - void operator = ( const Expression& ); +class ExpressionLhs { + void operator = ( const ExpressionLhs& ); public: - Expression( T lhs ) : m_lhs( lhs ) { + ExpressionLhs( T lhs ) : m_lhs( lhs ) { setResultIfBoolean( m_result.setLhs( Catch::toString( lhs ) ), lhs ); } |