changeset 408:4afdc5bec43b

8019791: ~ is a unary operator Reviewed-by: hannesw
author sundar
date Wed, 03 Jul 2013 14:08:00 +0530
parents 9d3a9fdab668
children 18d467e94150
files src/jdk/nashorn/internal/parser/TokenType.java test/script/basic/JDK-8019791.js test/script/basic/JDK-8019791.js.EXPECTED
diffstat 3 files changed, 57 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/parser/TokenType.java	Wed Jul 03 13:13:17 2013 +0530
+++ b/src/jdk/nashorn/internal/parser/TokenType.java	Wed Jul 03 14:08:00 2013 +0530
@@ -93,7 +93,7 @@
     ASSIGN_BIT_OR  (BINARY,  "|=",    2, false),
     OR             (BINARY,  "||",    4, true),
     RBRACE         (BRACKET, "}"),
-    BIT_NOT        (BINARY,  "~",    14, false),
+    BIT_NOT        (UNARY,   "~",     14, false),
 
     // ECMA 7.6.1.1 Keywords, 7.6.1.2 Future Reserved Words.
     // All other Java keywords are commented out.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8019791.js	Wed Jul 03 14:08:00 2013 +0530
@@ -0,0 +1,50 @@
+/*
+ * 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-8019791: ~ is a unary operator
+ *
+ * @test
+ * @run
+ */
+
+// Used to crash instead of SyntaxError
+try {
+    eval('"" ~ ""');
+    print("FAILED: SyntaxError expected for: \"\" ~ \"\"");
+} catch (e) {
+    print(e.toString().replace(/\\/g, '/'));
+}
+
+// Used to crash instead of SyntaxError
+try {
+    eval("function() { if (1~0) return 0; return 1 }");
+    print("FAILED: SyntaxError expected for: if (1~0) ");
+} catch (e) {
+    print(e.toString().replace(/\\/g, '/'));
+}
+
+// The following are valid, but used to crash
+Function("0 \n ~ 2 \n ~ 1")();
+
+Function("~ ~ 0 \n ~ ~ 1")();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8019791.js.EXPECTED	Wed Jul 03 14:08:00 2013 +0530
@@ -0,0 +1,6 @@
+SyntaxError: test/script/basic/JDK-8019791.js#33<eval>:1:3 Expected ; but found ~
+"" ~ ""
+   ^
+SyntaxError: test/script/basic/JDK-8019791.js#41<eval>:1:18 Expected ) but found ~
+function() { if (1~0) return 0; return 1 }
+                  ^