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

Timestamp:

Jul 16, 2006, 2:06:28 PM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

• switch property lists to be vector+set of Identifiers instead of list of References

This has the following benefits:

• no duplicates in property lists
• simplifies API calls
• probably more efficient, since linked list is gone
• entirely removed Reference, ReferenceList and ProtectedReference types from the API

• kjs/PropertyNameArray.cpp: Added. (KJS::PropertyNameArray::add): Check set, if not already there, add to vector.
• kjs/PropertyNameArray.h: Added. (KJS::PropertyNameArray::PropertyNameArray): Newly added type, combines a set and a vector to make a unique but ordered list of identifiers. (KJS::PropertyNameArray::begin): ditto (KJS::PropertyNameArray::end): ditto (KJS::PropertyNameArray::size): ditto (KJS::PropertyNameArray::operator[]): ditto
• kjs/array_instance.h:
• kjs/array_object.cpp: (ArrayInstance::getPropertyNames): renamed from getPropertyList, updated for PropertyNameArray (ArrayInstance::setLength): updated for PropertyNameArray (ArrayInstance::pushUndefinedObjectsToEnd): ditto
• kjs/nodes.cpp: (ForInNode::execute): updated for PropertyNameArray
• kjs/nodes.h:
• kjs/object.cpp: (KJS::JSObject::getPropertyNames): renamed from getPropertyList, updated for PropertyNameArray
• kjs/object.h:
• kjs/property_map.cpp: (KJS::PropertyMap::getEnumerablePropertyNames): updated for PropertyNameArray (KJS::PropertyMap::getSparseArrayPropertyNames): ditto
• kjs/property_map.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/scope_chain.cpp: (KJS::ScopeChain::print): Use PropertyNamesArray instead of ReferenceList.
• kjs/string_object.cpp: (StringInstance::getPropertyNames): Updated for new approach.
• kjs/string_object.h:
• kjs/ustring.h:
• API/APICast.h: (toJS): Added overload for PropertyNameAccumulatorRef / PropertyNameArray* (toRef): ditto
• API/JSBase.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::getPropertyNames): Fixed for new API.
• API/JSCallbackObject.h:
• API/JSObjectRef.cpp: (JSPropertyNameArray::JSPropertyNameArray): Type used for a publicly vended JSPropertyNameArrayRef. (JSObjectCopyPropertyNames): New API call - renamed / refactored from JSObjectCreatePropertyList (JSPropertyNameArrayRetain): new retain call for JSPropertyNameArray. (JSPropertyNameArrayRelease): new release call for - " -. (JSPropertyNameArrayGetCount): Instead of having to use a stateful enumerator you can now get the count and items in any order. (JSPropertyNameArrayGetNameAtIndex): See above. (JSPropertyNameAccumulatorAddName): What you add properties to is now an opaque accumulator object.
• API/JSObjectRef.h: Prototyped new functions, removed old ones
• JavaScriptCore.exp: Updated exported symbols.
• JavaScriptCore.xcodeproj/project.pbxproj: Added new files, removed old.
• API/testapi.c: (MyObject_getPropertyNames): Renamed / fixed callback to fit new paradigm. (main): Updated for new API.

JavaScriptGlue:

Reviewed by Darin.

• switch property lists to be vector+set of Identifiers instead of list of References

• JSUtils.cpp: (KJSValueToCFTypeInternal): updated for JSC SPI changes
• JSValueWrapper.cpp: (JSValueWrapper::JSObjectCopyPropertyNames): ditto
• UserObjectImp.cpp: (UserObjectImp::getPropertyNames): ditto
• UserObjectImp.h:

LayoutTests:

Reviewed by Darin.

• new test case and updated results for property list changes

• fast/js/for-in-avoid-duplicates-expected.txt: Added.
• fast/js/for-in-avoid-duplicates.html: Added.
• fast/js/kde/Array-expected.txt:
• fast/js/resources/for-in-avoid-duplicates.js: Added.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -29 +29 @@
 #include "lookup.h"
 #include "operations.h"
-#include "reference_list.h"
+#include "PropertyNameArray.h"
 #include <wtf/HashSet.h>
 #include <stdio.h>
@@ -200 +200 @@
 }
 
-void ArrayInstance::getPropertyList(ReferenceList& propertyList, bool recursive)
+void ArrayInstance::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
 {
   // avoid fetching this every time through the loop
-  JSValue *undefined = jsUndefined();
-
-  //### FIXME: should avoid duplicates with prototype
+  JSValue* undefined = jsUndefined();
+  
   for (unsigned i = 0; i < storageLength; ++i) {
-    JSValue *imp = storage[i];
-    if (imp && imp != undefined) {
-      propertyList.append(Reference(this, i));
-    }
-  }
-  return JSObject::getPropertyList(propertyList, recursive);
+    JSValue* value = storage[i];
+    if (value && value != undefined)
+      propertyNames.add(Identifier::from(i));
+  }
+ 
+  JSObject::getPropertyNames(exec, propertyNames);
 }
 
@@ -244 +243 @@
 
   if (newLength < length) {
-    ReferenceList sparseProperties;
-    
-    _prop.addSparseArrayPropertiesToReferenceList(sparseProperties, this);
-    
-    ReferenceListIterator it = sparseProperties.begin();
-    while (it != sparseProperties.end()) {
-      Reference ref = it++;
+    PropertyNameArray sparseProperties;
+    
+    _prop.getSparseArrayPropertyNames(sparseProperties);
+    
+    PropertyNameArrayIterator end = sparseProperties.end();
+    
+    for (PropertyNameArrayIterator it = sparseProperties.begin(); it != end; ++it) {
+      Identifier name = *it;
       bool ok;
-      unsigned index = ref.getPropertyName().toArrayIndex(&ok);
-      if (ok && index > newLength) {
-        ref.deleteValue(exec);
-      }
+      unsigned index = name.toArrayIndex(&ok);
+      if (ok && index > newLength)
+        deleteProperty(exec, name);
     }
   }
@@ -361 +360 @@
         }
     }
-    
-    ReferenceList sparseProperties;
-    _prop.addSparseArrayPropertiesToReferenceList(sparseProperties, this);
-    unsigned newLength = o + sparseProperties.length();
-
-    if (newLength > storageLength) {
-      resizeStorage(newLength);
-    } 
-
-    ReferenceListIterator it = sparseProperties.begin();
-    while (it != sparseProperties.end()) {
-      Reference ref = it++;
-      storage[o] = ref.getValue(exec);
-      JSObject::deleteProperty(exec, ref.getPropertyName());
-      o++;
+   
+    PropertyNameArray sparseProperties;
+    _prop.getSparseArrayPropertyNames(sparseProperties);
+    unsigned newLength = o + sparseProperties.size();
+    
+    if (newLength > storageLength)
+        resizeStorage(newLength);
+    
+    PropertyNameArrayIterator end = sparseProperties.end();
+    for (PropertyNameArrayIterator it = sparseProperties.begin(); it != end; ++it) {
+        Identifier name = *it;
+        storage[o] = get(exec, name);
+        JSObject::deleteProperty(exec, name);
+        o++;
     }