corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge MC -> JM

Browse Source
This commit is contained in:
Brian Hackett
2011-09-30 07:01:18 -07:00
parent b439cc7992 abdcd21db9
commit c85845ba0d
3851 changed files with 50526 additions and 47885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
js/src/jsarray.cpp
View File

@@ -133,7 +133,6 @@
#include "jsarrayinlines.h"
#include "jsatominlines.h"
#include "jscntxtinlines.h"
#include "jsinterpinlines.h"
#include "jsobjinlines.h"
#include "jsscopeinlines.h"
#include "jscntxtinlines.h"
@@ -1433,13 +1432,12 @@ array_toSource(JSContext *cx, uintN argc, Value *vp)
{
JS_CHECK_RECURSION(cx, return false);
JSObject *obj = ToObject(cx, &vp[1]);
CallArgs args = CallArgsFromVp(argc, vp);
JSObject *obj = ToObject(cx, &args.thisv());
if (!obj)
return false;
if (!obj->isArray()) {
ReportIncompatibleMethod(cx, vp, &ArrayClass);
return false;
}
if (!obj->isArray())
return HandleNonGenericMethodClassMismatch(cx, args, &ArrayClass);
ArraySharpDetector detector(cx);
if (!detector.init(obj))
@@ -1511,7 +1509,7 @@ array_toSource(JSContext *cx, uintN argc, Value *vp)
if (!str)
return false;
JS_SET_RVAL(cx, vp, StringValue(str));
args.rval().setString(str);
return true;
}
#endif
@@ -2885,15 +2883,15 @@ array_concat(JSContext *cx, uintN argc, Value *vp)
return false;
const Value &v = p[i];
if (v.isObject()) {
aobj = &v.toObject();
if (aobj->isArray() || (aobj->isWrapper() && aobj->unwrap()->isArray())) {
JSObject &obj = v.toObject();
if (ObjectClassIs(obj, ESClass_Array, cx)) {
jsuint alength;
if (!js_GetLengthProperty(cx, aobj, &alength))
if (!js_GetLengthProperty(cx, &obj, &alength))
return false;
for (uint32 slot = 0; slot < alength; slot++) {
JSBool hole;
Value tmp;
if (!JS_CHECK_OPERATION_LIMIT(cx) || !GetElement(cx, aobj, slot, &hole, &tmp))
if (!JS_CHECK_OPERATION_LIMIT(cx) || !GetElement(cx, &obj, slot, &hole, &tmp))
return false;
/*
@@ -3333,11 +3331,11 @@ array_every(JSContext *cx, uintN argc, Value *vp)
static JSBool
array_isArray(JSContext *cx, uintN argc, Value *vp)
{
JSObject *obj;
vp->setBoolean(argc > 0 &&
vp[2].isObject() &&
((obj = &vp[2].toObject())->isArray() ||
(obj->isWrapper() && obj->unwrap()->isArray())));
CallArgs args = CallArgsFromVp(argc, vp);
bool isArray = args.length() > 0 &&
args[0].isObject() &&
ObjectClassIs(args[0].toObject(), ESClass_Array, cx);
args.rval().setBoolean(isArray);
return true;
}