Merge remote-tracking branch 'phil' into include-guard-fixes

Conflicts:
	single_include/catch.hpp

include/catch_runner.hpp

@@ -26,7 +26,7 @@ namespace Catch {
         :   m_configWrapper( configWrapper ),
             m_config( configWrapper.data() )
         {
-            resolveStream();
+            openStream();
             makeReporter();
         }
 
@@ -78,13 +78,10 @@ namespace Catch {
         }
 
     private:
-        void resolveStream() {
+        void openStream() {
-            if( !m_config.stream.empty() ) {
+            if( !m_config.stream.empty() )
-                if( m_config.stream[0] == '%' )
+                m_configWrapper.useStream( m_config.stream );
-                    m_configWrapper.useStream( m_config.stream.substr( 1 ) );
+
-                else
-                    m_configWrapper.setFilename( m_config.stream );
-            }
             // Open output file, if specified
             if( !m_config.outputFilename.empty() ) {
                 m_ofs.open( m_config.outputFilename.c_str() );
@@ -130,6 +127,7 @@ namespace Catch {
             // Handle list request
             if( config.listSpec != List::None ) {
                 List( config );
+                Catch::cleanUp();
                 return 0;
             }
 

include/internal/catch_capture.hpp

@@ -35,8 +35,8 @@ public:
         return *this; 
     }
     
-    std::string getInfo () const {
+    ResultInfo getInfo () const {
-        return m_oss.str();
+        return ResultInfo( "", ResultWas::Info, false, SourceLineInfo(), "SCOPED_INFO", m_oss.str().c_str() );
     }
     
 private:

include/internal/catch_commandline.hpp

@@ -188,10 +188,10 @@ namespace Catch {
                 m_optionNames.push_back( "--help" );
             }
             virtual std::string argsSynopsis() const {
-                return "[<option for help on>]";
+                return "[<option for help on> ...]";
             }
             virtual std::string optionSummary() const {
-                return "Shows this usage summary, or help on a specific option, if supplied";
+                return "Shows this usage summary, or help on a specific option, or options, if supplied";
             }
             virtual std::string optionDescription() const {
                 return "";
@@ -235,7 +235,7 @@ namespace Catch {
                     "\n"
                     "If spec is prefixed with exclude: or the ~ character then the pattern matches an exclusion. "
                     "This means that tests matching the pattern are excluded from the set - even if a prior "
-                    "inclusion spec included them. Subsequent inclusion specs will take precendence, however. "
+                    "inclusion spec included them. Subsequent inclusion specs will take precedence, however. "
                     "Inclusions and exclusions are evaluated in left-to-right order.\n"
                     "\n"
                     "Examples:\n"
@@ -249,7 +249,7 @@ namespace Catch {
                     "    -t a/* ~a/b/* a/b/c    \tMatches all tests that start with 'a/', except those "
                                                  "that start with 'a/b/', except 'a/b/c', which is included";
             }
-
+                            
             virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
                 std::string groupName;
                 for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
@@ -264,6 +264,42 @@ namespace Catch {
             }
         };
 
+        class TagOptionParser : public OptionParser {
+        public:
+            TagOptionParser() : OptionParser( 1, -1 ) {
+                m_optionNames.push_back( "-g" );
+                m_optionNames.push_back( "--tag" );
+            }
+            virtual std::string argsSynopsis() const {
+                return "<tagspec> [,<tagspec>...]";
+            }
+            virtual std::string optionSummary() const {
+                return "Matches test cases against tags or tag patterns";
+            }
+
+            // Lines are split at the nearest prior space char to the 80 char column.
+            // Tab chars are removed from the output but their positions are used to align
+            // subsequently wrapped lines
+            virtual std::string optionDescription() const {
+                return
+                "!TBD";
+            }
+            
+            virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+                std::string groupName;
+                for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
+                    if( i != 0 )
+                        groupName += " ";
+                    groupName += cmd[i];
+                }
+                TestCaseFilters filters( groupName );
+                for( std::size_t i = 0; i < cmd.argsCount(); ++i )
+                    filters.addTags( cmd[i] );
+                config.filters.push_back( filters );
+            }
+        };
+
+        
         class ListOptionParser : public OptionParser {
         public:
             ListOptionParser() : OptionParser( 0, 2 ) {
@@ -369,9 +405,9 @@ namespace Catch {
             virtual std::string optionDescription() const {
                 return
                     "Use this option to send all output to a file or a stream. By default output is "
-                    "sent to stdout (note that uses ofstdout and stderr from within test cases are "
+                    "sent to stdout (note that uses of stdout and stderr from within test cases are "
                     "redirected and included in the report - so even stderr will effectively end up "
-                    "on stdout). If the name begins with % it is interpretted as a stream. "
+                    "on stdout). If the name begins with % it is interpreted as a stream. "
                     "Otherwise it is treated as a filename.\n"
                     "\n"
                     "Examples are:\n"
@@ -407,7 +443,7 @@ namespace Catch {
                 return
                     "Usually you only want to see reporting for failed tests. Sometimes it's useful "
                     "to see all the output (especially when you don't trust that that test you just "
-                    "added worked first time!). To see successul, as well as failing, test results "
+                    "added worked first time!). To see successful, as well as failing, test results "
                     "just pass this option.";
             }
             virtual void parseIntoConfig( const Command&, ConfigData& config ) {
@@ -586,6 +622,7 @@ namespace Catch {
         AllOptions() {
             add<Options::TestCaseOptionParser>();   // Keep this one first
 
+            add<Options::TagOptionParser>();
             add<Options::ListOptionParser>();
             add<Options::ReporterOptionParser>();
             add<Options::OutputOptionParser>();

include/internal/catch_config.hpp

@@ -11,6 +11,7 @@
 #include "catch_test_spec.h"
 #include "catch_context.h"
 #include "catch_interfaces_config.h"
+#include "catch_stream.hpp"
 
 #include <memory>
 #include <vector>
@@ -79,19 +80,17 @@ namespace Catch {
     public:
 
         Config()
-        :   m_streambuf( NULL ),
+        :   m_os( std::cout.rdbuf() )
-            m_os( std::cout.rdbuf() )
         {}
         
         Config( const ConfigData& data )
         :   m_data( data ),
-            m_streambuf( NULL ),
             m_os( std::cout.rdbuf() )
         {}
         
         virtual ~Config() {
             m_os.rdbuf( std::cout.rdbuf() );
-            delete m_streambuf;
+            m_stream.release();
         }
         
         void setFilename( const std::string& filename ) {
@@ -131,10 +130,10 @@ namespace Catch {
         }        
 
         void useStream( const std::string& streamName ) {
-            std::streambuf* newBuf = createStreamBuf( streamName );
+            Stream stream = createStream( streamName );
-            setStreamBuf( newBuf );
+            setStreamBuf( stream.streamBuf );
-            delete m_streambuf;
+            m_stream.release();
-            m_streambuf = newBuf;
+            m_stream = stream;
         }
 
         void addTestSpec( const std::string& testSpec ) {
@@ -166,7 +165,7 @@ namespace Catch {
         ConfigData m_data;
         
         // !TBD Move these out of here
-        std::streambuf* m_streambuf;
+        Stream m_stream;
         mutable std::ostream m_os;
     };
         

include/internal/catch_context.h

@@ -17,6 +17,7 @@
 namespace Catch {
 
     class TestCaseInfo;
+    class Stream;
     struct IResultCapture;
     struct IRunner;
     struct IGeneratorsForTest;
@@ -49,7 +50,7 @@ namespace Catch {
     IContext& getCurrentContext();
     IMutableContext& getCurrentMutableContext();
     void cleanUpContext();
-    std::streambuf* createStreamBuf( const std::string& streamName );
+    Stream createStream( const std::string& streamName );
 
 }
 

include/internal/catch_context_impl.hpp

@@ -95,10 +95,10 @@ namespace Catch {
         return getCurrentMutableContext();
     }
 
-    std::streambuf* createStreamBuf( const std::string& streamName ) {
+    Stream createStream( const std::string& streamName ) {
-        if( streamName == "stdout" ) return std::cout.rdbuf();
+        if( streamName == "stdout" ) return Stream( std::cout.rdbuf(), false );
-        if( streamName == "stderr" ) return std::cerr.rdbuf();
+        if( streamName == "stderr" ) return Stream( std::cerr.rdbuf(), false );
-        if( streamName == "debug" ) return new StreamBufImpl<OutputDebugWriter>;
+        if( streamName == "debug" ) return Stream( new StreamBufImpl<OutputDebugWriter>, true );
 
         throw std::domain_error( "Unknown stream: " + streamName );
     }

include/internal/catch_impl.hpp

@@ -25,6 +25,7 @@
 #include "catch_resultinfo.hpp"
 #include "catch_resultinfo_builder.hpp"
 #include "catch_test_case_info.hpp"
+#include "catch_tags.hpp"
 
 #include "../reporters/catch_reporter_basic.hpp"
 #include "../reporters/catch_reporter_xml.hpp"
@@ -55,6 +56,9 @@ namespace Catch {
     FreeFunctionTestCase::~FreeFunctionTestCase() {}
     IGeneratorInfo::~IGeneratorInfo() {}
     IGeneratorsForTest::~IGeneratorsForTest() {}
+    TagParser::~TagParser() {}
+    TagExtracter::~TagExtracter() {}
+    TagExpressionParser::~TagExpressionParser() {}
 
     void Config::dummy() {}
 

include/internal/catch_interfaces_reporter.h

@@ -31,10 +31,21 @@ namespace Catch
             fullConfig( _fullConfig )
         {}
         
+        ReporterConfig( const ReporterConfig& other )
+        :   name( other.name ),
+            stream( other.stream ),
+            includeSuccessfulResults( other.includeSuccessfulResults ),
+            fullConfig( other.fullConfig )
+        {}
+        
+
         std::string name;
         std::ostream& stream;
         bool includeSuccessfulResults;
         ConfigData fullConfig;
+
+    private:
+        void operator=(const ReporterConfig&);
     };
     
     class TestCaseInfo;

include/internal/catch_runner_impl.hpp

@@ -156,10 +156,18 @@ namespace Catch {
             else if( !result.ok() ) {
                 m_totals.assertions.failed++;
 
-                std::vector<ResultInfo>::const_iterator it = m_info.begin();
+                {
-                std::vector<ResultInfo>::const_iterator itEnd = m_info.end();
+                    std::vector<ScopedInfo*>::const_iterator it = m_scopedInfos.begin();
-                for(; it != itEnd; ++it )
+                    std::vector<ScopedInfo*>::const_iterator itEnd = m_scopedInfos.end();
-                    m_reporter->Result( *it );
+                    for(; it != itEnd; ++it )
+                        m_reporter->Result( (*it)->getInfo() );
+                }
+                {
+                    std::vector<ResultInfo>::const_iterator it = m_info.begin();
+                    std::vector<ResultInfo>::const_iterator itEnd = m_info.end();
+                    for(; it != itEnd; ++it )
+                        m_reporter->Result( *it );
+                }
                 m_info.clear();
             }
             

include/internal/catch_stream.hpp

@@ -58,6 +58,30 @@ namespace Catch {
             writeToDebugConsole( str );
         }
     };
+
+    class Stream {
+    public:
+        Stream()
+        : streamBuf( NULL ), isOwned( false )
+        {}
+        
+        Stream( std::streambuf* _streamBuf, bool _isOwned )
+        : streamBuf( _streamBuf ), isOwned( _isOwned )
+        {}
+
+        void release() {
+            if( isOwned ) {
+                delete streamBuf;
+                streamBuf = NULL;
+                isOwned = false;
+            }
+        }
+
+        std::streambuf* streamBuf;
+
+    private:
+        bool isOwned;
+    };
 }
 
 #endif // TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED

include/internal/catch_tags.hpp

@@ -0,0 +1,195 @@
+/*
+ *  Created by Phil on 14/08/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_TAGS_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_TAGS_HPP_INCLUDED
+
+#include <string>
+#include <set>
+#include <map>
+#include <vector>
+
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+    class TagParser {
+    public:
+        virtual ~TagParser();
+
+        void parse( const std::string& str ) {
+            std::size_t pos = 0;
+            while( pos < str.size() ) {
+                char c = str[pos];
+                if( c == '[' ) {
+                    std::size_t end = str.find_first_of( ']', pos );
+                    if( end != std::string::npos ) {
+                        acceptTag( str.substr( pos+1, end-pos-1 ) );
+                        pos = end+1;
+                    }
+                    else {
+                        acceptChar( c );
+                        pos++;
+                    }
+                }
+                else {
+                    acceptChar( c );
+                    pos++;
+                }
+            }
+            endParse();
+        }
+
+    protected:
+        virtual void acceptTag( const std::string& tag ) = 0;
+        virtual void acceptChar( char c ) = 0;
+        virtual void endParse() {}
+
+    private:
+    };
+
+    class TagExtracter : public TagParser {
+    public:
+
+        TagExtracter( std::set<std::string>& tags )
+        :   m_tags( tags )
+        {}
+        virtual ~TagExtracter();
+
+        void parse( std::string& description ) {
+            TagParser::parse( description );
+            description = m_remainder;
+        }
+
+    private:
+        virtual void acceptTag( const std::string& tag ) {
+            m_tags.insert( tag );
+        }
+        virtual void acceptChar( char c ) {
+            m_remainder += c;
+        }
+
+        std::set<std::string>& m_tags;
+        std::string m_remainder;
+    };
+
+    class Tag {
+    public:
+        Tag()
+        : m_isNegated( false )
+        {}
+
+        Tag( const std::string& name, bool isNegated )
+        :   m_name( name ),
+        m_isNegated( isNegated )
+        {}
+
+        std::string getName() const {
+            return m_name;
+        }
+        bool isNegated() const {
+            return m_isNegated;
+        }
+
+        bool operator ! () const {
+            return m_name.empty();
+        }
+
+    private:
+        std::string m_name;
+        bool m_isNegated;
+    };
+
+    class TagSet {
+        typedef std::map<std::string, Tag> TagMap;
+    public:
+        void add( const Tag& tag ) {
+            m_tags.insert( std::make_pair( tag.getName(), tag ) );
+        }
+
+        // needed?
+        Tag find( const std::string& name ) const {
+            TagMap::const_iterator it = m_tags.find( name );
+            if( it == m_tags.end() )
+                return Tag();
+            else
+                return it->second;
+        }
+        bool empty() const {
+            return m_tags.empty();
+        }
+
+        bool matches( const std::set<std::string>& tags ) const {
+            TagMap::const_iterator it = m_tags.begin();
+            TagMap::const_iterator itEnd = m_tags.end();
+            for(; it != itEnd; ++it ) {
+                bool found = tags.find( it->first ) != tags.end();
+                if( found == it->second.isNegated() )
+                    return false;
+            }
+            return true;
+        }
+        
+    private:
+        TagMap m_tags;
+    };
+
+    class TagExpression {
+    public:
+        bool matches( const std::set<std::string>& tags ) const {
+            std::vector<TagSet>::const_iterator it = m_tagSets.begin();
+            std::vector<TagSet>::const_iterator itEnd = m_tagSets.end();
+            for(; it != itEnd; ++it )
+                if( it->matches( tags ) )
+                    return true;
+            return false;
+        }
+
+    private:
+        friend class TagExpressionParser;
+
+        std::vector<TagSet> m_tagSets;
+    };
+    
+    class TagExpressionParser : public TagParser {
+    public:
+        TagExpressionParser( TagExpression& exp )
+        :   m_isNegated( false ),
+            m_exp( exp )
+        {}
+
+        ~TagExpressionParser();
+
+    private:
+        virtual void acceptTag( const std::string& tag ) {
+            m_currentTagSet.add( Tag( tag, m_isNegated ) );
+            m_isNegated = false;
+        }
+        virtual void acceptChar( char c ) {
+            switch( c ) {
+                case '~':
+                    m_isNegated = true;
+                    break;
+                case ',':
+                    m_exp.m_tagSets.push_back( m_currentTagSet );
+                    break;
+            }
+        }
+        virtual void endParse() {
+            if( !m_currentTagSet.empty() )
+                m_exp.m_tagSets.push_back( m_currentTagSet );
+        }
+
+        bool m_isNegated;
+        TagSet m_currentTagSet;
+        TagExpression& m_exp;
+    };
+    
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_TAGS_HPP_INCLUDED

include/internal/catch_test_case_info.h

@@ -36,7 +36,8 @@ namespace Catch {
         const SourceLineInfo& getLineInfo() const;
         bool isHidden() const;
         bool hasTag( const std::string& tag ) const;
-        const std::set<std::string>& tags() const;
+        bool matchesTags( const std::string& tagPattern ) const;
+        const std::set<std::string>& getTags() const;
         
         void swap( TestCaseInfo& other );
         bool operator == ( const TestCaseInfo& other ) const;

include/internal/catch_test_case_info.hpp

@@ -8,41 +8,13 @@
 #ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED
 
+#include "catch_tags.hpp"
 #include "catch_test_case_info.h"
 #include "catch_interfaces_testcase.h"
 
 namespace Catch {
 
-    namespace {
+    
-        void extractTags( std::string& str, std::set<std::string>& tags ) {
-            std::string remainder;
-            std::size_t last = 0;
-            std::size_t begin = str.find_first_of( '[' );
-            while( begin != std::string::npos ) {
-                std::size_t end = str.find_first_of( ']', begin );
-                if( end != std::string::npos ) {
-                    std::string tag = str.substr( begin+1, end-begin-1 );
-                    tags.insert( tag );
-                    if( begin - last > 0 )
-                        remainder += str.substr( last, begin-last );
-                    last = end+1;
-                }
-                else if( begin != str.size()-1 ) {
-                    end = begin+1;
-                }
-                else {
-                    break;
-                }
-                begin = str.find_first_of( '[', end );
-            }
-            if( !tags.empty() ) {
-                if( last < str.size() )
-                    str = remainder + str.substr( last );
-                else
-                    str = remainder;
-            }
-        }
-    }
     TestCaseInfo::TestCaseInfo( ITestCase* testCase,
                                 const char* name,
                                 const char* description,
@@ -53,7 +25,7 @@ namespace Catch {
         m_lineInfo( lineInfo ),
         m_isHidden( startsWith( name, "./" ) )
     {
-        extractTags( m_description, m_tags );
+        TagExtracter( m_tags ).parse( m_description );
         if( hasTag( "hide" ) )
             m_isHidden = true;
     }
@@ -106,7 +78,12 @@ namespace Catch {
     bool TestCaseInfo::hasTag( const std::string& tag ) const {
         return m_tags.find( tag ) != m_tags.end();
     }
-    const std::set<std::string>& TestCaseInfo::tags() const {
+    bool TestCaseInfo::matchesTags( const std::string& tagPattern ) const {
+        TagExpression exp;
+        TagExpressionParser( exp ).parse( tagPattern );
+        return exp.matches( m_tags );
+    }
+    const std::set<std::string>& TestCaseInfo::getTags() const {
         return m_tags;
     }
 
@@ -129,6 +106,7 @@ namespace Catch {
         swap( temp );
         return *this;
     }
-}
+
+} // end namespace Catch
 
 #endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED

include/internal/catch_test_spec.h

@@ -9,6 +9,7 @@
 #define TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED
 
 #include "catch_test_case_info.h"
+#include "catch_tags.hpp"
 
 #include <string>
 #include <vector>
@@ -113,7 +114,24 @@ namespace Catch {
                 m_inclusionFilters.push_back( filter );
         }
 
+        void addTags( const std::string& tagPattern ) {
+            TagExpression exp;
+            TagExpressionParser( exp ).parse( tagPattern );
+
+            m_tagExpressions.push_back( exp );
+        }
+
         bool shouldInclude( const TestCaseInfo& testCase ) const {
+            if( !m_tagExpressions.empty() ) {
+                std::vector<TagExpression>::const_iterator it = m_tagExpressions.begin();
+                std::vector<TagExpression>::const_iterator itEnd = m_tagExpressions.end();
+                for(; it != itEnd; ++it )
+                    if( it->matches( testCase.getTags() ) )
+                        break;
+                if( it == itEnd )
+                    return false;
+            }
+
             if( !m_inclusionFilters.empty() ) {
                 std::vector<TestCaseFilter>::const_iterator it = m_inclusionFilters.begin();
                 std::vector<TestCaseFilter>::const_iterator itEnd = m_inclusionFilters.end();
@@ -123,7 +141,7 @@ namespace Catch {
                 if( it == itEnd )
                     return false;
             }
-            else if( m_exclusionFilters.empty() ) {
+            else if( m_exclusionFilters.empty() && m_tagExpressions.empty() ) {
                 return !testCase.isHidden();
             }
             
@@ -135,6 +153,7 @@ namespace Catch {
             return true;
         }
     private:
+        std::vector<TagExpression> m_tagExpressions;
         std::vector<TestCaseFilter> m_inclusionFilters;
         std::vector<TestCaseFilter> m_exclusionFilters;
         std::string m_name;

projects/SelfTest/MiscTests.cpp

@@ -294,7 +294,13 @@ TEST_CASE( "empty", "An empty test with no assertions" )
 {
 }
 
-TEST_CASE( "Nice descriptive name", "[tag1][tag2][hide]" )
+TEST_CASE( "Nice descriptive name", "[tag1][tag2][tag3][hide]" )
 {
     WARN( "This one ran" );
 }
+TEST_CASE( "first tag", "[tag1]" )
+{
+}
+TEST_CASE( "second tag", "[tag2]" )
+{
+}

projects/SelfTest/SurrogateCpps/catch_tags.cpp

@@ -0,0 +1 @@
+#include "catch_tags.hpp"

projects/SelfTest/TestMain.cpp

@@ -247,8 +247,31 @@ TEST_CASE( "selftest/parser/2", "ConfigData" ) {
 
             REQUIRE( config.allowThrows == false );
         }
-    
     }
+
+    SECTION( "streams", "" ) {
+        SECTION( "-o filename", "" ) {
+            const char* argv[] = { "test", "-o", "filename.ext" };
+            CHECK_NOTHROW( parseIntoConfig( argv, config ) );
+
+            REQUIRE( config.outputFilename == "filename.ext" );
+            REQUIRE( config.stream.empty() );
+        }
+        SECTION( "-o %stdout", "" ) {
+            const char* argv[] = { "test", "-o", "%stdout" };
+            CHECK_NOTHROW( parseIntoConfig( argv, config ) );
+
+            REQUIRE( config.stream == "stdout" );
+            REQUIRE( config.outputFilename.empty() );
+        }
+        SECTION( "--out", "" ) {
+            const char* argv[] = { "test", "--out", "filename.ext" };
+            CHECK_NOTHROW( parseIntoConfig( argv, config ) );
+
+            REQUIRE( config.outputFilename == "filename.ext" );
+        }
+    }
+
     SECTION( "combinations", "" ) {
         SECTION( "-a -b", "" ) {
             const char* argv[] = { "test", "-a", "-b", "-nt" };
@@ -333,13 +356,25 @@ TEST_CASE( "selftest/option parsers", "" )
 }
 
 TEST_CASE( "selftest/tags", "" ) {
+
+    std::string p1 = "[one]";
+    std::string p2 = "[one],[two]";
+    std::string p3 = "[one][two]";
+    std::string p4 = "[one][two],[three]";
+    std::string p5 = "[one][two]~[hide],[three]";
     
     SECTION( "one tag", "" ) {
         Catch::TestCaseInfo oneTag( NULL, "test", "[one]", CATCH_INTERNAL_LINEINFO );
 
         CHECK( oneTag.getDescription() == "" );
         CHECK( oneTag.hasTag( "one" ) );
-        CHECK( oneTag.tags().size() == 1 );
+        CHECK( oneTag.getTags().size() == 1 );
+
+        CHECK( oneTag.matchesTags( p1 ) == true );
+        CHECK( oneTag.matchesTags( p2 ) == true );
+        CHECK( oneTag.matchesTags( p3 ) == false );
+        CHECK( oneTag.matchesTags( p4 ) == false );
+        CHECK( oneTag.matchesTags( p5 ) == false );
     }
 
     SECTION( "two tags", "" ) {
@@ -349,7 +384,13 @@ TEST_CASE( "selftest/tags", "" ) {
         CHECK( twoTags.hasTag( "one" ) );
         CHECK( twoTags.hasTag( "two" ) );
         CHECK( twoTags.hasTag( "three" ) == false );
-        CHECK( twoTags.tags().size() == 2 );
+        CHECK( twoTags.getTags().size() == 2 );
+
+        CHECK( twoTags.matchesTags( p1 ) == true );
+        CHECK( twoTags.matchesTags( p2 ) == true );
+        CHECK( twoTags.matchesTags( p3 ) == true );
+        CHECK( twoTags.matchesTags( p4 ) == true );
+        CHECK( twoTags.matchesTags( p5 ) == true );
     }
 
     SECTION( "one tag with characters either side", "" ) {
@@ -358,7 +399,7 @@ TEST_CASE( "selftest/tags", "" ) {
         CHECK( oneTagWithExtras.getDescription() == "1234" );
         CHECK( oneTagWithExtras.hasTag( "one" ) );
         CHECK( oneTagWithExtras.hasTag( "two" ) == false );
-        CHECK( oneTagWithExtras.tags().size() == 1 );
+        CHECK( oneTagWithExtras.getTags().size() == 1 );
     }
     
     SECTION( "start of a tag, but not closed", "" ) {
@@ -367,7 +408,7 @@ TEST_CASE( "selftest/tags", "" ) {
 
         CHECK( oneTagOpen.getDescription() == "[one" );
         CHECK( oneTagOpen.hasTag( "one" ) == false );
-        CHECK( oneTagOpen.tags().size() == 0 );
+        CHECK( oneTagOpen.getTags().size() == 0 );
     }
 
     SECTION( "hidden", "" ) {
@@ -376,6 +417,9 @@ TEST_CASE( "selftest/tags", "" ) {
         CHECK( oneTag.getDescription() == "" );
         CHECK( oneTag.hasTag( "hide" ) );
         CHECK( oneTag.isHidden() );
+
+        CHECK( oneTag.matchesTags( "~[hide]" ) == false );
+
     }
     
 }

projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		4A6D0C3D149B3D9E00DB3EAA /* MiscTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6D0C34149B3D9E00DB3EAA /* MiscTests.cpp */; };
 		4A6D0C3E149B3D9E00DB3EAA /* TestMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6D0C35149B3D9E00DB3EAA /* TestMain.cpp */; };
 		4A6D0C3F149B3D9E00DB3EAA /* TrickyTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6D0C36149B3D9E00DB3EAA /* TrickyTests.cpp */; };
+		4A8E4DD2160A352200194CBD /* catch_tags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A8E4DD0160A352200194CBD /* catch_tags.cpp */; };
 		4AA7FF4315F3E89E009AD7F9 /* BDDTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AA7FF4115F3E89D009AD7F9 /* BDDTests.cpp */; };
 		4AE1840B14EE4F230066340D /* catch_self_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AE1840A14EE4F230066340D /* catch_self_test.cpp */; };
 /* End PBXBuildFile section */
@@ -93,6 +94,8 @@
 		4A6D0C67149B3E3D00DB3EAA /* catch_reporter_junit.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_reporter_junit.hpp; sourceTree = "<group>"; };
 		4A6D0C68149B3E3D00DB3EAA /* catch_reporter_xml.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_reporter_xml.hpp; sourceTree = "<group>"; };
 		4A7ADB4314F631E10094FE10 /* catch_totals.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_totals.hpp; sourceTree = "<group>"; };
+		4A8E4DCC160A344100194CBD /* catch_tags.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_tags.hpp; sourceTree = "<group>"; };
+		4A8E4DD0160A352200194CBD /* catch_tags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = catch_tags.cpp; path = ../../../SelfTest/SurrogateCpps/catch_tags.cpp; sourceTree = "<group>"; };
 		4A90B59B15D0F61A00EF71BC /* catch_interfaces_generators.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_interfaces_generators.h; sourceTree = "<group>"; };
 		4A90B59D15D24FE900EF71BC /* catch_resultinfo.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_resultinfo.hpp; sourceTree = "<group>"; };
 		4A90B59E15D2521E00EF71BC /* catch_resultinfo_builder.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_resultinfo_builder.hpp; sourceTree = "<group>"; };
@@ -170,6 +173,7 @@
 		4A6D0C41149B3DE900DB3EAA /* Catch */ = {
 			isa = PBXGroup;
 			children = (
+				4A8E4DCF160A34E200194CBD /* SurrogateCpps */,
 				4A6D0C44149B3E1500DB3EAA /* catch.hpp */,
 				4A6D0C42149B3E1500DB3EAA /* catch_runner.hpp */,
 				4A6D0C43149B3E1500DB3EAA /* catch_with_main.hpp */,
@@ -206,6 +210,14 @@
 			path = ../../../../include/reporters;
 			sourceTree = "<group>";
 		};
+		4A8E4DCF160A34E200194CBD /* SurrogateCpps */ = {
+			isa = PBXGroup;
+			children = (
+				4A8E4DD0160A352200194CBD /* catch_tags.cpp */,
+			);
+			name = SurrogateCpps;
+			sourceTree = "<group>";
+		};
 		4AC91CB4155B9EBF00DC5117 /* impl */ = {
 			isa = PBXGroup;
 			children = (
@@ -265,6 +277,7 @@
 				4AB77CB71553B72B00857BF0 /* catch_section_info.hpp */,
 				4AB77CB81553BB3800857BF0 /* catch_running_test.hpp */,
 				4A084F1D15DAD15F0027E631 /* catch_test_spec.h */,
+				4A8E4DCC160A344100194CBD /* catch_tags.hpp */,
 			);
 			name = "Test execution";
 			sourceTree = "<group>";
@@ -377,6 +390,7 @@
 				4A6D0C3F149B3D9E00DB3EAA /* TrickyTests.cpp in Sources */,
 				4AE1840B14EE4F230066340D /* catch_self_test.cpp in Sources */,
 				4AA7FF4315F3E89E009AD7F9 /* BDDTests.cpp in Sources */,
+				4A8E4DD2160A352200194CBD /* catch_tags.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

single_include/catch.hpp

@@ -1,5 +1,5 @@
 /*
- *  Generated: 2012-09-17 01:41:39.049891
+ *  Generated: 2012-09-26 21:42:33.317309
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -222,6 +222,7 @@ namespace Catch {
 namespace Catch {
 
     class TestCaseInfo;
+    class Stream;
     struct IResultCapture;
     struct IRunner;
     struct IGeneratorsForTest;
@@ -254,7 +255,7 @@ namespace Catch {
     IContext& getCurrentContext();
     IMutableContext& getCurrentMutableContext();
     void cleanUpContext();
-    std::streambuf* createStreamBuf( const std::string& streamName );
+    Stream createStream( const std::string& streamName );
 
 }
 
@@ -1311,8 +1312,8 @@ public:
         return *this;
     }
 
-    std::string getInfo () const {
+    ResultInfo getInfo () const {
-        return m_oss.str();
+        return ResultInfo( "", ResultWas::Info, false, SourceLineInfo(), "SCOPED_INFO", m_oss.str().c_str() );
     }
 
 private:
@@ -1668,7 +1669,8 @@ namespace Catch {
         const SourceLineInfo& getLineInfo() const;
         bool isHidden() const;
         bool hasTag( const std::string& tag ) const;
-        const std::set<std::string>& tags() const;
+        bool matchesTags( const std::string& tagPattern ) const;
+        const std::set<std::string>& getTags() const;
 
         void swap( TestCaseInfo& other );
         bool operator == ( const TestCaseInfo& other ) const;
@@ -1685,6 +1687,193 @@ namespace Catch {
     };
 }
 
+// #included from: catch_tags.hpp
+#define TWOBLUECUBES_CATCH_TAGS_HPP_INCLUDED
+
+#include <string>
+#include <set>
+#include <map>
+#include <vector>
+
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+    class TagParser {
+    public:
+        virtual ~TagParser();
+
+        void parse( const std::string& str ) {
+            std::size_t pos = 0;
+            while( pos < str.size() ) {
+                char c = str[pos];
+                if( c == '[' ) {
+                    std::size_t end = str.find_first_of( ']', pos );
+                    if( end != std::string::npos ) {
+                        acceptTag( str.substr( pos+1, end-pos-1 ) );
+                        pos = end+1;
+                    }
+                    else {
+                        acceptChar( c );
+                        pos++;
+                    }
+                }
+                else {
+                    acceptChar( c );
+                    pos++;
+                }
+            }
+            endParse();
+        }
+
+    protected:
+        virtual void acceptTag( const std::string& tag ) = 0;
+        virtual void acceptChar( char c ) = 0;
+        virtual void endParse() {}
+
+    private:
+    };
+
+    class TagExtracter : public TagParser {
+    public:
+
+        TagExtracter( std::set<std::string>& tags )
+        :   m_tags( tags )
+        {}
+        virtual ~TagExtracter();
+
+        void parse( std::string& description ) {
+            TagParser::parse( description );
+            description = m_remainder;
+        }
+
+    private:
+        virtual void acceptTag( const std::string& tag ) {
+            m_tags.insert( tag );
+        }
+        virtual void acceptChar( char c ) {
+            m_remainder += c;
+        }
+
+        std::set<std::string>& m_tags;
+        std::string m_remainder;
+    };
+
+    class Tag {
+    public:
+        Tag()
+        : m_isNegated( false )
+        {}
+
+        Tag( const std::string& name, bool isNegated )
+        :   m_name( name ),
+        m_isNegated( isNegated )
+        {}
+
+        std::string getName() const {
+            return m_name;
+        }
+        bool isNegated() const {
+            return m_isNegated;
+        }
+
+        bool operator ! () const {
+            return m_name.empty();
+        }
+
+    private:
+        std::string m_name;
+        bool m_isNegated;
+    };
+
+    class TagSet {
+        typedef std::map<std::string, Tag> TagMap;
+    public:
+        void add( const Tag& tag ) {
+            m_tags.insert( std::make_pair( tag.getName(), tag ) );
+        }
+
+        // needed?
+        Tag find( const std::string& name ) const {
+            TagMap::const_iterator it = m_tags.find( name );
+            if( it == m_tags.end() )
+                return Tag();
+            else
+                return it->second;
+        }
+        bool empty() const {
+            return m_tags.empty();
+        }
+
+        bool matches( const std::set<std::string>& tags ) const {
+            TagMap::const_iterator it = m_tags.begin();
+            TagMap::const_iterator itEnd = m_tags.end();
+            for(; it != itEnd; ++it ) {
+                bool found = tags.find( it->first ) != tags.end();
+                if( found == it->second.isNegated() )
+                    return false;
+            }
+            return true;
+        }
+
+    private:
+        TagMap m_tags;
+    };
+
+    class TagExpression {
+    public:
+        bool matches( const std::set<std::string>& tags ) const {
+            std::vector<TagSet>::const_iterator it = m_tagSets.begin();
+            std::vector<TagSet>::const_iterator itEnd = m_tagSets.end();
+            for(; it != itEnd; ++it )
+                if( it->matches( tags ) )
+                    return true;
+            return false;
+        }
+
+    private:
+        friend class TagExpressionParser;
+
+        std::vector<TagSet> m_tagSets;
+    };
+
+    class TagExpressionParser : public TagParser {
+    public:
+        TagExpressionParser( TagExpression& exp )
+        :   m_isNegated( false ),
+            m_exp( exp )
+        {}
+
+        ~TagExpressionParser();
+
+    private:
+        virtual void acceptTag( const std::string& tag ) {
+            m_currentTagSet.add( Tag( tag, m_isNegated ) );
+            m_isNegated = false;
+        }
+        virtual void acceptChar( char c ) {
+            switch( c ) {
+                case '~':
+                    m_isNegated = true;
+                    break;
+                case ',':
+                    m_exp.m_tagSets.push_back( m_currentTagSet );
+                    break;
+            }
+        }
+        virtual void endParse() {
+            if( !m_currentTagSet.empty() )
+                m_exp.m_tagSets.push_back( m_currentTagSet );
+        }
+
+        bool m_isNegated;
+        TagSet m_currentTagSet;
+        TagExpression& m_exp;
+    };
+
+} // end namespace Catch
+
 #include <string>
 #include <vector>
 
@@ -1788,7 +1977,24 @@ namespace Catch {
                 m_inclusionFilters.push_back( filter );
         }
 
+        void addTags( const std::string& tagPattern ) {
+            TagExpression exp;
+            TagExpressionParser( exp ).parse( tagPattern );
+
+            m_tagExpressions.push_back( exp );
+        }
+
         bool shouldInclude( const TestCaseInfo& testCase ) const {
+            if( !m_tagExpressions.empty() ) {
+                std::vector<TagExpression>::const_iterator it = m_tagExpressions.begin();
+                std::vector<TagExpression>::const_iterator itEnd = m_tagExpressions.end();
+                for(; it != itEnd; ++it )
+                    if( it->matches( testCase.getTags() ) )
+                        break;
+                if( it == itEnd )
+                    return false;
+            }
+
             if( !m_inclusionFilters.empty() ) {
                 std::vector<TestCaseFilter>::const_iterator it = m_inclusionFilters.begin();
                 std::vector<TestCaseFilter>::const_iterator itEnd = m_inclusionFilters.end();
@@ -1798,7 +2004,7 @@ namespace Catch {
                 if( it == itEnd )
                     return false;
             }
-            else if( m_exclusionFilters.empty() ) {
+            else if( m_exclusionFilters.empty() && m_tagExpressions.empty() ) {
                 return !testCase.isHidden();
             }
 
@@ -1810,6 +2016,7 @@ namespace Catch {
             return true;
         }
     private:
+        std::vector<TagExpression> m_tagExpressions;
         std::vector<TestCaseFilter> m_inclusionFilters;
         std::vector<TestCaseFilter> m_exclusionFilters;
         std::string m_name;
@@ -1830,6 +2037,84 @@ namespace Catch {
     };
 }
 
+// #included from: catch_stream.hpp
+#define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED
+
+#include <stdexcept>
+#include <cstdio>
+
+namespace Catch {
+
+    template<typename WriterF, size_t bufferSize=256>
+    class StreamBufImpl : public StreamBufBase {
+        char data[bufferSize];
+        WriterF m_writer;
+
+    public:
+        StreamBufImpl() {
+            setp( data, data + sizeof(data) );
+        }
+
+        ~StreamBufImpl() {
+            sync();
+        }
+
+    private:
+        int	overflow( int c ) {
+            sync();
+
+            if( c != EOF ) {
+                if( pbase() == epptr() )
+                    m_writer( std::string( 1, static_cast<char>( c ) ) );
+                else
+                    sputc( static_cast<char>( c ) );
+            }
+            return 0;
+        }
+
+        int	sync() {
+            if( pbase() != pptr() ) {
+                m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                setp( pbase(), epptr() );
+            }
+            return 0;
+        }
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    struct OutputDebugWriter {
+
+        void operator()( const std::string &str ) {
+            writeToDebugConsole( str );
+        }
+    };
+
+    class Stream {
+    public:
+        Stream()
+        : streamBuf( NULL ), isOwned( false )
+        {}
+
+        Stream( std::streambuf* _streamBuf, bool _isOwned )
+        : streamBuf( _streamBuf ), isOwned( _isOwned )
+        {}
+
+        void release() {
+            if( isOwned ) {
+                delete streamBuf;
+                streamBuf = NULL;
+                isOwned = false;
+            }
+        }
+
+        std::streambuf* streamBuf;
+
+    private:
+        bool isOwned;
+    };
+}
+
 #include <memory>
 #include <vector>
 #include <string>
@@ -1896,19 +2181,17 @@ namespace Catch {
     public:
 
         Config()
-        :   m_streambuf( NULL ),
+        :   m_os( std::cout.rdbuf() )
-            m_os( std::cout.rdbuf() )
         {}
 
         Config( const ConfigData& data )
         :   m_data( data ),
-            m_streambuf( NULL ),
             m_os( std::cout.rdbuf() )
         {}
 
         virtual ~Config() {
             m_os.rdbuf( std::cout.rdbuf() );
-            delete m_streambuf;
+            m_stream.release();
         }
 
         void setFilename( const std::string& filename ) {
@@ -1948,10 +2231,10 @@ namespace Catch {
         }
 
         void useStream( const std::string& streamName ) {
-            std::streambuf* newBuf = createStreamBuf( streamName );
+            Stream stream = createStream( streamName );
-            setStreamBuf( newBuf );
+            setStreamBuf( stream.streamBuf );
-            delete m_streambuf;
+            m_stream.release();
-            m_streambuf = newBuf;
+            m_stream = stream;
         }
 
         void addTestSpec( const std::string& testSpec ) {
@@ -1983,7 +2266,7 @@ namespace Catch {
         ConfigData m_data;
 
         // !TBD Move these out of here
-        std::streambuf* m_streambuf;
+        Stream m_stream;
         mutable std::ostream m_os;
     };
 
@@ -2007,10 +2290,20 @@ namespace Catch
             fullConfig( _fullConfig )
         {}
 
+        ReporterConfig( const ReporterConfig& other )
+        :   name( other.name ),
+            stream( other.stream ),
+            includeSuccessfulResults( other.includeSuccessfulResults ),
+            fullConfig( other.fullConfig )
+        {}
+
         std::string name;
         std::ostream& stream;
         bool includeSuccessfulResults;
         ConfigData fullConfig;
+
+    private:
+        void operator=(const ReporterConfig&);
     };
 
     class TestCaseInfo;
@@ -2709,10 +3002,10 @@ namespace Catch {
                 m_optionNames.push_back( "--help" );
             }
             virtual std::string argsSynopsis() const {
-                return "[<option for help on>]";
+                return "[<option for help on> ...]";
             }
             virtual std::string optionSummary() const {
-                return "Shows this usage summary, or help on a specific option, if supplied";
+                return "Shows this usage summary, or help on a specific option, or options, if supplied";
             }
             virtual std::string optionDescription() const {
                 return "";
@@ -2755,7 +3048,7 @@ namespace Catch {
                     "\n"
                     "If spec is prefixed with exclude: or the ~ character then the pattern matches an exclusion. "
                     "This means that tests matching the pattern are excluded from the set - even if a prior "
-                    "inclusion spec included them. Subsequent inclusion specs will take precendence, however. "
+                    "inclusion spec included them. Subsequent inclusion specs will take precedence, however. "
                     "Inclusions and exclusions are evaluated in left-to-right order.\n"
                     "\n"
                     "Examples:\n"
@@ -2784,6 +3077,41 @@ namespace Catch {
             }
         };
 
+        class TagOptionParser : public OptionParser {
+        public:
+            TagOptionParser() : OptionParser( 1, -1 ) {
+                m_optionNames.push_back( "-g" );
+                m_optionNames.push_back( "--tag" );
+            }
+            virtual std::string argsSynopsis() const {
+                return "<tagspec> [,<tagspec>...]";
+            }
+            virtual std::string optionSummary() const {
+                return "Matches test cases against tags or tag patterns";
+            }
+
+            // Lines are split at the nearest prior space char to the 80 char column.
+            // Tab chars are removed from the output but their positions are used to align
+            // subsequently wrapped lines
+            virtual std::string optionDescription() const {
+                return
+                "!TBD";
+            }
+
+            virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
+                std::string groupName;
+                for( std::size_t i = 0; i < cmd.argsCount(); ++i ) {
+                    if( i != 0 )
+                        groupName += " ";
+                    groupName += cmd[i];
+                }
+                TestCaseFilters filters( groupName );
+                for( std::size_t i = 0; i < cmd.argsCount(); ++i )
+                    filters.addTags( cmd[i] );
+                config.filters.push_back( filters );
+            }
+        };
+
         class ListOptionParser : public OptionParser {
         public:
             ListOptionParser() : OptionParser( 0, 2 ) {
@@ -2889,9 +3217,9 @@ namespace Catch {
             virtual std::string optionDescription() const {
                 return
                     "Use this option to send all output to a file or a stream. By default output is "
-                    "sent to stdout (note that uses ofstdout and stderr from within test cases are "
+                    "sent to stdout (note that uses of stdout and stderr from within test cases are "
                     "redirected and included in the report - so even stderr will effectively end up "
-                    "on stdout). If the name begins with % it is interpretted as a stream. "
+                    "on stdout). If the name begins with % it is interpreted as a stream. "
                     "Otherwise it is treated as a filename.\n"
                     "\n"
                     "Examples are:\n"
@@ -2927,7 +3255,7 @@ namespace Catch {
                 return
                     "Usually you only want to see reporting for failed tests. Sometimes it's useful "
                     "to see all the output (especially when you don't trust that that test you just "
-                    "added worked first time!). To see successul, as well as failing, test results "
+                    "added worked first time!). To see successful, as well as failing, test results "
                     "just pass this option.";
             }
             virtual void parseIntoConfig( const Command&, ConfigData& config ) {
@@ -3106,6 +3434,7 @@ namespace Catch {
         AllOptions() {
             add<Options::TestCaseOptionParser>();   // Keep this one first
 
+            add<Options::TagOptionParser>();
             add<Options::ListOptionParser>();
             add<Options::ReporterOptionParser>();
             add<Options::OutputOptionParser>();
@@ -3541,10 +3870,18 @@ namespace Catch {
             else if( !result.ok() ) {
                 m_totals.assertions.failed++;
 
-                std::vector<ResultInfo>::const_iterator it = m_info.begin();
+                {
-                std::vector<ResultInfo>::const_iterator itEnd = m_info.end();
+                    std::vector<ScopedInfo*>::const_iterator it = m_scopedInfos.begin();
-                for(; it != itEnd; ++it )
+                    std::vector<ScopedInfo*>::const_iterator itEnd = m_scopedInfos.end();
-                    m_reporter->Result( *it );
+                    for(; it != itEnd; ++it )
+                        m_reporter->Result( (*it)->getInfo() );
+                }
+                {
+                    std::vector<ResultInfo>::const_iterator it = m_info.begin();
+                    std::vector<ResultInfo>::const_iterator itEnd = m_info.end();
+                    for(; it != itEnd; ++it )
+                        m_reporter->Result( *it );
+                }
                 m_info.clear();
             }
 
@@ -3698,7 +4035,7 @@ namespace Catch {
         :   m_configWrapper( configWrapper ),
             m_config( configWrapper.data() )
         {
-            resolveStream();
+            openStream();
             makeReporter();
         }
 
@@ -3750,13 +4087,10 @@ namespace Catch {
         }
 
     private:
-        void resolveStream() {
+        void openStream() {
-            if( !m_config.stream.empty() ) {
+            if( !m_config.stream.empty() )
-                if( m_config.stream[0] == '%' )
+                m_configWrapper.useStream( m_config.stream );
-                    m_configWrapper.useStream( m_config.stream.substr( 1 ) );
+
-                else
-                    m_configWrapper.setFilename( m_config.stream );
-            }
             // Open output file, if specified
             if( !m_config.outputFilename.empty() ) {
                 m_ofs.open( m_config.outputFilename.c_str() );
@@ -3802,6 +4136,7 @@ namespace Catch {
             // Handle list request
             if( config.listSpec != List::None ) {
                 List( config );
+                Catch::cleanUp();
                 return 0;
             }
 
@@ -4244,60 +4579,6 @@ namespace Catch {
 // #included from: catch_context_impl.hpp
 #define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED
 
-// #included from: catch_stream.hpp
-#define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED
-
-#include <stdexcept>
-#include <cstdio>
-
-namespace Catch {
-
-    template<typename WriterF, size_t bufferSize=256>
-    class StreamBufImpl : public StreamBufBase {
-        char data[bufferSize];
-        WriterF m_writer;
-
-    public:
-        StreamBufImpl() {
-            setp( data, data + sizeof(data) );
-        }
-
-        ~StreamBufImpl() {
-            sync();
-        }
-
-    private:
-        int	overflow( int c ) {
-            sync();
-
-            if( c != EOF ) {
-                if( pbase() == epptr() )
-                    m_writer( std::string( 1, static_cast<char>( c ) ) );
-                else
-                    sputc( static_cast<char>( c ) );
-            }
-            return 0;
-        }
-
-        int	sync() {
-            if( pbase() != pptr() ) {
-                m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
-                setp( pbase(), epptr() );
-            }
-            return 0;
-        }
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    struct OutputDebugWriter {
-
-        void operator()( const std::string &str ) {
-            writeToDebugConsole( str );
-        }
-    };
-}
-
 namespace Catch {
 
     class Context : public IMutableContext {
@@ -4380,10 +4661,10 @@ namespace Catch {
         return getCurrentMutableContext();
     }
 
-    std::streambuf* createStreamBuf( const std::string& streamName ) {
+    Stream createStream( const std::string& streamName ) {
-        if( streamName == "stdout" ) return std::cout.rdbuf();
+        if( streamName == "stdout" ) return Stream( std::cout.rdbuf(), false );
-        if( streamName == "stderr" ) return std::cerr.rdbuf();
+        if( streamName == "stderr" ) return Stream( std::cerr.rdbuf(), false );
-        if( streamName == "debug" ) return new StreamBufImpl<OutputDebugWriter>;
+        if( streamName == "debug" ) return Stream( new StreamBufImpl<OutputDebugWriter>, true );
 
         throw std::domain_error( "Unknown stream: " + streamName );
     }
@@ -4752,36 +5033,6 @@ namespace Catch {
 
 namespace Catch {
 
-    namespace {
-        void extractTags( std::string& str, std::set<std::string>& tags ) {
-            std::string remainder;
-            std::size_t last = 0;
-            std::size_t begin = str.find_first_of( '[' );
-            while( begin != std::string::npos ) {
-                std::size_t end = str.find_first_of( ']', begin );
-                if( end != std::string::npos ) {
-                    std::string tag = str.substr( begin+1, end-begin-1 );
-                    tags.insert( tag );
-                    if( begin - last > 0 )
-                        remainder += str.substr( last, begin-last );
-                    last = end+1;
-                }
-                else if( begin != str.size()-1 ) {
-                    end = begin+1;
-                }
-                else {
-                    break;
-                }
-                begin = str.find_first_of( '[', end );
-            }
-            if( !tags.empty() ) {
-                if( last < str.size() )
-                    str = remainder + str.substr( last );
-                else
-                    str = remainder;
-            }
-        }
-    }
     TestCaseInfo::TestCaseInfo( ITestCase* testCase,
                                 const char* name,
                                 const char* description,
@@ -4792,7 +5043,7 @@ namespace Catch {
         m_lineInfo( lineInfo ),
         m_isHidden( startsWith( name, "./" ) )
     {
-        extractTags( m_description, m_tags );
+        TagExtracter( m_tags ).parse( m_description );
         if( hasTag( "hide" ) )
             m_isHidden = true;
     }
@@ -4845,7 +5096,12 @@ namespace Catch {
     bool TestCaseInfo::hasTag( const std::string& tag ) const {
         return m_tags.find( tag ) != m_tags.end();
     }
-    const std::set<std::string>& TestCaseInfo::tags() const {
+    bool TestCaseInfo::matchesTags( const std::string& tagPattern ) const {
+        TagExpression exp;
+        TagExpressionParser( exp ).parse( tagPattern );
+        return exp.matches( m_tags );
+    }
+    const std::set<std::string>& TestCaseInfo::getTags() const {
         return m_tags;
     }
 
@@ -4868,7 +5124,8 @@ namespace Catch {
         swap( temp );
         return *this;
     }
-}
+
+} // end namespace Catch
 
 // #included from: ../reporters/catch_reporter_basic.hpp
 #define TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED
@@ -5790,6 +6047,9 @@ namespace Catch {
     FreeFunctionTestCase::~FreeFunctionTestCase() {}
     IGeneratorInfo::~IGeneratorInfo() {}
     IGeneratorsForTest::~IGeneratorsForTest() {}
+    TagParser::~TagParser() {}
+    TagExtracter::~TagExtracter() {}
+    TagExpressionParser::~TagExpressionParser() {}
 
     void Config::dummy() {}