Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-06 14:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ECMA handling of undefined args for call & apply.

Browse Source
This commit is contained in:
rogerl%netscape.com 1999-10-27 22:17:05 +00:00
parent 32feff141e
commit 59bbd1a9d3
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/rhino/org/mozilla/javascript/NativeFunction.java
View File

@ -919,9 +919,21 @@ public class NativeFunction extends ScriptableObject implements Function {
return jsFunction_call(cx, thisObj, args, funObj);
Object val = thisObj.getDefaultValue(ScriptRuntime.FunctionClass);
Scriptable newThis = args[0] == null
? null
? ScriptableObject.getTopLevelScope(thisObj)
: ScriptRuntime.toObject(funObj, args[0]);
Object[] newArgs = cx.getElements((Scriptable) args[1]);
Object[] newArgs;
if (args.length > 1) {
if ((args[1] instanceof NativeArray)
|| (args[1] instanceof Arguments))
newArgs = cx.getElements((Scriptable) args[1]);
else
throw NativeGlobal.constructError(
cx, "TypeError",
ScriptRuntime.getMessage("msg.arg.isnt.array", null),
thisObj);
}
else
newArgs = new Object[0];
return ScriptRuntime.call(cx, val, newThis, newArgs);
}
@ -941,7 +953,7 @@ public class NativeFunction extends ScriptableObject implements Function {
ScriptRuntime.emptyArgs);
} else {
Scriptable newThis = args[0] == null
? null
? ScriptableObject.getTopLevelScope(thisObj)
: ScriptRuntime.toObject(funObj, args[0]);
Object[] newArgs = new Object[args.length - 1];

18
js/rhino/src/org/mozilla/javascript/NativeFunction.java
View File

@ -919,9 +919,21 @@ public class NativeFunction extends ScriptableObject implements Function {
return jsFunction_call(cx, thisObj, args, funObj);
Object val = thisObj.getDefaultValue(ScriptRuntime.FunctionClass);
Scriptable newThis = args[0] == null
? null
? ScriptableObject.getTopLevelScope(thisObj)
: ScriptRuntime.toObject(funObj, args[0]);
Object[] newArgs = cx.getElements((Scriptable) args[1]);
Object[] newArgs;
if (args.length > 1) {
if ((args[1] instanceof NativeArray)
|| (args[1] instanceof Arguments))
newArgs = cx.getElements((Scriptable) args[1]);
else
throw NativeGlobal.constructError(
cx, "TypeError",
ScriptRuntime.getMessage("msg.arg.isnt.array", null),
thisObj);
}
else
newArgs = new Object[0];
return ScriptRuntime.call(cx, val, newThis, newArgs);
}
@ -941,7 +953,7 @@ public class NativeFunction extends ScriptableObject implements Function {
ScriptRuntime.emptyArgs);
} else {
Scriptable newThis = args[0] == null
? null
? ScriptableObject.getTopLevelScope(thisObj)
: ScriptRuntime.toObject(funObj, args[0]);
Object[] newArgs = new Object[args.length - 1];