From 242e864599b3b8c6f3bd36cdd6f5e60ec91355b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 4 Mar 2013 11:44:54 +0100
Subject: [PATCH] 8008370: coffee script compiler doesn't work with Nashorn

Reviewed-by: lagergren, attila
---
 .../runtime/regexp/RegExpScanner.java         | 15 ++++++-
 nashorn/test/script/basic/JDK-8008370.js      | 44 +++++++++++++++++++
 .../test/script/basic/JDK-8008370.js.EXPECTED | 13 ++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8008370.js
 create mode 100644 nashorn/test/script/basic/JDK-8008370.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
index 55f323dd71b..b579865b693 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
@@ -66,6 +66,9 @@ final class RegExpScanner extends Scanner {
     /** 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 @@ final class RegExpScanner extends Scanner {
         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 @@ final class RegExpScanner extends Scanner {
         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 @@ final class RegExpScanner extends Scanner {
                 commit(1);
 
                 if (ch0 == '^') {
+                    inNegativeClass = true;
                     commit(1);
                 }
 
@@ -768,6 +778,7 @@ final class RegExpScanner extends Scanner {
                 }
             } finally {
                 inCharClass = false;  // no nested character classes in JavaScript
+                inNegativeClass = false;
             }
         }
 
diff --git a/nashorn/test/script/basic/JDK-8008370.js b/nashorn/test/script/basic/JDK-8008370.js
new file mode 100644
index 00000000000..5e05becb317
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008370.js
@@ -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"));
diff --git a/nashorn/test/script/basic/JDK-8008370.js.EXPECTED b/nashorn/test/script/basic/JDK-8008370.js.EXPECTED
new file mode 100644
index 00000000000..42269b453ef
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008370.js.EXPECTED
@@ -0,0 +1,13 @@
+ x
+ x
+ax
+bx
+null
+null
+ax
+ax
+xx
+null
+null
+ x
+null