infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-07 17:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

8006755: Functions inside with statements dont get correct scope

Browse Source 
Reviewed-by: lagergren, attila
This commit is contained in:
Athijegannathan Sundararajan 2013-01-24 17:49:03 +05:30
parent 67db0ba236
commit d3f071dc73
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nashorn/src/jdk/nashorn/internal/parser/Parser.java
View File

@ -2495,7 +2495,7 @@ loop:
final FunctionNode functionNode = functionBody(functionToken, name, parameters, FunctionNode.Kind.NORMAL);
if (isStatement) {
if (isStatement && !isInWithBlock()) {
functionNode.setIsStatement();
}
@ -2544,7 +2544,14 @@ loop:
}
if (isStatement) {
functionNode.setFunctionVarNode(new VarNode(source, functionToken, finish, name, referenceNode), lineNumber);
final VarNode var = new VarNode(source, functionToken, finish, name, referenceNode);
if (isInWithBlock()) {
function.addDeclaration(var);
// Add to current block.
block.addStatement(var);
} else {
functionNode.setFunctionVarNode(var, lineNumber);
}
}
return referenceNode;

41
nashorn/test/script/basic/JDK-8006755.js Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (c) 2010, 2013, 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-8006755: Functions inside with statements dont get correct scope
*
* @test
* @run
*/
var scope = { x: "hello" };
with (scope) {
function main() {
if (x != "hello") {
fail("x != 'hello'");
}
}
}
main()