Hello community, here is the log from the commit of package re2 for openSUSE:Factory checked in at 2017-01-17 14:36:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/re2 (Old) and /work/SRC/openSUSE:Factory/.re2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "re2" Changes: -------- --- /work/SRC/openSUSE:Factory/re2/re2.changes 2016-12-04 15:08:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.re2.new/re2.changes 2017-01-17 14:36:30.556200139 +0100 @@ -1,0 +2,6 @@ +Sat Jan 14 10:21:10 UTC 2017 - [email protected] + +- Update to version 2017-01-01 + * No upstream changelog available + +------------------------------------------------------------------- Old: ---- 2016-11-01.tar.gz New: ---- 2017-01-01.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ re2.spec ++++++ --- /var/tmp/diff_new_pack.QDCwYZ/_old 2017-01-17 14:36:30.904150812 +0100 +++ /var/tmp/diff_new_pack.QDCwYZ/_new 2017-01-17 14:36:30.904150812 +0100 @@ -1,7 +1,7 @@ # # spec file for package re2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%global longver 2016-11-01 +%global longver 2017-01-01 %global shortver %(echo %{longver}|sed 's|-||g') %define libname libre2-0 Name: re2 ++++++ 2016-11-01.tar.gz -> 2017-01-01.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/CMakeLists.txt new/re2-2017-01-01/CMakeLists.txt --- old/re2-2016-11-01/CMakeLists.txt 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/CMakeLists.txt 2016-12-13 12:22:01.000000000 +0100 @@ -128,4 +128,4 @@ ) install(FILES ${RE2_HEADERS} DESTINATION include/re2) -install(TARGETS re2 ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) +install(TARGETS re2 ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/kokoro/ubuntu/continuous-bazel.cfg new/re2-2017-01-01/kokoro/ubuntu/continuous-bazel.cfg --- old/re2-2016-11-01/kokoro/ubuntu/continuous-bazel.cfg 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/kokoro/ubuntu/continuous-bazel.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -build_file: "re2/kokoro/ubuntu/continuous-bazel.sh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/kokoro/ubuntu/continuous-bazel.sh new/re2-2017-01-01/kokoro/ubuntu/continuous-bazel.sh --- old/re2-2016-11-01/kokoro/ubuntu/continuous-bazel.sh 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/kokoro/ubuntu/continuous-bazel.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#!/bin/bash -set -eux - -cd git/re2 - -bazel clean -bazel build --compilation_mode=dbg -- //... -bazel test --compilation_mode=dbg --test_output=errors -- //... \ - -//:dfa_test \ - -//:exhaustive1_test \ - -//:exhaustive2_test \ - -//:exhaustive3_test \ - -//:exhaustive_test \ - -//:random_test - -bazel clean -bazel build --compilation_mode=opt -- //... -bazel test --compilation_mode=opt --test_output=errors -- //... \ - -//:dfa_test \ - -//:exhaustive1_test \ - -//:exhaustive2_test \ - -//:exhaustive3_test \ - -//:exhaustive_test \ - -//:random_test - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/kokoro/ubuntu-bazel.cfg new/re2-2017-01-01/kokoro/ubuntu-bazel.cfg --- old/re2-2016-11-01/kokoro/ubuntu-bazel.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/re2-2017-01-01/kokoro/ubuntu-bazel.cfg 2016-12-13 12:22:01.000000000 +0100 @@ -0,0 +1 @@ +build_file: "re2/kokoro/ubuntu-bazel.sh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/kokoro/ubuntu-bazel.sh new/re2-2017-01-01/kokoro/ubuntu-bazel.sh --- old/re2-2016-11-01/kokoro/ubuntu-bazel.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/re2-2017-01-01/kokoro/ubuntu-bazel.sh 2016-12-13 12:22:01.000000000 +0100 @@ -0,0 +1,26 @@ +#!/bin/bash +set -eux + +cd git/re2 + +bazel clean +bazel build --compilation_mode=dbg -- //... +bazel test --compilation_mode=dbg --test_output=errors -- //... \ + -//:dfa_test \ + -//:exhaustive1_test \ + -//:exhaustive2_test \ + -//:exhaustive3_test \ + -//:exhaustive_test \ + -//:random_test + +bazel clean +bazel build --compilation_mode=opt -- //... +bazel test --compilation_mode=opt --test_output=errors -- //... \ + -//:dfa_test \ + -//:exhaustive1_test \ + -//:exhaustive2_test \ + -//:exhaustive3_test \ + -//:exhaustive_test \ + -//:random_test + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/kokoro/windows/continuous-cmake.bat new/re2-2017-01-01/kokoro/windows/continuous-cmake.bat --- old/re2-2016-11-01/kokoro/windows/continuous-cmake.bat 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/kokoro/windows/continuous-cmake.bat 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -CD git/re2 || EXIT /B 1 - -cmake -D CMAKE_BUILD_TYPE=Debug -G "Visual Studio 12 2013" -A x64 . || EXIT /B 1 -cmake --build . --config Debug --clean-first || EXIT /B 1 -ctest -C Debug --output-on-failure -E dfa^|exhaustive^|random || EXIT /B 1 - -cmake -D CMAKE_BUILD_TYPE=Release -G "Visual Studio 12 2013" -A x64 . || EXIT /B 1 -cmake --build . --config Release --clean-first || EXIT /B 1 -ctest -C Release --output-on-failure -E dfa^|exhaustive^|random || EXIT /B 1 - -EXIT /B 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/kokoro/windows/continuous-cmake.cfg new/re2-2017-01-01/kokoro/windows/continuous-cmake.cfg --- old/re2-2016-11-01/kokoro/windows/continuous-cmake.cfg 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/kokoro/windows/continuous-cmake.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -build_file: "re2/kokoro/windows/continuous-cmake.bat" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/kokoro/windows-cmake.bat new/re2-2017-01-01/kokoro/windows-cmake.bat --- old/re2-2016-11-01/kokoro/windows-cmake.bat 1970-01-01 01:00:00.000000000 +0100 +++ new/re2-2017-01-01/kokoro/windows-cmake.bat 2016-12-13 12:22:01.000000000 +0100 @@ -0,0 +1,11 @@ +CD git/re2 || EXIT /B 1 + +cmake -D CMAKE_BUILD_TYPE=Debug -G "Visual Studio 12 2013" -A x64 . || EXIT /B 1 +cmake --build . --config Debug --clean-first || EXIT /B 1 +ctest -C Debug --output-on-failure -E dfa^|exhaustive^|random || EXIT /B 1 + +cmake -D CMAKE_BUILD_TYPE=Release -G "Visual Studio 12 2013" -A x64 . || EXIT /B 1 +cmake --build . --config Release --clean-first || EXIT /B 1 +ctest -C Release --output-on-failure -E dfa^|exhaustive^|random || EXIT /B 1 + +EXIT /B 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/kokoro/windows-cmake.cfg new/re2-2017-01-01/kokoro/windows-cmake.cfg --- old/re2-2016-11-01/kokoro/windows-cmake.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/re2-2017-01-01/kokoro/windows-cmake.cfg 2016-12-13 12:22:01.000000000 +0100 @@ -0,0 +1 @@ +build_file: "re2/kokoro/windows-cmake.bat" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/bitstate.cc new/re2-2017-01-01/re2/bitstate.cc --- old/re2-2016-11-01/re2/bitstate.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/bitstate.cc 2016-12-13 12:22:01.000000000 +0100 @@ -324,7 +324,7 @@ submatch_ = submatch; nsubmatch_ = nsubmatch; for (int i = 0; i < nsubmatch_; i++) - submatch_[i] = NULL; + submatch_[i] = StringPiece(); // Allocate scratch space. nvisited_ = (prog_->size() * (text.size()+1) + VisitedBits-1) / VisitedBits; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/dfa.cc new/re2-2017-01-01/re2/dfa.cc --- old/re2-2016-11-01/re2/dfa.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/dfa.cc 2016-12-13 12:22:01.000000000 +0100 @@ -1891,7 +1891,7 @@ // Pick out start state for unanchored search // at beginning of text. RWLocker l(&cache_mutex_); - SearchParams params(NULL, NULL, &l); + SearchParams params(StringPiece(), StringPiece(), &l); params.anchored = false; if (!AnalyzeSearch(¶ms) || params.start <= SpecialStateMax) return 0; @@ -1950,7 +1950,7 @@ // Pick out start state for anchored search at beginning of text. RWLocker l(&cache_mutex_); - SearchParams params(NULL, NULL, &l); + SearchParams params(StringPiece(), StringPiece(), &l); params.anchored = true; if (!AnalyzeSearch(¶ms)) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/fuzzing/re2_fuzzer.cc new/re2-2017-01-01/re2/fuzzing/re2_fuzzer.cc --- old/re2-2016-11-01/re2/fuzzing/re2_fuzzer.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/fuzzing/re2_fuzzer.cc 2016-12-13 12:22:01.000000000 +0100 @@ -21,9 +21,10 @@ return; // Don't waste time fuzzing high-fanout programs. + // (They can also cause bug reports due to fuzzer timeouts.) std::map<int, int> histogram; int fanout = re.ProgramFanout(&histogram); - if (fanout > 10) + if (fanout > 9) return; StringPiece sp1, sp2, sp3, sp4; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/parse.cc new/re2-2017-01-01/re2/parse.cc --- old/re2-2016-11-01/re2/parse.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/parse.cc 2016-12-13 12:22:01.000000000 +0100 @@ -1289,7 +1289,7 @@ } status->set_code(kRegexpBadUTF8); - status->set_error_arg(NULL); + status->set_error_arg(StringPiece()); return -1; } @@ -1333,12 +1333,12 @@ if (s->size() < 1 || (*s)[0] != '\\') { // Should not happen - caller always checks. status->set_code(kRegexpInternalError); - status->set_error_arg(NULL); + status->set_error_arg(StringPiece()); return false; } if (s->size() < 2) { status->set_code(kRegexpTrailingBackslash); - status->set_error_arg(NULL); + status->set_error_arg(StringPiece()); return false; } Rune c, c1; @@ -1793,7 +1793,7 @@ if (s->size() == 0 || (*s)[0] != '[') { // Caller checked this. status->set_code(kRegexpInternalError); - status->set_error_arg(NULL); + status->set_error_arg(StringPiece()); return false; } bool negated = false; @@ -2108,9 +2108,9 @@ return ps.DoFinish(); } - StringPiece lastunary = NULL; + StringPiece lastunary = StringPiece(); while (t.size() > 0) { - StringPiece isunary = NULL; + StringPiece isunary = StringPiece(); switch (t[0]) { default: { Rune r; @@ -2133,7 +2133,7 @@ if (!ps.DoLeftParenNoCapture()) return NULL; } else { - if (!ps.DoLeftParen(NULL)) + if (!ps.DoLeftParen(StringPiece())) return NULL; } t.remove_prefix(1); // '(' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/re2.cc new/re2-2017-01-01/re2/re2.cc --- old/re2-2016-11-01/re2/re2.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/re2.cc 2016-12-13 12:22:01.000000000 +0100 @@ -785,7 +785,7 @@ // Zero submatches that don't exist in the regexp. for (int i = ncap; i < nsubmatch; i++) - submatch[i] = NULL; + submatch[i] = StringPiece(); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/set.h new/re2-2017-01-01/re2/set.h --- old/re2-2016-11-01/re2/set.h 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/set.h 2016-12-13 12:22:01.000000000 +0100 @@ -41,6 +41,7 @@ // Match returns true if text matches any of the regexps in the set. // If so, it fills v (if not NULL) with the indices of the matching regexps. + // Callers must not expect v to be sorted. bool Match(const StringPiece& text, std::vector<int>* v) const; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/simplify.cc new/re2-2017-01-01/re2/simplify.cc --- old/re2-2016-11-01/re2/simplify.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/simplify.cc 2016-12-13 12:22:01.000000000 +0100 @@ -589,12 +589,12 @@ return Regexp::Plus(re->Incref(), f); // General case: x{4,} is xxxx+ - Regexp* nre = new Regexp(kRegexpConcat, f); - nre->AllocSub(min); - Regexp** nre_subs = nre->sub(); + Regexp** nre_subs = new Regexp*[min]; for (int i = 0; i < min-1; i++) nre_subs[i] = re->Incref(); nre_subs[min-1] = Regexp::Plus(re->Incref(), f); + Regexp* nre = Regexp::Concat(nre_subs, min, f); + delete[] nre_subs; return nre; } @@ -613,11 +613,11 @@ // Build leading prefix: xx. Capturing only on the last one. Regexp* nre = NULL; if (min > 0) { - nre = new Regexp(kRegexpConcat, f); - nre->AllocSub(min); - Regexp** nre_subs = nre->sub(); + Regexp** nre_subs = new Regexp*[min]; for (int i = 0; i < min; i++) nre_subs[i] = re->Incref(); + nre = Regexp::Concat(nre_subs, min, f); + delete[] nre_subs; } // Build and attach suffix: (x(x(x)?)?)? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/testing/backtrack.cc new/re2-2017-01-01/re2/testing/backtrack.cc --- old/re2-2016-11-01/re2/testing/backtrack.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/testing/backtrack.cc 2016-12-13 12:22:01.000000000 +0100 @@ -126,7 +126,7 @@ submatch_ = &sp0; nsubmatch_ = 1; } - submatch_[0] = NULL; + submatch_[0] = StringPiece(); // Allocate new visited_ bitmap -- size is proportional // to text, so have to reallocate on each call to Search. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/testing/dfa_test.cc new/re2-2017-01-01/re2/testing/dfa_test.cc --- old/re2-2016-11-01/re2/testing/dfa_test.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/testing/dfa_test.cc 2016-12-13 12:22:01.000000000 +0100 @@ -192,14 +192,12 @@ for (int i = 0; i < 10; i++) { bool matched = false; bool failed = false; - matched = prog->SearchDFA(match, NULL, - Prog::kUnanchored, Prog::kFirstMatch, - NULL, &failed, NULL); + matched = prog->SearchDFA(match, StringPiece(), Prog::kUnanchored, + Prog::kFirstMatch, NULL, &failed, NULL); CHECK(!failed); CHECK(matched); - matched = prog->SearchDFA(no_match, NULL, - Prog::kUnanchored, Prog::kFirstMatch, - NULL, &failed, NULL); + matched = prog->SearchDFA(no_match, StringPiece(), Prog::kUnanchored, + Prog::kFirstMatch, NULL, &failed, NULL); CHECK(!failed); CHECK(!matched); } @@ -226,14 +224,12 @@ for (int i = 0; i < 2; i++) { bool matched = false; bool failed = false; - matched = prog->SearchDFA(match, NULL, - Prog::kUnanchored, Prog::kFirstMatch, - NULL, &failed, NULL); + matched = prog->SearchDFA(match, StringPiece(), Prog::kUnanchored, + Prog::kFirstMatch, NULL, &failed, NULL); CHECK(!failed); CHECK(matched); - matched = prog->SearchDFA(no_match, NULL, - Prog::kUnanchored, Prog::kFirstMatch, - NULL, &failed, NULL); + matched = prog->SearchDFA(no_match, StringPiece(), Prog::kUnanchored, + Prog::kFirstMatch, NULL, &failed, NULL); CHECK(!failed); CHECK(!matched); } @@ -306,7 +302,8 @@ Prog *prog = re->CompileToReverseProg(0); CHECK(prog); bool failed = false; - bool matched = prog->SearchDFA(t.text, NULL, Prog::kUnanchored, Prog::kFirstMatch, NULL, &failed, NULL); + bool matched = prog->SearchDFA(t.text, StringPiece(), Prog::kUnanchored, + Prog::kFirstMatch, NULL, &failed, NULL); if (matched != t.match) { LOG(ERROR) << t.regexp << " on " << t.text << ": want " << t.match; nfail++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/testing/re2_test.cc new/re2-2017-01-01/re2/testing/re2_test.cc --- old/re2-2016-11-01/re2/testing/re2_test.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/testing/re2_test.cc 2016-12-13 12:22:01.000000000 +0100 @@ -1458,7 +1458,7 @@ EXPECT_TRUE(re.Match(null, 0, null.size(), RE2::UNANCHORED, matches, arraysize(matches))); for (int i = 0; i < arraysize(matches); i++) { - EXPECT_TRUE(matches[i] == NULL); + EXPECT_TRUE(matches[i] == StringPiece()); EXPECT_TRUE(matches[i].data() == NULL); // always null EXPECT_TRUE(matches[i] == ""); } @@ -1469,16 +1469,16 @@ StringPiece empty(""); EXPECT_TRUE(re.Match(empty, 0, empty.size(), RE2::UNANCHORED, matches, arraysize(matches))); - EXPECT_TRUE(matches[0] == NULL); + EXPECT_TRUE(matches[0] == StringPiece()); EXPECT_TRUE(matches[0].data() != NULL); // empty, not null EXPECT_TRUE(matches[0] == ""); - EXPECT_TRUE(matches[1] == NULL); + EXPECT_TRUE(matches[1] == StringPiece()); EXPECT_TRUE(matches[1].data() != NULL); // empty, not null EXPECT_TRUE(matches[1] == ""); - EXPECT_TRUE(matches[2] == NULL); + EXPECT_TRUE(matches[2] == StringPiece()); EXPECT_TRUE(matches[2].data() == NULL); EXPECT_TRUE(matches[2] == ""); - EXPECT_TRUE(matches[3] == NULL); + EXPECT_TRUE(matches[3] == StringPiece()); EXPECT_TRUE(matches[3].data() == NULL); EXPECT_TRUE(matches[3] == ""); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/testing/regexp_benchmark.cc new/re2-2017-01-01/re2/testing/regexp_benchmark.cc --- old/re2-2016-11-01/re2/testing/regexp_benchmark.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/testing/regexp_benchmark.cc 2016-12-13 12:22:01.000000000 +0100 @@ -886,7 +886,7 @@ Prog* prog = re->CompileToProg(0); CHECK(prog); bool failed = false; - CHECK_EQ(prog->SearchDFA(text, NULL, anchor, Prog::kFirstMatch, + CHECK_EQ(prog->SearchDFA(text, StringPiece(), anchor, Prog::kFirstMatch, NULL, &failed, NULL), expect_match); CHECK(!failed); @@ -902,7 +902,8 @@ CHECK(re); Prog* prog = re->CompileToProg(0); CHECK(prog); - CHECK_EQ(prog->SearchNFA(text, NULL, anchor, Prog::kFirstMatch, NULL, 0), + CHECK_EQ(prog->SearchNFA(text, StringPiece(), anchor, Prog::kFirstMatch, + NULL, 0), expect_match); delete prog; re->Decref(); @@ -974,8 +975,8 @@ CHECK(prog); for (int i = 0; i < iters; i++) { bool failed = false; - CHECK_EQ(prog->SearchDFA(text, NULL, anchor, - Prog::kFirstMatch, NULL, &failed, NULL), + CHECK_EQ(prog->SearchDFA(text, StringPiece(), anchor, Prog::kFirstMatch, + NULL, &failed, NULL), expect_match); CHECK(!failed); } @@ -990,7 +991,8 @@ Prog* prog = re->CompileToProg(0); CHECK(prog); for (int i = 0; i < iters; i++) { - CHECK_EQ(prog->SearchNFA(text, NULL, anchor, Prog::kFirstMatch, NULL, 0), + CHECK_EQ(prog->SearchNFA(text, StringPiece(), anchor, Prog::kFirstMatch, + NULL, 0), expect_match); } delete prog; @@ -1059,7 +1061,8 @@ Prog* prog = re->CompileToProg(0); CHECK(prog); StringPiece sp[4]; // 4 because sp[0] is whole match. - CHECK(prog->SearchNFA(text, NULL, Prog::kAnchored, Prog::kFullMatch, sp, 4)); + CHECK(prog->SearchNFA(text, StringPiece(), Prog::kAnchored, + Prog::kFullMatch, sp, 4)); delete prog; re->Decref(); } @@ -1130,7 +1133,8 @@ CHECK(prog); StringPiece sp[4]; // 4 because sp[0] is whole match. for (int i = 0; i < iters; i++) { - CHECK(prog->SearchNFA(text, NULL, Prog::kAnchored, Prog::kFullMatch, sp, 4)); + CHECK(prog->SearchNFA(text, StringPiece(), Prog::kAnchored, + Prog::kFullMatch, sp, 4)); } delete prog; re->Decref(); @@ -1202,7 +1206,8 @@ Prog* prog = re->CompileToProg(0); CHECK(prog); StringPiece sp[2]; // 2 because sp[0] is whole match. - CHECK(prog->SearchNFA(text, NULL, Prog::kAnchored, Prog::kFullMatch, sp, 2)); + CHECK(prog->SearchNFA(text, StringPiece(), Prog::kAnchored, + Prog::kFullMatch, sp, 2)); delete prog; re->Decref(); } @@ -1260,7 +1265,8 @@ CHECK(prog); StringPiece sp[2]; // 2 because sp[0] is whole match. for (int i = 0; i < iters; i++) { - CHECK(prog->SearchNFA(text, NULL, Prog::kAnchored, Prog::kFullMatch, sp, 2)); + CHECK(prog->SearchNFA(text, StringPiece(), Prog::kAnchored, + Prog::kFullMatch, sp, 2)); } delete prog; re->Decref(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/testing/string_generator.cc new/re2-2017-01-01/re2/testing/string_generator.cc --- old/re2-2016-11-01/re2/testing/string_generator.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/testing/string_generator.cc 2016-12-13 12:22:01.000000000 +0100 @@ -85,7 +85,7 @@ CHECK(hasnext_); if (generate_null_) { generate_null_ = false; - sp_ = NULL; + sp_ = StringPiece(); return sp_; } s_.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/testing/tester.cc new/re2-2017-01-01/re2/testing/tester.cc --- old/re2-2016-11-01/re2/testing/tester.cc 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/testing/tester.cc 2016-12-13 12:22:01.000000000 +0100 @@ -473,7 +473,7 @@ // StringPiece(text.begin() - 1, 0). Oops. for (int i = 0; i < nsubmatch; i++) if (result->submatch[i].begin() == text.begin() - 1) - result->submatch[i] = NULL; + result->submatch[i] = StringPiece(); delete[] argptr; delete[] a; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/re2-2016-11-01/re2/testing/tester.h new/re2-2017-01-01/re2/testing/tester.h --- old/re2-2016-11-01/re2/testing/tester.h 2016-10-24 15:23:04.000000000 +0200 +++ new/re2-2017-01-01/re2/testing/tester.h 2016-12-13 12:22:01.000000000 +0100 @@ -72,7 +72,7 @@ void LogMatch(const char* prefix, Engine e, const StringPiece& text, const StringPiece& context, Prog::Anchor anchor); - const StringPiece& regexp_str_; // regexp being tested + const StringPiece regexp_str_; // regexp being tested Prog::MatchKind kind_; // kind of match Regexp::ParseFlags flags_; // flags for parsing regexp_str_ bool error_; // error during constructor?
