Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/parser/TokenType.java	Wed Jul 03 13:13:17 2013 +0530
     1.2 +++ b/src/jdk/nashorn/internal/parser/TokenType.java	Wed Jul 03 14:08:00 2013 +0530
     1.3 @@ -93,7 +93,7 @@
     1.4      ASSIGN_BIT_OR  (BINARY,  "|=",    2, false),
     1.5      OR             (BINARY,  "||",    4, true),
     1.6      RBRACE         (BRACKET, "}"),
     1.7 -    BIT_NOT        (BINARY,  "~",    14, false),
     1.8 +    BIT_NOT        (UNARY,   "~",     14, false),
     1.9  
    1.10      // ECMA 7.6.1.1 Keywords, 7.6.1.2 Future Reserved Words.
    1.11      // All other Java keywords are commented out.

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8019791.js	Wed Jul 03 14:08:00 2013 +0530
     2.3 @@ -0,0 +1,50 @@
     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-8019791: ~ is a unary operator
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +// Used to crash instead of SyntaxError
    2.35 +try {
    2.36 +    eval('"" ~ ""');
    2.37 +    print("FAILED: SyntaxError expected for: \"\" ~ \"\"");
    2.38 +} catch (e) {
    2.39 +    print(e.toString().replace(/\\/g, '/'));
    2.40 +}
    2.41 +
    2.42 +// Used to crash instead of SyntaxError
    2.43 +try {
    2.44 +    eval("function() { if (1~0) return 0; return 1 }");
    2.45 +    print("FAILED: SyntaxError expected for: if (1~0) ");
    2.46 +} catch (e) {
    2.47 +    print(e.toString().replace(/\\/g, '/'));
    2.48 +}
    2.49 +
    2.50 +// The following are valid, but used to crash
    2.51 +Function("0 \n ~ 2 \n ~ 1")();
    2.52 +
    2.53 +Function("~ ~ 0 \n ~ ~ 1")();

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8019791.js.EXPECTED	Wed Jul 03 14:08:00 2013 +0530
     3.3 @@ -0,0 +1,6 @@
     3.4 +SyntaxError: test/script/basic/JDK-8019791.js#33<eval>:1:3 Expected ; but found ~
     3.5 +"" ~ ""
     3.6 +   ^
     3.7 +SyntaxError: test/script/basic/JDK-8019791.js#41<eval>:1:18 Expected ) but found ~
     3.8 +function() { if (1~0) return 0; return 1 }
     3.9 +                  ^