Moved ResultBuilder out into its own file

include/internal/catch_expression_builder.hpp

@@ -0,0 +1,170 @@
+/*
+ *  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_resultinfo_builder.hpp"
+#include "catch_tostring.hpp"
+#include "catch_resultinfo.hpp"
+#include "catch_result_type.h"
+#include "catch_context.h"
+#include "catch_common.h"
+#include <sstream>
+
+namespace Catch
+{
+    
+class ResultBuilder
+{
+public:
+
+    ///////////////////////////////////////////////////////////////////////////
+    ResultBuilder
+    (
+        const SourceLineInfo& lineInfo,
+        const char* macroName,
+        const char* expr = "",
+        bool isNot = false
+    )
+    : m_result( expr, isNot, lineInfo, macroName ),
+      m_messageStream()
+    {}
+    
+    ///////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    Expression<const T&> operator->*
+    (
+        const T & operand
+    )
+    {
+        Expression<const T&> expr( m_result, operand );
+        
+        return expr;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    Expression<const char*> operator->*
+    (
+        const char* const& operand
+     )
+    {
+        Expression<const char*> expr( m_result, operand );
+        
+        return expr;
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    PtrExpression<T> operator->*
+    (
+        const T* operand
+    )
+    {
+        PtrExpression<T> expr( m_result, operand );
+        
+        return expr;
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    PtrExpression<T> operator->*
+    (
+        T* operand
+    )
+    {
+        PtrExpression<T> expr( m_result, operand );
+        
+        return expr;
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    Expression<bool> operator->*
+    (
+        bool value
+    )
+    {
+        Expression<bool> expr( m_result, value );
+        return expr;
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    template<typename T>
+    ResultBuilder& operator <<
+    (
+        const T & value
+    )
+    {
+        m_messageStream << Catch::toString( value );        
+        return *this;
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    template<typename MatcherT, typename ArgT>
+    ResultBuilder& acceptMatcher
+    (
+        const MatcherT& matcher,
+        const ArgT& arg,
+        const std::string& matcherCallAsString
+    )
+    {
+        std::string matcherAsString = Catch::toString( matcher );
+        if( matcherAsString == "{?}" )
+            matcherAsString = matcherCallAsString;
+        m_result.setLhs( Catch::toString( arg ) );
+        m_result.setRhs( matcherAsString );
+        m_result.setOp( "matches" );
+        m_result.setResultType( matcher( arg ) ? ResultWas::Ok : ResultWas::ExpressionFailed );
+        return *this;
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    template<typename MatcherT, typename ArgT>
+    ResultBuilder& acceptMatcher
+    (
+        const MatcherT& matcher,
+        ArgT* arg,
+        const std::string& matcherCallAsString
+    )
+    {
+        std::string matcherAsString = Catch::toString( matcher );
+        if( matcherAsString == "{?}" )
+            matcherAsString = matcherCallAsString;
+        m_result.setLhs( Catch::toString( arg ) );
+        m_result.setRhs( matcherAsString );
+        m_result.setOp( "matches" );
+        m_result.setResultType( matcher( arg ) ? ResultWas::Ok : ResultWas::ExpressionFailed );
+        return *this;
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    ResultBuilder& setResultType
+    (
+        ResultWas::OfType resultType
+    )
+    {
+        m_result.setResultType( resultType );
+        return *this;
+    }
+    
+    ///////////////////////////////////////////////////////////////////////////
+    operator ResultInfoBuilder&
+    ()
+    {
+        m_result.setMessage( m_messageStream.str() );
+        return m_result;
+    }
+    
+private:
+    ResultInfoBuilder m_result;
+    std::ostringstream m_messageStream;
+};
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_EXPRESSION_BUILDER_HPP_INCLUDED