Changeset 39164 in webkit for trunk/JavaScriptCore/pcre/pcre_compile.cpp

Timestamp:

Dec 9, 2008, 11:54:04 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-12-09 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Added WREC support for an assertion followed by a quantifier. Fixed
PCRE to match.

• wrec/WRECParser.cpp: (JSC::WREC::Parser::parseParentheses): Throw away the quantifier, since it's meaningless. (Firefox does the same.)

• pcre/pcre_compile.cpp: (compileBranch): ditto.

LayoutTests:

2008-12-09 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Added a test for an assertion followed by a quantifier.

• fast/regex/quantified-assertions-expected.txt: Added.
• fast/regex/quantified-assertions.html: Added.
• fast/regex/resources/quantified-assertions.js: Copied from fast/regex/resources/alternative-length-miscalculation.js.

File:

• trunk/JavaScriptCore/pcre/pcre_compile.cpp (modified) (2 diffs)

trunk/JavaScriptCore/pcre/pcre_compile.cpp

@@ -1059 +1059 @@
                 reqvary = (repeatMin == repeat_max) ? 0 : REQ_VARY;
                 
+                // A quantifier after an assertion is meaningless, since assertions
+                // don't move index forward. So, we discard it.
+                if (*previous == OP_ASSERT || *previous == OP_ASSERT_NOT)
+                    goto END_REPEAT;
+                
                 opType = 0;                    /* Default single-char op codes */
                 
@@ -1478 +1483 @@
                 }
                 
-                /* Process nested bracketed re. Assertions may not be repeated, but other
-                 kinds can be. We copy code into a non-variable in order to be able
-                 to pass its address because some compilers complain otherwise. Pass in a
-                 new setting for the ims options if they have changed. */
-                
-                previous = (bravalue >= OP_BRAZERO) ? code : 0;
+                /* Process nested bracketed re. We copy code into a non-variable
+                 in order to be able to pass its address because some compilers
+                 complain otherwise. Pass in a new setting for the ims options
+                 if they have changed. */
+                
+                previous = code;
                 *code = bravalue;
                 tempcode = code;