Mercurial > hg > openjdk > lambda > nashorn
changeset 587:712f5e31739b
8025197: String replace method fails with regexp /$/gi
Reviewed-by: sundar
| author | hannesw |
|---|---|
| date | Thu, 26 Sep 2013 10:14:24 +0200 |
| parents | 2f8f99e5ed76 |
| children | 23958764f866 |
| files | src/jdk/nashorn/internal/objects/NativeRegExp.java test/script/basic/JDK-8025197.js test/script/basic/JDK-8025197.js.EXPECTED |
| diffstat | 3 files changed, 50 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/objects/NativeRegExp.java Wed Sep 25 16:37:56 2013 +0200 +++ b/src/jdk/nashorn/internal/objects/NativeRegExp.java Thu Sep 26 10:14:24 2013 +0200 @@ -697,8 +697,13 @@ appendReplacement(matcher, string, replacement, sb); } + 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) - thisIndex = matcher.end(); if (thisIndex == previousLastIndex) { setLastIndex(thisIndex + 1); previousLastIndex = thisIndex + 1;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8025197.js Thu Sep 26 10:14:24 2013 +0200 @@ -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'));