diff options
| author | Martin Hořeňovský | 2020-01-25 20:39:17 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-01-25 20:39:17 +0100 |
| commit | d0257fc1ff130ab2f3cab646ab43c755f3b62e00 (patch) | |
| tree | 03545de55ba02f67917d36223e923a1b61813a74 /src/catch2/catch_test_spec_parser.cpp | |
| parent | df2379218b634e0c1b21b49ea56354a2102d4cd1 (diff) | |
| download | catch3-d0257fc1ff130ab2f3cab646ab43c755f3b62e00.tar.gz | |
Do not use shared_ptrs for filters and patterns
Diffstat (limited to 'src/catch2/catch_test_spec_parser.cpp')
| -rw-r--r-- | src/catch2/catch_test_spec_parser.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/catch2/catch_test_spec_parser.cpp b/src/catch2/catch_test_spec_parser.cpp index 0f37b35c..5c3df3b6 100644 --- a/src/catch2/catch_test_spec_parser.cpp +++ b/src/catch2/catch_test_spec_parser.cpp @@ -20,10 +20,10 @@ namespace Catch { m_substring.reserve(m_arg.size()); m_patternName.reserve(m_arg.size()); m_realPatternPos = 0; - + for( m_pos = 0; m_pos < m_arg.size(); ++m_pos ) //if visitChar fails - if( !visitChar( m_arg[m_pos] ) ){ + if( !visitChar( m_arg[m_pos] ) ){ m_testSpec.m_invalidArgs.push_back(arg); break; } @@ -32,7 +32,7 @@ namespace Catch { } TestSpec TestSpecParser::testSpec() { addFilter(); - return m_testSpec; + return std::move(m_testSpec); } bool TestSpecParser::visitChar( char c ) { if( (m_mode != EscapedName) && (c == '\\') ) { @@ -148,7 +148,7 @@ namespace Catch { void TestSpecParser::addFilter() { if( !m_currentFilter.m_required.empty() || !m_currentFilter.m_forbidden.empty() ) { - m_testSpec.m_filters.push_back( m_currentFilter ); + m_testSpec.m_filters.push_back( std::move(m_currentFilter) ); m_currentFilter = TestSpec::Filter(); } } @@ -156,12 +156,12 @@ namespace Catch { void TestSpecParser::saveLastMode() { lastMode = m_mode; } - + void TestSpecParser::revertBackToLastMode() { m_mode = lastMode; } - - bool TestSpecParser::separate() { + + bool TestSpecParser::separate() { if( (m_mode==QuotedName) || (m_mode==Tag) ){ //invalid argument, signal failure to previous scope. m_mode = None; @@ -174,7 +174,7 @@ namespace Catch { addFilter(); return true; //success } - + TestSpec parseTestSpec( std::string const& arg ) { return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec(); } |