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

trunk/JavaScriptCore/kjs/object.cpp

@@ -29 +29 @@
 #include "interpreter.h"
 #include "lookup.h"
-#include "reference_list.h"
+#include "IdentifierSequencedSet.h"
 
 #include <assert.h>
@@ -375 +375 @@
 }
 
-ReferenceList ObjectImp::propList(ExecState *exec, bool recursive)
-{
-  ReferenceList list;
-  if (_proto->isObject() && recursive)
-    list = static_cast<ObjectImp*>(_proto)->propList(exec,recursive);
-
-  _prop.addEnumerablesToReferenceList(list, this);
+void ObjectImp::getPropertyNames(ExecState *exec, IdentifierSequencedSet &propertyNames)
+{
+  _prop.getEnumerablePropertyNames(propertyNames);
 
   // Add properties from the static hashtable of properties
@@ -390 +386 @@
       const HashEntry *e = info->propHashTable->entries;
       for (int i = 0; i < size; ++i, ++e) {
-        if ( e->s && !(e->attr & DontEnum) )
-          list.append(Reference(this, e->s)); /// ######### check for duplicates with the propertymap
+        if (e->s && !(e->attr & DontEnum))
+          propertyNames.insert(e->s);
       }
     }
@@ -397 +393 @@
   }
 
-  return list;
+  if (_proto->isObject())
+    static_cast<ObjectImp*>(_proto)->getPropertyNames(exec, propertyNames);
 }