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

Timestamp:

Oct 5, 2005, 1:05:44 AM (20 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Eric.

• fixed <rdar://problem/4260481> Remove Reference type from JavaScriptCore

Also fixed some bugs with for..in enumeration while I was at it. object
properties now come before prototype properties and duplicates
between object and prototype are listed only once.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/IdentifierSequencedSet.cpp: Added. (KJS::IdentifierSequencedSet::IdentifierSequencedSet): (KJS::IdentifierSequencedSet::deallocateVector): (KJS::IdentifierSequencedSet::~IdentifierSequencedSet): (KJS::IdentifierSequencedSet::insert):
• kjs/IdentifierSequencedSet.h: Added. (KJS::IdentifierSequencedSetIterator::IdentifierSequencedSetIterator): (KJS::IdentifierSequencedSetIterator::operator*): (KJS::IdentifierSequencedSetIterator::operator->): (KJS::IdentifierSequencedSetIterator::operator++): (KJS::IdentifierSequencedSetIterator::operator==): (KJS::IdentifierSequencedSetIterator::operator!=): (KJS::IdentifierSequencedSet::begin): (KJS::IdentifierSequencedSet::end): (KJS::IdentifierSequencedSet::size):
• kjs/array_instance.h:
• kjs/array_object.cpp: (ArrayInstanceImp::getPropertyNames): (ArrayInstanceImp::setLength): (ArrayInstanceImp::pushUndefinedObjectsToEnd):
• kjs/nodes.cpp: (ForInNode::execute):
• kjs/nodes.h:
• kjs/object.cpp: (KJS::ObjectImp::getPropertyNames):
• kjs/object.h:
• kjs/property_map.cpp: (KJS::PropertyMap::getEnumerablePropertyNames): (KJS::PropertyMap::getSparseArrayPropertyNames):
• kjs/property_map.h:
• kjs/protect.h:
• kjs/protected_reference.h: Removed.
• kjs/reference.cpp: Removed.
• kjs/reference.h: Removed.
• kjs/reference_list.cpp: Removed.
• kjs/reference_list.h: Removed.
• kjs/ustring.h: (KJS::UString::impl):
• kxmlcore/HashSet.h:

LayoutTests:

Reviewed by Eric.

• test case for some fixes I made to for..in enumeration. object properties now come before prototype properties and duplicates between object and prototype are listed only once.

• fast/js/for-in-expected.txt: Added.
• fast/js/for-in.html: Added.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -29 +29 @@
 #include "object.h"
 #include "operations.h"
-#include "reference_list.h"
 #include "types.h"
 #include "value.h"
+#include "IdentifierSequencedSet.h"
 
 #include "array_object.lut.h"
@@ -186 +186 @@
 }
 
-ReferenceList ArrayInstanceImp::propList(ExecState *exec, bool recursive)
-{
-  ReferenceList properties = ObjectImp::propList(exec,recursive);
-
+void ArrayInstanceImp::getPropertyNames(ExecState *exec, IdentifierSequencedSet& propertyNames)
+{
   // avoid fetching this every time through the loop
   ValueImp *undefined = jsUndefined();
@@ -195 +193 @@
   for (unsigned i = 0; i < storageLength; ++i) {
     ValueImp *imp = storage[i];
-    if (imp && imp != undefined) {
-      properties.append(Reference(this, i));
-    }
-  }
-  return properties;
+    if (imp && imp != undefined)
+      propertyNames.insert(Identifier::from(i));
+  }
+
+  ObjectImp::getPropertyNames(exec, propertyNames);
 }
 
@@ -231 +229 @@
 
   if (newLength < length) {
-    ReferenceList sparseProperties;
-    
-    _prop.addSparseArrayPropertiesToReferenceList(sparseProperties, this);
-    
-    ReferenceListIterator it = sparseProperties.begin();
-    while (it != sparseProperties.end()) {
-      Reference ref = it++;
+    IdentifierSequencedSet sparseProperties;
+    
+    _prop.getSparseArrayPropertyNames(sparseProperties);
+
+    IdentifierSequencedSetIterator end = sparseProperties.end();
+    
+    for (IdentifierSequencedSetIterator it = sparseProperties.begin(); it != end; ++it) {
+      Identifier name = *it;
       bool ok;
-      unsigned index = ref.getPropertyName(exec).toArrayIndex(&ok);
-      if (ok && index > newLength) {
-        ref.deleteValue(exec);
-      }
+      unsigned index = name.toArrayIndex(&ok);
+      if (ok && index > newLength)
+        deleteProperty(exec, name);
     }
   }
@@ -349 +347 @@
     }
     
-    ReferenceList sparseProperties;
-    _prop.addSparseArrayPropertiesToReferenceList(sparseProperties, this);
-    unsigned newLength = o + sparseProperties.length();
-
-    if (newLength > storageLength) {
+    IdentifierSequencedSet sparseProperties;
+    _prop.getSparseArrayPropertyNames(sparseProperties);
+    unsigned newLength = o + sparseProperties.size();
+
+    if (newLength > storageLength)
       resizeStorage(newLength);
-    } 
-
-    ReferenceListIterator it = sparseProperties.begin();
-    while (it != sparseProperties.end()) {
-      Reference ref = it++;
-      storage[o] = ref.getValue(exec);
-      ObjectImp::deleteProperty(exec, ref.getPropertyName(exec));
+
+    IdentifierSequencedSetIterator end = sparseProperties.end();
+    for (IdentifierSequencedSetIterator it = sparseProperties.begin(); it != end; ++it) {
+      Identifier name = *it;
+      storage[o] = get(exec, name);
+      ObjectImp::deleteProperty(exec, name);
       o++;
     }