Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeRegExp.java	Wed Sep 25 16:37:56 2013 +0200
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeRegExp.java	Thu Sep 26 10:14:24 2013 +0200
     1.3 @@ -697,8 +697,13 @@
     1.4                  appendReplacement(matcher, string, replacement, sb);
     1.5              }
     1.6  
     1.7 +            thisIndex = matcher.end();
     1.8 +            if (thisIndex == string.length() && matcher.start() == matcher.end()) {
     1.9 +                // Avoid getting empty match at end of string twice
    1.10 +                break;
    1.11 +            }
    1.12 +
    1.13              // ECMA 15.5.4.10 String.prototype.match(regexp)
    1.14 -            thisIndex = matcher.end();
    1.15              if (thisIndex == previousLastIndex) {
    1.16                  setLastIndex(thisIndex + 1);
    1.17                  previousLastIndex = thisIndex + 1;

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8025197.js	Thu Sep 26 10:14:24 2013 +0200
     2.3 @@ -0,0 +1,37 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8025197: String replace method fails with regexp /$/gi
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +print('dog'.replace(/$/gi, 's'));
    2.35 +print('dog'.replace(/(?:g)$/gi, 's'));
    2.36 +print('dog'.replace(/(?:a)$/gi, 's'));
    2.37 +print('dog'.replace(/(?!g)$/gi, 's'));
    2.38 +print('dog'.replace(/(?!a)$/gi, 's'));
    2.39 +print('dog'.replace(/g?$/gi, 's'));
    2.40 +print('dog'.replace(/.?$/gi, 's'));

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8025197.js.EXPECTED	Thu Sep 26 10:14:24 2013 +0200
     3.3 @@ -0,0 +1,7 @@
     3.4 +dogs
     3.5 +dos
     3.6 +dog
     3.7 +dogs
     3.8 +dogs
     3.9 +doss
    3.10 +doss