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

Back out everything since 5435ee09cf7b. Tinderbox compilers hate me. r=epic-fail

Browse Source
This commit is contained in:
Jeff Walden
2011-10-12 12:21:53 -07:00
parent 5de74dc5b1
commit c5e5f873d1
311 changed files with 1334 additions and 2251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/jsarray.cpp
View File

@@ -245,7 +245,7 @@ BigIndexToId(JSContext *cx, JSObject *obj, jsuint index, JSBool createAtom,
JS_ASSERT(index > JSID_INT_MAX);
jschar buf[10];
jschar *start = ArrayEnd(buf);
jschar *start = JS_ARRAY_END(buf);
do {
--start;
*start = (jschar)('0' + index % 10);
@@ -261,13 +261,13 @@ BigIndexToId(JSContext *cx, JSObject *obj, jsuint index, JSBool createAtom,
*/
JSAtom *atom;
if (!createAtom && (obj->isSlowArray() || obj->isArguments() || obj->isObject())) {
atom = js_GetExistingStringAtom(cx, start, ArrayEnd(buf) - start);
atom = js_GetExistingStringAtom(cx, start, JS_ARRAY_END(buf) - start);
if (!atom) {
*idp = JSID_VOID;
return JS_TRUE;
}
} else {
atom = js_AtomizeChars(cx, start, ArrayEnd(buf) - start);
atom = js_AtomizeChars(cx, start, JS_ARRAY_END(buf) - start);
if (!atom)
return JS_FALSE;
}
@@ -391,7 +391,7 @@ GetElement(JSContext *cx, JSObject *obj, jsdouble index, JSBool *hole, Value *vp
JSObject *obj2;
JSProperty *prop;
if (!obj->lookupGeneric(cx, idr.id(), &obj2, &prop))
if (!obj->lookupProperty(cx, idr.id(), &obj2, &prop))
return JS_FALSE;
if (!prop) {
*hole = JS_TRUE;
@@ -713,8 +713,8 @@ IsDenseArrayId(JSContext *cx, JSObject *obj, jsid id)
}
static JSBool
array_lookupGeneric(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
JSProperty **propp)
array_lookupProperty(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
JSProperty **propp)
{
if (!obj->isDenseArray())
return js_LookupProperty(cx, obj, id, objp, propp);
@@ -731,14 +731,7 @@ array_lookupGeneric(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
*propp = NULL;
return JS_TRUE;
}
return proto->lookupGeneric(cx, id, objp, propp);
}
static JSBool
array_lookupProperty(JSContext *cx, JSObject *obj, PropertyName *name, JSObject **objp,
JSProperty **propp)
{
return array_lookupGeneric(cx, obj, ATOM_TO_JSID(name), objp, propp);
return proto->lookupProperty(cx, id, objp, propp);
}
static JSBool
@@ -766,7 +759,7 @@ static JSBool
array_lookupSpecial(JSContext *cx, JSObject *obj, SpecialId sid, JSObject **objp,
JSProperty **propp)
{
return array_lookupGeneric(cx, obj, SPECIALID_TO_JSID(sid), objp, propp);
return array_lookupProperty(cx, obj, SPECIALID_TO_JSID(sid), objp, propp);
}
JSBool
@@ -1234,7 +1227,7 @@ Class js::ArrayClass = {
array_trace, /* trace */
JS_NULL_CLASS_EXT,
{
array_lookupGeneric,
array_lookupProperty,
array_lookupProperty,
array_lookupElement,
array_lookupSpecial,