Fixed a == 1 || b == 2 case

Test/TrickyTests.cpp

@@ -24,7 +24,7 @@ namespace Catch
     }
 }
 
-TEST_CASE( "succeeding/Tricky", "Some tricky to parse tests" )
+TEST_CASE( "succeeding/Tricky/std::pair", "Parsing a std::pair" )
 {
     std::pair<int, int> aNicePair( 1, 2 );
 
@@ -32,3 +32,12 @@ TEST_CASE( "succeeding/Tricky", "Some tricky to parse tests" )
     EXPECT( (std::pair<int, int>( 1, 2 )) == aNicePair );
     
 }
+
+TEST_CASE( "succeeding/Tricky/complex lhs", "Where the LHS is not a simple value" )
+{
+    int a = 1;
+    int b = 2;
+
+    // !TBD: This only captures part of the expression
+    EXPECT( a == 2 || b == 2 );
+}

internal/catch_capture.hpp

@@ -60,6 +60,14 @@ public:
         m_message = message;
     }
 
+    template<typename RhsT>
+    MutableResultInfo& operator ||( const RhsT& rhs )
+    {
+        // !TBD: set message to say we haven't captured all parts
+        return *this;
+    }
+    
+    
 private:
     friend class ResultBuilder;
     void setLhs( const std::string& lhs )
@@ -118,6 +126,7 @@ public:
     {
         return m_result.setRhs( ">=", toString( rhs ) );
     }    
+
     operator MutableResultInfo&()
     {
         return m_result;