Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/parser/Parser.java	Tue Apr 01 11:44:05 2014 -0700
     1.2 +++ b/src/jdk/nashorn/internal/parser/Parser.java	Wed Apr 02 15:52:31 2014 +0530
     1.3 @@ -1700,9 +1700,11 @@
     1.4                  // ECMA 12.4.1 strict mode restrictions
     1.5                  verifyStrictIdent(exception, "catch argument");
     1.6  
     1.7 -                // Check for conditional catch.
     1.8 +                // Nashorn extension: catch clause can have optional
     1.9 +                // condition. So, a single try can have more than one
    1.10 +                // catch clause each with it's own condition.
    1.11                  final Expression ifExpression;
    1.12 -                if (type == IF) {
    1.13 +                if (!env._no_syntax_extensions && type == IF) {
    1.14                      next();
    1.15                      // Get the exception condition.
    1.16                      ifExpression = expression();

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/error/JDK-8039047.js	Wed Apr 02 15:52:31 2014 +0530
     2.3 @@ -0,0 +1,35 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, 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-8039047: Parser accepts conditional catch clauses even when --no-syntax-extensions / -nse option is passed
    2.29 + *
    2.30 + * @option --no-syntax-extensions
    2.31 + * @test/compile-error
    2.32 + */
    2.33 +
    2.34 +try {
    2.35 +    func()
    2.36 +} catch (e if e instanceof ReferenceError) {
    2.37 +    print("Got ReferenceError " + e);
    2.38 +}

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/error/JDK-8039047.js.EXPECTED	Wed Apr 02 15:52:31 2014 +0530
     3.3 @@ -0,0 +1,6 @@
     3.4 +test/script/error/JDK-8039047.js:33:11 Expected ) but found if
     3.5 +} catch (e if e instanceof ReferenceError) {
     3.6 +           ^
     3.7 +test/script/error/JDK-8039047.js:35:0 Expected eof but found }
     3.8 +}
     3.9 +^