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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -44 +44 @@
 #include "operations.h"
 #include "ustring.h"
-#include "reference_list.h"
+#include "IdentifierSequencedSet.h"
 
 using namespace KJS;
@@ -1781 +1781 @@
   ObjectImp *v;
   Completion c;
-  ReferenceList propList;
+  IdentifierSequencedSet propertyNames;
 
   if (varDecl) {
@@ -1800 +1800 @@
   KJS_CHECKEXCEPTION
   v = e->toObject(exec);
-  propList = v->propList(exec);
-
-  ReferenceListIterator propIt = propList.begin();
-
-  while (propIt != propList.end()) {
-    Identifier name = propIt->getPropertyName(exec);
-    if (!v->hasProperty(exec, name)) {
-      propIt++;
+  v->getPropertyNames(exec, propertyNames);
+
+  IdentifierSequencedSetIterator end = propertyNames.end();
+  for (IdentifierSequencedSetIterator it = propertyNames.begin(); it != end; ++it) {
+    const Identifier &name = *it;
+    if (!v->hasProperty(exec, name))
       continue;
-    }
 
     ValueImp *str = jsString(name.ustring());
@@ -1871 +1868 @@
       }
     }
-
-    propIt++;
   }