diff options
| author | amitherman95 | 2019-09-14 12:38:47 +0300 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-09-21 00:46:58 +0200 |
| commit | 2bcff9dd3581708d50734d3f55949146e5ba0162 (patch) | |
| tree | 9bfe433748ebeb9757b3c5df0f67c790f05fcfad /include/internal/catch_test_spec_parser.cpp | |
| parent | 3beccfb429863024166433e6585c4e97b6b7c762 (diff) | |
| download | catch3-2bcff9dd3581708d50734d3f55949146e5ba0162.tar.gz | |
Escape characters bug patch(v2.9.2)
Diffstat (limited to 'include/internal/catch_test_spec_parser.cpp')
| -rw-r--r-- | include/internal/catch_test_spec_parser.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/include/internal/catch_test_spec_parser.cpp b/include/internal/catch_test_spec_parser.cpp index a910ac7e..5cbbdeb7 100644 --- a/include/internal/catch_test_spec_parser.cpp +++ b/include/internal/catch_test_spec_parser.cpp @@ -28,7 +28,12 @@ namespace Catch { return m_testSpec; } void TestSpecParser::visitChar( char c ) { - if( c == ',' ) { + if( (m_mode != EscapedName) && (c == '\\') ) { + escape(); + m_substring += c; + m_patternName += c; + return; + }else if((m_mode != EscapedName) && (c == ',') ) { endMode(); addFilter(); return; @@ -72,9 +77,6 @@ namespace Catch { case '"': startNewMode( QuotedName ); return false; - case '\\': - escape(); - return true; default: startNewMode( Name ); return false; @@ -107,13 +109,15 @@ namespace Catch { case Tag: return addPattern<TestSpec::TagPattern>(); case EscapedName: - return startNewMode( Name ); + revertBackToLastMode(); + return; case None: default: return startNewMode( None ); } } void TestSpecParser::escape() { + saveLastMode(); m_mode = EscapedName; m_escapeChars.push_back( m_pos ); } @@ -141,6 +145,14 @@ namespace Catch { } } + void TestSpecParser::saveLastMode() { + lastMode = m_mode; + } + + void TestSpecParser::revertBackToLastMode() { + m_mode = lastMode; + } + TestSpec parseTestSpec( std::string const& arg ) { return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec(); } |