Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/parser/Parser.java	Fri Jun 28 19:36:26 2013 +0530
     1.2 +++ b/src/jdk/nashorn/internal/parser/Parser.java	Mon Jul 01 12:38:01 2013 +0530
     1.3 @@ -767,8 +767,6 @@
     1.4          case LBRACE:
     1.5              block();
     1.6              break;
     1.7 -        case RBRACE:
     1.8 -            break;
     1.9          case VAR:
    1.10              variableStatement(true);
    1.11              break;
    1.12 @@ -1267,6 +1265,7 @@
    1.13          case RBRACE:
    1.14          case SEMICOLON:
    1.15          case EOL:
    1.16 +        case EOF:
    1.17              break;
    1.18  
    1.19          default:
    1.20 @@ -1314,6 +1313,7 @@
    1.21          case RBRACE:
    1.22          case SEMICOLON:
    1.23          case EOL:
    1.24 +        case EOF:
    1.25              break;
    1.26  
    1.27          default:
    1.28 @@ -1368,6 +1368,7 @@
    1.29          case RBRACE:
    1.30          case SEMICOLON:
    1.31          case EOL:
    1.32 +        case EOF:
    1.33              break;
    1.34  
    1.35          default:
    1.36 @@ -1403,6 +1404,7 @@
    1.37          case RBRACE:
    1.38          case SEMICOLON:
    1.39          case EOL:
    1.40 +        case EOF:
    1.41              break;
    1.42  
    1.43          default:
    1.44 @@ -2566,7 +2568,7 @@
    1.45                   */
    1.46  
    1.47                  // just expression as function body
    1.48 -                final Node expr = expression();
    1.49 +                final Node expr = assignmentExpression(true);
    1.50                  assert lc.getCurrentBlock() == lc.getFunctionBody(functionNode);
    1.51                  // create a return statement - this creates code in itself and does not need to be
    1.52                  // wrapped into an ExecuteNode

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8019473.js	Mon Jul 01 12:38:01 2013 +0530
     2.3 @@ -0,0 +1,62 @@
     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-8019473: Parser issues related to functions and blocks
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +function checkNoError(code) {
    2.35 +    try {
    2.36 +        Function(code);
    2.37 +    } catch (e) {
    2.38 +        print("no error expected for: " + code + " , got " + e);
    2.39 +    }
    2.40 +}
    2.41 +
    2.42 +// implicit newlines at EOF should be accepted
    2.43 +checkNoError("for(;;) continue")
    2.44 +checkNoError("return")
    2.45 +checkNoError("yield")
    2.46 +checkNoError("for(;;) break")
    2.47 +
    2.48 +function checkError(code) {
    2.49 +    try {
    2.50 +        eval(code);
    2.51 +        print("SyntaxError expected for: " + code);
    2.52 +    } catch (e) {
    2.53 +        if (! (e instanceof SyntaxError)) {
    2.54 +            fail("SyntaxError expected, got " + e);
    2.55 +        }
    2.56 +    }
    2.57 +}
    2.58 +
    2.59 +checkError("function f() { case0: }");
    2.60 +checkError("function f() { if(0) }");
    2.61 +checkError("function f() { if(0); else }");
    2.62 +checkError("function f() { while(0) }");
    2.63 +
    2.64 +// comma expression as closure expression
    2.65 +checkError("function sq(x) x, x*x");