Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java	Fri Jun 08 11:11:06 2018 +0200
     1.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java	Fri Jun 08 11:08:38 2018 +0200
     1.3 @@ -541,7 +541,6 @@
     1.4              sprev = s;
     1.5              s++;
     1.6          }
     1.7 -        sprev = sbegin; // break;
     1.8      }
     1.9  
    1.10      private void opAnyCharMLStar() {
    1.11 @@ -550,7 +549,6 @@
    1.12              sprev = s;
    1.13              s++;
    1.14          }
    1.15 -        sprev = sbegin; // break;
    1.16      }
    1.17  
    1.18      private void opAnyCharStarPeekNext() {

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8204288.js	Fri Jun 08 11:08:38 2018 +0200
     2.3 @@ -0,0 +1,35 @@
     2.4 +/*
     2.5 + * Copyright (c) 2018, 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-8204288: Matching the end of a string followed by an empty greedy regex and a word boundary fails
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +
    2.35 +Assert.assertEquals(new RegExp("c.*\\b").exec("abc")[0], "c");
    2.36 +Assert.assertEquals(new RegExp("abc.*\\b").exec("abc")[0], "abc");
    2.37 +Assert.assertEquals(new RegExp("\\b.*abc.*\\b").exec("abc")[0], "abc");
    2.38 +