Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

In ScriptableObject.callMethod use object itself as possible top scope source for to support of dynamic scoping.

Browse Source
This commit is contained in:
igor%mir2.org 2004-09-27 12:08:24 +00:00
parent 2490dd1652
commit e75e7213d3
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
View File

@ -1739,7 +1739,7 @@ public class ScriptRuntime {
String name)
{
if (cx.useDynamicScope) {
scope = locateDynamicScope(cx, scope);
scope = checkDynamicScope(cx.topCallScope, scope);
}
return ScriptableObject.getProperty(scope, name);
}
@ -1798,7 +1798,7 @@ public class ScriptRuntime {
}
// scope here is top scope
if (cx.useDynamicScope) {
scope = locateDynamicScope(cx, scope);
scope = checkDynamicScope(cx.topCallScope, scope);
}
if (ScriptableObject.hasProperty(scope, id)) {
return scope;
@ -1828,7 +1828,7 @@ public class ScriptRuntime {
// Find the top scope by walking up the scope chain.
bound = ScriptableObject.getTopLevelScope(scope);
if (cx.useDynamicScope) {
bound = locateDynamicScope(cx, bound);
bound = checkDynamicScope(cx.topCallScope, bound);
}
bound.put(id, bound, value);
}
@ -2854,22 +2854,27 @@ public class ScriptRuntime {
return result;
}
private static Scriptable locateDynamicScope(Context cx, Scriptable scope)
/**
* Return <tt>possibleDynamicScope</tt> if <tt>staticTopScope</tt>
* is present on its prototype chain and return <tt>staticTopScope</tt>
* otherwise.
* Should only be called when <tt>staticTopScope</tt> is top scope.
*/
static Scriptable checkDynamicScope(Scriptable possibleDynamicScope,
Scriptable staticTopScope)
{
// Return cx.topCallScope if scope is present on its prototype chain
// and return scope otherwise.
// Should only be called when scope is top scope.
if (cx.topCallScope == scope) {
return scope;
// Return cx.topCallScope if scope
if (possibleDynamicScope == staticTopScope) {
return possibleDynamicScope;
}
Scriptable proto = cx.topCallScope;
Scriptable proto = possibleDynamicScope;
for (;;) {
proto = proto.getPrototype();
if (proto == scope) {
return cx.topCallScope;
if (proto == staticTopScope) {
return possibleDynamicScope;
}
if (proto == null) {
return scope;
return staticTopScope;
}
}
}

8
js/rhino/src/org/mozilla/javascript/ScriptableObject.java
View File

@ -1482,7 +1482,13 @@ public abstract class ScriptableObject implements Scriptable, Serializable,
throw ScriptRuntime.notFunctionError(obj, methodName);
}
Function fun = (Function)funObj;
Scriptable scope = fun.getParentScope();
Scriptable scope = ScriptableObject.getTopLevelScope(fun);
// XXX: The following is only necessary for dynamic scope setup,
// but to check for that Context instance is required.
// Since it should not harm non-dynamic scope setup, do it always
// for now.
Scriptable dynamicScope = ScriptableObject.getTopLevelScope(obj);
scope = ScriptRuntime.checkDynamicScope(dynamicScope, scope);
if (cx != null) {
return fun.call(cx, scope, obj, args);
} else {