8011394: RegExp.prototype.test() does not call valueOf on lastIndex property as per the spec

Reviewed-by: lagergren, jlaskey, hannesw
This commit is contained in:
Athijegannathan Sundararajan 2013-04-04 10:24:46 +05:30
parent 84f1ee1581
commit 2b494aafd9
2 changed files with 49 additions and 1 deletions

View File

@ -523,8 +523,11 @@ public final class NativeRegExp extends ScriptObject {
}
private RegExpResult execInner(final String string) {
int start = getLastIndex();
if (! regexp.isGlobal()) {
start = 0;
}
final int start = regexp.isGlobal() ? getLastIndex() : 0;
if (start < 0 || start > string.length()) {
setLastIndex(0);
return null;

View File

@ -0,0 +1,45 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* JDK-8011394: RegExp.prototype.test() does not call valueOf on lastIndex property as per the spec.
*
* @test
* @run
*/
var re = new RegExp();
var lastIndexValueOfCalled = false;
re.lastIndex = {
valueOf: function() {
lastIndexValueOfCalled = true;
return 0;
}
};
re.test("");
if (! lastIndexValueOfCalled) {
fail("RegExp.prototype.test() does not call 'valueOf' on 'lastIndex'");
}