Changeset 59766 in webkit for trunk/JavaScriptCore/yarr/RegexInterpreter.cpp

Timestamp:

May 19, 2010, 8:20:05 AM (15 years ago)

Author:

[email protected]

Message:

The backtrackParenthesesOnceEnd function should store the start position
of the subpattern's non-greedy match at the place of the subpattern's
start index in the output array instead of the place of the
subpattern's end index.
Add layout test for checking of non-greedy matching of subpattern in
regular expressions.
​https://bugs.webkit.org/show_bug.cgi?id=39289

Patch by Peter Varga <​[email protected]> on 2010-05-19
Reviewed by Darin Adler.

JavaScriptCore:

• yarr/RegexInterpreter.cpp:

(JSC::Yarr::Interpreter::backtrackParenthesesOnceEnd):

LayoutTests:

• fast/js/regexp-non-greedy-parentheses-expected.txt: Added.
• fast/js/regexp-non-greedy-parentheses.html: Added.
• fast/js/script-tests/regexp-non-greedy-parentheses.js: Added.

File:

• trunk/JavaScriptCore/yarr/RegexInterpreter.cpp (modified) (1 diff)

trunk/JavaScriptCore/yarr/RegexInterpreter.cpp

@@ -675 +675 @@
                 if (term.capture()) {
                     unsigned subpatternId = term.atom.subpatternId;
-                    output[(subpatternId << 1) + 1] = input.getPos() + term.inputPosition;
+                    output[subpatternId << 1] = input.getPos() + term.inputPosition;
                 }
                 context->term -= term.atom.parenthesesWidth;