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

Changed array length handling.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@142670 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
2003-05-20 22:51:51 +00:00
parent 4b0a7cb9ab
commit e86532ffbc
4 changed files with 88 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/js2/src/js2array.cpp
View File

@@ -59,32 +59,26 @@ namespace MetaData {
uint32 getLength(JS2Metadata *meta, JS2Object *obj)
{
uint32 length = 0;
js2val result;
JS2Class *c = meta->objectType(obj);
js2val val = OBJECT_TO_JS2VAL(obj);
if (c->ReadPublic(meta, &val, meta->engine->length_StringAtom, RunPhase, &result))
length = toUInt32(meta->toInteger(result));
if ((obj->kind == SimpleInstanceKind)
&& (checked_cast<SimpleInstance *>(obj)->type == meta->arrayClass)) {
length = toUInt32(meta->toInteger(Array_lengthGet(meta, OBJECT_TO_JS2VAL(obj), NULL, 0)));
}
else {
js2val result;
JS2Class *c = meta->objectType(obj);
js2val val = OBJECT_TO_JS2VAL(obj);
if (c->ReadPublic(meta, &val, meta->engine->length_StringAtom, RunPhase, &result))
length = toUInt32(meta->toInteger(result));
}
return length;
}
js2val setLength(JS2Metadata *meta, JS2Object *obj, uint32 newLength)
{
js2val result = meta->engine->allocNumber(newLength);
// XXX maybe should have setArrayLength as a specialization
if ((obj->kind == SimpleInstanceKind)
&& (checked_cast<SimpleInstance *>(obj)->type == meta->arrayClass)) {
uint32 length = getLength(meta, obj);
if (newLength < length) {
// need to delete all the elements above the new length
bool deleteResult;
JS2Class *c = meta->objectType(obj);
for (uint32 i = newLength; i < length; i++) {
c->DeletePublic(meta, OBJECT_TO_JS2VAL(obj), meta->engine->numberToString(i), &deleteResult);
}
}
Multiname *mn = new Multiname(meta->engine->length_StringAtom, meta->publicNamespace);
DEFINE_ROOTKEEPER(rk, mn);
meta->arrayClass->Write(meta, OBJECT_TO_JS2VAL(obj), mn, meta->env, true, result, false);
Array_lengthSet(meta, OBJECT_TO_JS2VAL(obj), &result, 1);
}
else {
JS2Class *c = meta->objectType(obj);