Mercurial > hg > openjdk > jigsaw > nashorn
changeset 129:f90810d79b57
8008370: coffee script compiler doesn't work with Nashorn
Reviewed-by: lagergren, attila
author | hannesw |
---|---|
date | Mon, 04 Mar 2013 11:44:54 +0100 |
parents | 3b222c90b7de |
children | fe5211fc3114 |
files | src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java test/script/basic/JDK-8008370.js test/script/basic/JDK-8008370.js.EXPECTED |
diffstat | 3 files changed, 70 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Sat Mar 02 11:26:47 2013 -0400 +++ b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Mon Mar 04 11:44:54 2013 +0100 @@ -66,6 +66,9 @@ /** Are we currently inside a character class? */ private boolean inCharClass = false; + /** Are we currently inside a negated character class? */ + private boolean inNegativeClass = false; + private static final String NON_IDENT_ESCAPES = "$^*+(){}[]|\\.?"; private static class Capture { @@ -719,7 +722,12 @@ case 's': if (RegExpFactory.usesJavaUtilRegex()) { sb.setLength(sb.length() - 1); - sb.append('[').append(Lexer.getWhitespaceRegExp()).append(']'); + // No nested class required if we already are inside a character class + if (inCharClass) { + sb.append(Lexer.getWhitespaceRegExp()); + } else { + sb.append('[').append(Lexer.getWhitespaceRegExp()).append(']'); + } skip(1); return true; } @@ -727,7 +735,8 @@ case 'S': if (RegExpFactory.usesJavaUtilRegex()) { sb.setLength(sb.length() - 1); - sb.append("[^").append(Lexer.getWhitespaceRegExp()).append(']'); + // In negative class we must use intersection to get double negation ("not anything else than space") + sb.append(inNegativeClass ? "&&[" : "[^").append(Lexer.getWhitespaceRegExp()).append(']'); skip(1); return true; } @@ -759,6 +768,7 @@ commit(1); if (ch0 == '^') { + inNegativeClass = true; commit(1); } @@ -768,6 +778,7 @@ } } finally { inCharClass = false; // no nested character classes in JavaScript + inNegativeClass = false; } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8008370.js Mon Mar 04 11:44:54 2013 +0100 @@ -0,0 +1,44 @@ +/* + * 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-8008370: coffee script compiler doesn't work with Nashorn + * + * @test + * @run + */ + +print(/\sx/.exec(" x")); +print(/[a\s]x/.exec(" x")); +print(/[a\s]x/.exec("ax")); +print(/[^a\s]x/.exec("bx")); +print(/[^a\s]x/.exec("ax")); +print(/[^a\s]x/.exec(" x")); + +print(/\Sx/.exec("ax")); +print(/[a\S]x/.exec("ax")); +print(/[a\S]x/.exec("xx")); +print(/[^a\S]x/.exec("ax")); +print(/[^a\S]x/.exec("bx")); +print(/[^\n\S]x/.exec(" x")); +print(/[^ \S]x/.exec(" x"));