Changeset 10744 in webkit for trunk/JavaScriptCore/kjs/property_map.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/property_map.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -26 +26 @@
 #include "object.h"
 #include "protect.h"
-#include "reference_list.h"
+#include "IdentifierSequencedSet.h"
 
 #include <algorithm>
@@ -75 +75 @@
 
 // lastIndexUsed is an ever-increasing index used to identify the order items
-// were inserted into the property map. It's vital that addEnumerablesToReferenceList
+// were inserted into the property map. It's vital that getEnumerablePropertyNames
 // return the properties in the order they were added for compatibility with other
 // browsers' JavaScript implementations.
@@ -567 +567 @@
 }
 
-void PropertyMap::addEnumerablesToReferenceList(ReferenceList &list, ObjectImp *base) const
+void PropertyMap::getEnumerablePropertyNames(IdentifierSequencedSet& propertyNames) const
 {
     if (!_table) {
@@ -573 +573 @@
         UString::Rep *key = _singleEntry.key;
         if (key && !(_singleEntry.attributes & DontEnum))
-            list.append(Reference(base, Identifier(key)));
+            propertyNames.insert(Identifier(key));
 #endif
         return;
@@ -599 +599 @@
     qsort(sortedEnumerables, p - sortedEnumerables, sizeof(sortedEnumerables[0]), comparePropertyMapEntryIndices);
 
-    // Put the keys of the sorted entries into the reference list.
+    // Put the keys of the sorted entries into the list.
     Entry **q = sortedEnumerables;
-    while (q != p)
-        list.append(Reference(base, Identifier((*q++)->key)));
+    while (q != p) {
+        propertyNames.insert(Identifier(q[0]->key));
+        ++q;
+    }
 
     // Deallocate the buffer.
@@ -609 +611 @@
 }
 
-void PropertyMap::addSparseArrayPropertiesToReferenceList(ReferenceList &list, ObjectImp *base) const
+void PropertyMap::getSparseArrayPropertyNames(IdentifierSequencedSet& propertyNames) const
 {
     if (!_table) {
@@ -619 +621 @@
             k.toUInt32(&fitsInUInt32);
             if (fitsInUInt32)
-                list.append(Reference(base, Identifier(key)));
+                propertyNames.insert(Identifier(key));
         }
 #endif
@@ -634 +636 @@
             k.toUInt32(&fitsInUInt32);
             if (fitsInUInt32)
-                list.append(Reference(base, Identifier(key)));
+                propertyNames.insert(Identifier(key));
         }
     }