Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing http://bugzilla.mozilla.org/show_bug.cgi?id=181834

Browse Source 
Ignore dynamic scope flag for nested functions and functions defined inside with statements


git-svn-id: svn://10.0.0.236/trunk@135306 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
igor%mir2.org 2002-12-14 18:56:27 +00:00
parent fb773edd89
commit 037e9fa97c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java
View File

@ -1517,7 +1517,16 @@ public class Interpreter {
fn.setPrototype(ScriptableObject.getFunctionPrototype(scope));
fn.setParentScope(scope);
if (cx.hasCompileFunctionsWithDynamicScope()) {
fn.itsUseDynamicScope = true;
// Nested functions are not affected by the dynamic scope flag
// as dynamic scope is already a parent of their scope
// Functions defined under the with statement also immune to
// this setup, in which case dynamic scope is ignored in favor
// of with object.
if (!(scope instanceof NativeCall
|| scope instanceof NativeWith))
{
fn.itsUseDynamicScope = true;
}
}
String fnName = idata.itsName;
if (fnName.length() != 0) {
@ -2438,10 +2447,8 @@ public class Interpreter {
case TokenStream.CLOSURE : {
int i = getIndex(iCode, pc + 1);
InterpreterData closureData = idata.itsNestedFunctions[i];
InterpretedFunction closure = createFunction(cx, scope, closureData,
idata.itsFromEvalCode);
closure.itsUseDynamicScope = false;
stack[++stackTop] = closure;
stack[++stackTop] = createFunction(cx, scope, closureData,
idata.itsFromEvalCode);
pc += 2;
break;
}