commit 4c213792cf4aa033242d3eb01841c4ba0bd805d7
author Russ Cox <rsc@swtch.com> Thu Jul 15 19:11:40 2010 -0700
committer Russ Cox <rsc@swtch.com> Thu Jul 15 19:11:40 2010 -0700
tree 0d0ac409ccda76a98647c09f484cb56dc74768c9
parent 16472436c1e3c15f62387671ef4a2d31b2324b78

bug fix: handle alternation involving a regexp
ending in \C* (or .* in Latin-1 mode) correctly

Bug only affected calls to Match, not FullMatch or PartialMatch.

R=rsc
CC=re2-dev
http://codereview.appspot.com/1690054

re2/testing/dfa_test.cc

diff --git a/re2/testing/dfa_test.cc b/re2/testing/dfa_test.cc
index acb338a..acd6432 100644
--- a/re2/testing/dfa_test.cc
+++ b/re2/testing/dfa_test.cc
@@ -100,7 +100,10 @@
   //LOG(INFO) << s;
   Regexp* re = Regexp::Parse(s.c_str(), Regexp::LikePerl, NULL);
   CHECK(re);
-  for (int i = 17; i < 28; i++) {
+  int max = 28;
+  if (DEBUG_MODE)
+    max = 24;
+  for (int i = 17; i < max; i++) {
     int limit = 1<<i;
     int usage, progusage, dfamem;
     {

re2/testing/random_test.cc

diff --git a/re2/testing/random_test.cc b/re2/testing/random_test.cc
index 6d6b5eb..91d2b32 100644
--- a/re2/testing/random_test.cc
+++ b/re2/testing/random_test.cc
@@ -23,6 +23,14 @@
                        const vector<string>& ops,
                        int maxstrlen, const vector<string>& stralphabet,
                        const string& wrapper) {
+  // Limit to smaller test cases in debug mode,
+  // because everything is so much slower.
+  if (DEBUG_MODE) {
+    maxatoms--;
+    maxops--;
+    maxstrlen /= 2;
+  }
+
   ExhaustiveTester t(maxatoms, maxops, alphabet, ops,
                      maxstrlen, stralphabet, wrapper, "");
   t.RandomStrings(FLAGS_stringseed, FLAGS_stringcount);
@@ -35,14 +43,14 @@
 // Tests random small regexps involving literals and egrep operators.
 TEST(Random, SmallEgrepLiterals) {
   RandomTest(5, 5, Explode("abc."), RegexpGenerator::EgrepOps(),
-             20, Explode("abc"),
+             15, Explode("abc"),
              "");
 }
 
 // Tests random bigger regexps involving literals and egrep operators.
 TEST(Random, BigEgrepLiterals) {
   RandomTest(10, 10, Explode("abc."), RegexpGenerator::EgrepOps(),
-             20, Explode("abc"),
+             15, Explode("abc"),
              "");
 }
 
@@ -50,7 +58,7 @@
 // and egrep operators.
 TEST(Random, SmallEgrepCaptures) {
   RandomTest(5, 5, Split(" ", "a (b) ."), RegexpGenerator::EgrepOps(),
-             20, Explode("abc"),
+             15, Explode("abc"),
              "");
 }
 
@@ -58,7 +66,7 @@
 // and egrep operators.
 TEST(Random, BigEgrepCaptures) {
   RandomTest(10, 10, Split(" ", "a (b) ."), RegexpGenerator::EgrepOps(),
-             20, Explode("abc"),
+             15, Explode("abc"),
              "");
 }
 

re2/testing/search_test.cc

diff --git a/re2/testing/search_test.cc b/re2/testing/search_test.cc
index 419d7ba..588e5d5 100644
--- a/re2/testing/search_test.cc
+++ b/re2/testing/search_test.cc
@@ -264,6 +264,8 @@
   { "[^\\\\]+", "Aa\\" },
   { "[acegikmoqsuwy]+", "acegikmoqsuwyACEGIKMOQSUWY" },
 
+  // Former bugs.
+  { "a\\C*|ba\\C", "baba" },
 };
 
 TEST(Regexp, SearchTests) {