Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/parser/Parser.java	Fri Jun 05 20:34:23 2015 +0530
     1.2 +++ b/src/jdk/nashorn/internal/parser/Parser.java	Mon Jun 08 13:57:44 2015 +0530
     1.3 @@ -2635,8 +2635,12 @@
     1.4              name = getIdent();
     1.5              verifyStrictIdent(name, "function name");
     1.6          } else if (isStatement) {
     1.7 -            // Nashorn extension: anonymous function statements
     1.8 -            if (env._no_syntax_extensions) {
     1.9 +            // Nashorn extension: anonymous function statements.
    1.10 +            // Do not allow anonymous function statement if extensions
    1.11 +            // are now allowed. But if we are reparsing then anon function
    1.12 +            // statement is possible - because it was used as function
    1.13 +            // expression in surrounding code.
    1.14 +            if (env._no_syntax_extensions && reparsedFunction == null) {
    1.15                  expect(IDENT);
    1.16              }
    1.17          }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8085802.js	Mon Jun 08 13:57:44 2015 +0530
     2.3 @@ -0,0 +1,35 @@
     2.4 +/*
     2.5 + * Copyright (c) 2015 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-8085802: Nashorn -nse option causes parse error on anonymous function definition
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + * @option -nse
    2.33 + */
    2.34 +
    2.35 +// even with -nse passed, the following should run fine
    2.36 +// because anonymous function is used as expression here
    2.37 +
    2.38 +(function (){})()