* Fixed bug in handling of quantified look-aheads.

test/cctest/test-regexp.cc

Index: test/cctest/test-regexp.cc
diff --git a/test/cctest/test-regexp.cc b/test/cctest/test-regexp.cc
index 782bb116885bfbccbd0d12c3a2c18db6e9ae08c2..04ef43ff10b48dec0f3bf696d27ea88de0b8db40 100644
--- a/test/cctest/test-regexp.cc
+++ b/test/cctest/test-regexp.cc
@@ -63,7 +63,7 @@ static SmartPointer<const char> Parse(const char* input) {
   return output;
 }
 
-static bool ParseEscapes(const char* input) {
+static bool CheckNonSimple(const char* input) {
   V8::Initialize(NULL);
   v8::HandleScope scope;
   unibrow::Utf8InputBuffer<> buffer(input, strlen(input));
@@ -73,13 +73,13 @@ static bool ParseEscapes(const char* input) {
   CHECK(v8::internal::ParseRegExp(&reader, false, &result));
   CHECK(result.tree != NULL);
   CHECK(result.error.is_null());
-  return result.has_character_escapes;
+  return !result.tree->IsAtom() || result.non_simple;
 }
 
 
 #define CHECK_PARSE_EQ(input, expected) CHECK_EQ(expected, *Parse(input))
-#define CHECK_ESCAPES(input, has_escapes) CHECK_EQ(has_escapes, \
-                                                   ParseEscapes(input));
+#define CHECK_NON_SIMPLE(input, non_simple) CHECK_EQ(non_simple, \
+                                                     CheckNonSimple(input));
 
 TEST(Parser) {
   V8::Initialize(NULL);
@@ -186,47 +186,47 @@ TEST(Parser) {
   CHECK_PARSE_EQ("\\u003z", "'u003z'");
   CHECK_PARSE_EQ("foo[z]*", "(: 'foo' (# 0 - g [z]))");
 
-  CHECK_ESCAPES("a", false);
-  CHECK_ESCAPES("a|b", false);
-  CHECK_ESCAPES("a\\n", true);
-  CHECK_ESCAPES("^a", false);
-  CHECK_ESCAPES("a$", false);
-  CHECK_ESCAPES("a\\b!", false);
-  CHECK_ESCAPES("a\\Bb", false);
-  CHECK_ESCAPES("a*", false);
-  CHECK_ESCAPES("a*?", false);
-  CHECK_ESCAPES("a?", false);
-  CHECK_ESCAPES("a??", false);
-  CHECK_ESCAPES("a{0,1}?", false);
-  CHECK_ESCAPES("a{1,1}?", false);
-  CHECK_ESCAPES("a{1,2}?", false);
-  CHECK_ESCAPES("a+?", false);
-  CHECK_ESCAPES("(a)", false);
-  CHECK_ESCAPES("(a)\\1", false);
-  CHECK_ESCAPES("(\\1a)", false);
-  CHECK_ESCAPES("\\1(a)", false);
-  CHECK_ESCAPES("a\\s", false);
-  CHECK_ESCAPES("a\\S", false);
-  CHECK_ESCAPES("a\\d", false);
-  CHECK_ESCAPES("a\\D", false);
-  CHECK_ESCAPES("a\\w", false);
-  CHECK_ESCAPES("a\\W", false);
-  CHECK_ESCAPES("a.", false);
-  CHECK_ESCAPES("a\\q", true);
-  CHECK_ESCAPES("a[a]", false);
-  CHECK_ESCAPES("a[^a]", false);
-  CHECK_ESCAPES("a[a-z]", false);
-  CHECK_ESCAPES("a[\\q]", false);
-  CHECK_ESCAPES("a(?:b)", false);
-  CHECK_ESCAPES("a(?=b)", false);
-  CHECK_ESCAPES("a(?!b)", false);
-  CHECK_ESCAPES("\\x60", true);
-  CHECK_ESCAPES("\\u0060", true);
-  CHECK_ESCAPES("\\cA", true);
-  CHECK_ESCAPES("\\q", true);
-  CHECK_ESCAPES("\\1112", true);
-  CHECK_ESCAPES("\\0", true);
-  CHECK_ESCAPES("(a)\\1", false);
+  CHECK_NON_SIMPLE("a", false);
+  CHECK_NON_SIMPLE("a|b", true);
+  CHECK_NON_SIMPLE("a\\n", true);
+  CHECK_NON_SIMPLE("^a", true);
+  CHECK_NON_SIMPLE("a$", true);
+  CHECK_NON_SIMPLE("a\\b!", true);
+  CHECK_NON_SIMPLE("a\\Bb", true);
+  CHECK_NON_SIMPLE("a*", true);
+  CHECK_NON_SIMPLE("a*?", true);
+  CHECK_NON_SIMPLE("a?", true);
+  CHECK_NON_SIMPLE("a??", true);
+  CHECK_NON_SIMPLE("a{0,1}?", true);
+  CHECK_NON_SIMPLE("a{1,1}?", true);
+  CHECK_NON_SIMPLE("a{1,2}?", true);
+  CHECK_NON_SIMPLE("a+?", true);
+  CHECK_NON_SIMPLE("(a)", true);
+  CHECK_NON_SIMPLE("(a)\\1", true);
+  CHECK_NON_SIMPLE("(\\1a)", true);
+  CHECK_NON_SIMPLE("\\1(a)", true);
+  CHECK_NON_SIMPLE("a\\s", true);
+  CHECK_NON_SIMPLE("a\\S", true);
+  CHECK_NON_SIMPLE("a\\d", true);
+  CHECK_NON_SIMPLE("a\\D", true);
+  CHECK_NON_SIMPLE("a\\w", true);
+  CHECK_NON_SIMPLE("a\\W", true);
+  CHECK_NON_SIMPLE("a.", true);
+  CHECK_NON_SIMPLE("a\\q", true);
+  CHECK_NON_SIMPLE("a[a]", true);
+  CHECK_NON_SIMPLE("a[^a]", true);
+  CHECK_NON_SIMPLE("a[a-z]", true);
+  CHECK_NON_SIMPLE("a[\\q]", true);
+  CHECK_NON_SIMPLE("a(?:b)", true);
+  CHECK_NON_SIMPLE("a(?=b)", true);
+  CHECK_NON_SIMPLE("a(?!b)", true);
+  CHECK_NON_SIMPLE("\\x60", true);
+  CHECK_NON_SIMPLE("\\u0060", true);
+  CHECK_NON_SIMPLE("\\cA", true);
+  CHECK_NON_SIMPLE("\\q", true);
+  CHECK_NON_SIMPLE("\\1112", true);
+  CHECK_NON_SIMPLE("\\0", true);
+  CHECK_NON_SIMPLE("(a)\\1", true);
 
   CHECK_PARSE_EQ("a{}", "'a{}'");
   CHECK_PARSE_EQ("a{,}", "'a{,}'");