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

Timestamp:

Aug 14, 2002, 9:32:46 PM (23 years ago)

Author:

darin

Message:

Another pass of tweaks, including one bug fix.

• kjs/array_object.cpp: (ArrayInstanceImp::ArrayInstanceImp): Use malloc, not new. (ArrayInstanceImp::get): Use a local variable so we don't rely on the optimizer to avoid indexing twice. (ArrayInstanceImp::hasProperty): Use a local variable, and also check against UndefinedImp::staticUndefined rather than doing type() != UndefinedType.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -52 +52 @@
   , length(list.size())
   , capacity(length)
-  , storage(length ? new (ValueImp *)[length] : 0)
+  , storage(length ? (ValueImp **)malloc(sizeof(ValueImp *) * length) : 0)
 {
   ListIterator it = list.begin();
-  const unsigned l = length;
+  unsigned l = length;
   for (unsigned i = 0; i < l; ++i) {
     storage[i] = (it++).imp();
@@ -63 +63 @@
 ArrayInstanceImp::~ArrayInstanceImp()
 {
-  free (storage);
+  free(storage);
 }
 
@@ -74 +74 @@
   unsigned index = propertyName.toULong(&ok);
   if (ok) {
-    if (index >= length || storage[index] == NULL)
+    if (index >= length)
       return Undefined();
-    return Value(storage[index]);
+    ValueImp *v = storage[index];
+    return v ? Value(v) : Undefined();
   }
 
@@ -84 +85 @@
 Value ArrayInstanceImp::get(ExecState *exec, unsigned index) const
 {
-  if (index >= length || storage[index] == NULL)
+  if (index >= length)
     return Undefined();
-  return Value(storage[index]);
+  ValueImp *v = storage[index];
+  return v ? Value(v) : Undefined();
 }
 
@@ -124 +126 @@
     if (index >= length)
       return false;
-    return storage[index] != NULL && storage[index]->type() != UndefinedType;
+    ValueImp *v = storage[index];
+    return v && v != UndefinedImp::staticUndefined;
   }
   
@@ -134 +137 @@
   if (index >= length)
     return false;
-  return storage[index] != NULL && storage[index]->type() != UndefinedType;
+  ValueImp *v = storage[index];
+  return v && v != UndefinedImp::staticUndefined;
 }
 
@@ -147 +151 @@
     if (index >= length)
       return true;
-    storage[index] = NULL;
+    storage[index] = 0;
     return true;
   }
@@ -158 +162 @@
   if (index >= length)
     return true;
-  storage[index] = NULL;
+  storage[index] = 0;
   return true;
 }
@@ -179 +183 @@
 {
   ObjectImp::mark();
-  const unsigned l = length;
+  unsigned l = length;
   for (unsigned i = 0; i < l; ++i) {
     ValueImp *imp = storage[i];
-    if (imp != NULL && !imp->marked())
+    if (imp && !imp->marked())
       imp->mark();
   }