stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8025197: String replace method fails with regexp /$/gi

Browse Source 
Reviewed-by: sundar
This commit is contained in:
Hannes Wallnöfer 2013-09-26 10:14:24 +02:00
parent 0414dcb01d
commit abc7352b43
3 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
View File

@ -697,8 +697,13 @@ public final class NativeRegExp extends ScriptObject {
appendReplacement(matcher, string, replacement, sb);
}
// ECMA 15.5.4.10 String.prototype.match(regexp)
thisIndex = matcher.end();
if (thisIndex == string.length() && matcher.start() == matcher.end()) {
// Avoid getting empty match at end of string twice
break;
}
// ECMA 15.5.4.10 String.prototype.match(regexp)
if (thisIndex == previousLastIndex) {
setLastIndex(thisIndex + 1);
previousLastIndex = thisIndex + 1;

37
nashorn/test/script/basic/JDK-8025197.js Normal file
View File

@ -0,0 +1,37 @@
/*
* 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-8025197: String replace method fails with regexp /$/gi
*
* @test
* @run
*/
print('dog'.replace(/$/gi, 's'));
print('dog'.replace(/(?:g)$/gi, 's'));
print('dog'.replace(/(?:a)$/gi, 's'));
print('dog'.replace(/(?!g)$/gi, 's'));
print('dog'.replace(/(?!a)$/gi, 's'));
print('dog'.replace(/g?$/gi, 's'));
print('dog'.replace(/.?$/gi, 's'));

7
nashorn/test/script/basic/JDK-8025197.js.EXPECTED Normal file
View File

@ -0,0 +1,7 @@
dogs
dos
dog
dogs
dogs
doss
doss