Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1322035 - Do not strip leading .* pattern in RegExp.prototype.test with global/sticky flags. r=h4writer

Browse Source
This commit is contained in:
Tooru Fujisawa 2016-12-08 16:29:19 +09:00
parent 0a092e1441
commit ec5fa62c8d
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/irregexp/RegExpParser.cpp
View File

@ -1837,7 +1837,9 @@ ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, si
bool multiline, bool match_only, bool unicode, bool ignore_case,
bool global, bool sticky, RegExpCompileData* data)
{
if (match_only) {
// We shouldn't strip pattern for exec, or test with global/sticky,
// to reflect correct match position and lastIndex.
if (match_only && !global && !sticky) {
// Try to strip a leading '.*' from the RegExp, but only if it is not
// followed by a '?' (which will affect how the .* is parsed). This
// pattern will affect the captures produced by the RegExp, but not
@ -1849,13 +1851,9 @@ ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, si
// Try to strip a trailing '.*' from the RegExp, which as above will
// affect the captures but not whether there is a match. Only do this
// when the following conditions are met:
// 1. there are no other meta characters in the RegExp, so that we
// are sure this will not affect how the RegExp is parsed
// 2. global and sticky flags are not set, as lastIndex needs to be
// set properly on global or sticky match
// when there are no other meta characters in the RegExp, so that we
// are sure this will not affect how the RegExp is parsed.
if (length >= 3 && !HasRegExpMetaChars(chars, length - 2) &&
!global && !sticky &&
chars[length - 2] == '.' && chars[length - 1] == '*')
{
length -= 2;

23
js/src/tests/ecma_6/RegExp/test-emptyMatch.js Normal file
View File

@ -0,0 +1,23 @@
var BUGNUMBER = 1322035;
var summary = 'RegExp.prototype.test should update lastIndex to correct position even if pattern starts with .*';
print(BUGNUMBER + ": " + summary);
var regExp = /.*x?/g;
regExp.test('12345');
assertEq(regExp.lastIndex, 5);
regExp = /.*x*/g;
regExp.test('12345');
assertEq(regExp.lastIndex, 5);
regExp = /.*()/g;
regExp.test('12345');
assertEq(regExp.lastIndex, 5);
regExp = /.*(x|)/g;
regExp.test('12345');
assertEq(regExp.lastIndex, 5);
if (typeof reportCompare === "function")
reportCompare(true, true);