stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8185257: Nashorn AST is missing nodes when a for-loop contains a VariableDeclarationList

Browse Source 
Var declaration in for loop removed from block scope in es6 mode

Reviewed-by: hannesw, sundar
This commit is contained in:
Srinivas Dama 2017-09-26 07:00:43 +05:30 committed by Srinivas Dama
parent 551d0689ed
commit 2dc0eaaa4b
4 changed files with 96 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java
View File

@ -2053,10 +2053,18 @@ public class Parser extends AbstractParser implements Loggable {
if (outer != null) {
restoreBlock(outer);
if (body != null) {
List<Statement> statements = new ArrayList<>();
for (final Statement var : outer.getStatements()) {
if(var instanceof VarNode && !((VarNode)var).isBlockScoped()) {
appendStatement(var);
}else {
statements.add(var);
}
}
appendStatement(new BlockStatement(forLine, new Block(
outer.getToken(),
body.getFinish(),
outer.getStatements())));
statements)));
}
}
}

34
test/nashorn/script/basic/es6/JDK-8185257.js Normal file
View File

@ -0,0 +1,34 @@
/*
* Copyright (c) 2017, 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-8185257: Nashorn AST is missing nodes when a for-loop contains a VariableDeclarationList
*
* @test
* @run
* @fork
*/
var ASTVisitor = Java.type("jdk.nashorn.test.models.ES6ASTVisitor");
var testcode = "for (var i = 0; i < 100; i++) {\n print(i);\n}\n";
ASTVisitor.visit(testcode);

2
test/nashorn/script/basic/es6/JDK-8185257.js.EXPECTED Normal file
View File

@ -0,0 +1,2 @@
5-14 VARIABLE
0-44 FOR_LOOP

51
test/nashorn/src/jdk/nashorn/test/nashorn/models/ES6ASTVisitor.java Normal file
View File

@ -0,0 +1,51 @@
/*
* Copyright (c) 2017, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.nashorn.test.models;
import jdk.nashorn.api.tree.SimpleTreeVisitorES6;
import jdk.nashorn.api.tree.*;
public class ES6ASTVisitor{
public static void visit(String script) {
DiagnosticListener listener = (Diagnostic diag) -> { System.err.println(diag.toString()); };
Parser parser = Parser.create("--language=es6","--empty-statements");
Tree astRoot = parser.parse("unknown", script, listener);
astRoot.accept(new SimpleTreeVisitorES6<Boolean, Void>() {
@Override
public Boolean visitCompilationUnit(CompilationUnitTree stmt, Void none) {
for (Tree item : stmt.getSourceElements()) {
System.out.println(item.getStartPosition() + "-" + item.getEndPosition() + " " + item.getKind());
}
return super.visitCompilationUnit(stmt, none);
}
}, null);
}
}