Changeset 1822 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp

Timestamp:

Aug 14, 2002, 8:19:38 PM (23 years ago)

Author:

mjs

Message:

Simplified array handling by using NULL to represent empty cells
instead of the Undefined object, so we can use calloc, realloc and
memset instead of loops. Inspired by a suggestion of Darin's.

• kjs/array_object.cpp: (ArrayInstanceImp::ArrayInstanceImp): (ArrayInstanceImp::~ArrayInstanceImp): (ArrayInstanceImp::get): (ArrayInstanceImp::hasProperty): (ArrayInstanceImp::deleteProperty): (ArrayInstanceImp::setLength): (ArrayInstanceImp::mark):

File:

• trunk/JavaScriptCore/kjs/array_object.cpp (modified) (10 diffs)

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -44 +44 @@
   , length(initialLength)
   , capacity(length)
-  , storage(length ? new (ValueImp *)[length] : 0)
-{
-  unsigned l = length;
-  for (unsigned i = 0; i < l; ++i) {
-    storage[i] = Undefined().imp();
-  }
+  , storage(length ? (ValueImp **)calloc(length, sizeof(ValueImp *)) : 0)
+{
 }
 
@@ -67 +63 @@
 ArrayInstanceImp::~ArrayInstanceImp()
 {
-  delete [] storage;
+  free (storage);
 }
 
@@ -78 +74 @@
   unsigned index = propertyName.toULong(&ok);
   if (ok) {
-    if (index >= length)
+    if (index >= length || storage[index] == NULL)
       return Undefined();
     return Value(storage[index]);
@@ -88 +84 @@
 Value ArrayInstanceImp::get(ExecState *exec, unsigned index) const
 {
-  if (index >= length)
+  if (index >= length || storage[index] == NULL)
     return Undefined();
   return Value(storage[index]);
@@ -128 +124 @@
     if (index >= length)
       return false;
-    return storage[index]->type() != UndefinedType;
+    return storage[index] != NULL && storage[index]->type() != UndefinedType;
   }
   
@@ -138 +134 @@
   if (index >= length)
     return false;
-  return storage[index]->type() != UndefinedType;
+  return storage[index] != NULL && storage[index]->type() != UndefinedType;
 }
 
@@ -151 +147 @@
     if (index >= length)
       return true;
-    storage[index] = Undefined().imp();
+    storage[index] = NULL;
     return true;
   }
@@ -162 +158 @@
   if (index >= length)
     return true;
-  storage[index] = Undefined().imp();
+  storage[index] = NULL;
   return true;
 }
@@ -169 +165 @@
 {
   if (newLength < length) {
-    const unsigned l = length;
-    for (unsigned i = newLength; i < l; ++i)
-      storage[i] = Undefined().imp();
+    memset(storage + newLength, 0, sizeof(ValueImp *) * (length - newLength));
   }
   if (newLength > capacity) {
     unsigned newCapacity = (newLength * 3 + 1) / 2;
-    ValueImp **newStorage = new (ValueImp *)[newCapacity];
-    const unsigned l = length;
-    for (unsigned i = 0; i < l; ++i)
-      newStorage[i] = storage[i];
-    for (unsigned i = l; i < newLength; i++)
-      newStorage[i] = Undefined().imp();
-    delete [] storage;
-    storage = newStorage;
+    storage = (ValueImp **)realloc(storage, newCapacity * sizeof (ValueImp *));
+    memset(storage + capacity, 0, sizeof(ValueImp *) * (newCapacity - capacity));
     capacity = newCapacity;
   }
@@ -194 +182 @@
   for (unsigned i = 0; i < l; ++i) {
     ValueImp *imp = storage[i];
-    if (!imp->marked())
+    if (imp != NULL && !imp->marked())
       imp->mark();
   }