8011980: Allow NUL character in character class

Thu, 11 Apr 2013 12:16:39 +0200

author
hannesw
date
Thu, 11 Apr 2013 12:16:39 +0200
changeset 192
a3fc89d33072
parent 191
256bb030ce0a
child 193
ed4293ceec0e

8011980: Allow NUL character in character class
Reviewed-by: sundar, lagergren

src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java file | annotate | diff | comparison | revisions
test/script/basic/JDK-8011980.js file | annotate | diff | comparison | revisions
test/script/basic/JDK-8011980.js.EXPECTED file | annotate | diff | comparison | revisions
     1.1 --- a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java	Thu Apr 11 15:04:55 2013 +0530
     1.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java	Thu Apr 11 12:16:39 2013 +0200
     1.3 @@ -874,7 +874,6 @@
     1.4          switch (ch0) {
     1.5          case ']':
     1.6          case '-':
     1.7 -        case '\0':
     1.8              return false;
     1.9  
    1.10          case '[':
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8011980.js	Thu Apr 11 12:16:39 2013 +0200
     2.3 @@ -0,0 +1,34 @@
     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-8011980: Allow NUL character in character class
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +print(RegExp("\0").test("\0"));
    2.35 +print(RegExp("[\0]").test("\0"));
    2.36 +print(RegExp("[\x00]").test("\0"));
    2.37 +print(RegExp("[\u0000]").test("\0"));
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8011980.js.EXPECTED	Thu Apr 11 12:16:39 2013 +0200
     3.3 @@ -0,0 +1,4 @@
     3.4 +true
     3.5 +true
     3.6 +true
     3.7 +true

mercurial