Changeset 10744 in webkit for trunk/JavaScriptCore

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.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (22 diffs)
• kjs/IdentifierSequencedSet.cpp (added)
• kjs/IdentifierSequencedSet.h (added)
• kjs/array_instance.h (modified) (1 diff)
• kjs/array_object.cpp (modified) (5 diffs)
• kjs/nodes.cpp (modified) (4 diffs)
• kjs/nodes.h (modified) (1 diff)
• kjs/object.cpp (modified) (4 diffs)
• kjs/object.h (modified) (2 diffs)
• kjs/property_map.cpp (modified) (8 diffs)
• kjs/property_map.h (modified) (2 diffs)
• kjs/protect.h (modified) (1 diff)
• kjs/protected_reference.h (deleted)
• kjs/reference.cpp (deleted)
• kjs/reference.h (deleted)
• kjs/reference_list.cpp (deleted)
• kjs/reference_list.h (deleted)
• kjs/ustring.h (modified) (2 diffs)
• kxmlcore/HashSet.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-10-05  Maciej Stachowiak  <[email protected]>
+
+        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:
+
 2005-10-04  Eric Seidel  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -33 +33 @@
                 37B800F008EBB65B0035B474 /* HashTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 65DFC92E08EA173A00F7300B /* HashTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 37B800F108EBB65C0035B474 /* HashTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 65DFC92F08EA173A00F7300B /* HashTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                6512E62B08F3BA8B004A15B6 /* IdentifierSequencedSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 65D6D61C08F2676800958B28 /* IdentifierSequencedSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                6512E63608F3BADE004A15B6 /* IdentifierSequencedSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65D6D61B08F2676800958B28 /* IdentifierSequencedSet.cpp */; };
                 65162EEB08E6A1FE007556CD /* SharedPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 65162EEA08E6A1FE007556CD /* SharedPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 65162F0208E6A2D0007556CD /* SharedPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 65162EEA08E6A1FE007556CD /* SharedPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                652C107F08DA7B1E0020887D /* protected_reference.h in Headers */ = {isa = PBXBuildFile; fileRef = 652C107E08DA7B1E0020887D /* protected_reference.h */; };
                 6541BD7208E80A17002CBEE7 /* TCPageMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541BD6E08E80A17002CBEE7 /* TCPageMap.h */; };
                 6541BD7308E80A17002CBEE7 /* TCSpinLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */; };
@@ -45 +46 @@
                 65621E6F089E85D300760F35 /* property_slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65621E6B089E859700760F35 /* property_slot.cpp */; };
                 65621E70089E85D300760F35 /* property_slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 65621E6C089E859700760F35 /* property_slot.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                65D6D61D08F2676800958B28 /* IdentifierSequencedSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65D6D61B08F2676800958B28 /* IdentifierSequencedSet.cpp */; };
+                65D6D61E08F2676800958B28 /* IdentifierSequencedSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 65D6D61C08F2676800958B28 /* IdentifierSequencedSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 65D7D19C08F10B5B0015ABD8 /* FastMallocInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 65D7D19B08F10B5B0015ABD8 /* FastMallocInternal.h */; };
                 65DFC93008EA173A00F7300B /* HashFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = 65DFC92A08EA173A00F7300B /* HashFunctions.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -93 +96 @@
                 932F5B610822A1C700736975 /* JavaScriptCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */; };
                 932F5B620822A1C700736975 /* simple_number.h in Headers */ = {isa = PBXBuildFile; fileRef = F50888B6030BB74C012A967E /* simple_number.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                932F5B630822A1C700736975 /* reference_list.h in Headers */ = {isa = PBXBuildFile; fileRef = F54F0800030CD22001B5C2EB /* reference_list.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                932F5B640822A1C700736975 /* reference.h in Headers */ = {isa = PBXBuildFile; fileRef = F5341391030CEEB1018BE7F3 /* reference.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 932F5B650822A1C700736975 /* completion.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BB2BC5030F772101FCFE1D /* completion.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 932F5B660822A1C700736975 /* identifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 933A349A038AE7C6008635CE /* identifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -159 +160 @@
                 932F5BA90822A1C700736975 /* value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8870255597D01FF60F7 /* value.cpp */; };
                 932F5BAB0822A1C700736975 /* nodes2string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5FFE656026B47A6018635CA /* nodes2string.cpp */; };
-                932F5BAC0822A1C700736975 /* reference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5341390030CEEB1018BE7F3 /* reference.cpp */; settings = {ATTRIBUTES = (Private, ); }; };
-                932F5BAD0822A1C700736975 /* reference_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5341394030CF5F8018BE7F3 /* reference_list.cpp */; settings = {ATTRIBUTES = (Private, ); }; };
                 932F5BAE0822A1C700736975 /* identifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933A349D038AE80F008635CE /* identifier.cpp */; };
                 932F5BAF0822A1C700736975 /* scope_chain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9374D3A8038D9D74008635CE /* scope_chain.cpp */; };
@@ -249 +248 @@
                 A85D8211087B2822006A9172 /* JavaScriptCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */; };
                 A85D8212087B2822006A9172 /* simple_number.h in Headers */ = {isa = PBXBuildFile; fileRef = F50888B6030BB74C012A967E /* simple_number.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                A85D8213087B2822006A9172 /* reference_list.h in Headers */ = {isa = PBXBuildFile; fileRef = F54F0800030CD22001B5C2EB /* reference_list.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                A85D8214087B2822006A9172 /* reference.h in Headers */ = {isa = PBXBuildFile; fileRef = F5341391030CEEB1018BE7F3 /* reference.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A85D8215087B2822006A9172 /* completion.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BB2BC5030F772101FCFE1D /* completion.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A85D8216087B2822006A9172 /* identifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 933A349A038AE7C6008635CE /* identifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -317 +314 @@
                 A85D8259087B2822006A9172 /* value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8870255597D01FF60F7 /* value.cpp */; };
                 A85D825A087B2822006A9172 /* nodes2string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5FFE656026B47A6018635CA /* nodes2string.cpp */; };
-                A85D825B087B2822006A9172 /* reference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5341390030CEEB1018BE7F3 /* reference.cpp */; settings = {ATTRIBUTES = (Private, ); }; };
-                A85D825C087B2822006A9172 /* reference_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5341394030CF5F8018BE7F3 /* reference_list.cpp */; settings = {ATTRIBUTES = (Private, ); }; };
                 A85D825D087B2822006A9172 /* identifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933A349D038AE80F008635CE /* identifier.cpp */; };
                 A85D825E087B2822006A9172 /* scope_chain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9374D3A8038D9D74008635CE /* scope_chain.cpp */; };
@@ -363 +358 @@
                 A883C7F508EA12860051473E /* TCSystemAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */; };
                 A883C7F608EA12860051473E /* TCSystemAlloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */; };
-                A883C7F708EA12A20051473E /* protected_reference.h in Headers */ = {isa = PBXBuildFile; fileRef = 652C107E08DA7B1E0020887D /* protected_reference.h */; };
                 A8BC0DFC08D43D6D00379918 /* ucptable.c in Headers */ = {isa = PBXBuildFile; fileRef = 93E26C0D08B1520900F85226 /* ucptable.c */; };
 /* End PBXBuildFile section */
@@ -503 +497 @@
                 651F6412039D5B5F0078395C /* dtoa.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dtoa.cpp; sourceTree = "<group>"; };
                 651F6413039D5B5F0078395C /* dtoa.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; };
-                652C107E08DA7B1E0020887D /* protected_reference.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = protected_reference.h; sourceTree = "<group>"; };
                 6541720E039E08B90058BFEB /* dftables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dftables.c; path = pcre/dftables.c; sourceTree = "<group>"; };
                 6541720F039E08B90058BFEB /* pcre.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pcre.h; path = pcre/pcre.h; sourceTree = "<group>"; };
@@ -517 +510 @@
                 65621E6C089E859700760F35 /* property_slot.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = property_slot.h; sourceTree = "<group>"; };
                 65C02FBB0637462A003E7EE6 /* protect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = protect.h; sourceTree = "<group>"; };
+                65D6D61B08F2676800958B28 /* IdentifierSequencedSet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IdentifierSequencedSet.cpp; sourceTree = "<group>"; };
+                65D6D61C08F2676800958B28 /* IdentifierSequencedSet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IdentifierSequencedSet.h; sourceTree = "<group>"; };
                 65D7D19B08F10B5B0015ABD8 /* FastMallocInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FastMallocInternal.h; sourceTree = "<group>"; };
                 65DFC92A08EA173A00F7300B /* HashFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HashFunctions.h; sourceTree = "<group>"; };
@@ -573 +568 @@
                 A85D8288087B2822006A9172 /* JavaScriptCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                 F50888B6030BB74C012A967E /* simple_number.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = simple_number.h; sourceTree = "<group>"; };
-                F5341390030CEEB1018BE7F3 /* reference.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reference.cpp; sourceTree = "<group>"; };
-                F5341391030CEEB1018BE7F3 /* reference.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = reference.h; sourceTree = "<group>"; };
-                F5341394030CF5F8018BE7F3 /* reference_list.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reference_list.cpp; sourceTree = "<group>"; };
-                F54F0800030CD22001B5C2EB /* reference_list.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = reference_list.h; sourceTree = "<group>"; };
                 F5BB2BC5030F772101FCFE1D /* completion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = completion.h; sourceTree = "<group>"; };
                 F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JavaScriptCorePrefix.h; path = ../JavaScriptCorePrefix.h; sourceTree = "<group>"; };
@@ -715 +706 @@
                         isa = PBXGroup;
                         children = (
+                                65D6D61B08F2676800958B28 /* IdentifierSequencedSet.cpp */,
+                                65D6D61C08F2676800958B28 /* IdentifierSequencedSet.h */,
                                 65621E6B089E859700760F35 /* property_slot.cpp */,
                                 65621E6C089E859700760F35 /* property_slot.h */,
                                 938772E5038BFE19008635CE /* array_instance.h */,
                                 650B68D80639033F009D42DE /* protected_values.cpp */,
-                                652C107E08DA7B1E0020887D /* protected_reference.h */,
                                 650B68D90639033F009D42DE /* protected_values.h */,
                                 F692A84E0255597D01FF60F7 /* array_object.h */,
@@ -766 +758 @@
                                 F692A8790255597D01FF60F7 /* property_map.cpp */,
                                 65C02FBB0637462A003E7EE6 /* protect.h */,
-                                F5341390030CEEB1018BE7F3 /* reference.cpp */,
-                                F5341391030CEEB1018BE7F3 /* reference.h */,
-                                F54F0800030CD22001B5C2EB /* reference_list.h */,
-                                F5341394030CF5F8018BE7F3 /* reference_list.cpp */,
                                 F692A87B0255597D01FF60F7 /* regexp_object.cpp */,
                                 F692A87C0255597D01FF60F7 /* regexp_object.h */,
@@ -972 +960 @@
                                 932F5B610822A1C700736975 /* JavaScriptCorePrefix.h in Headers */,
                                 932F5B620822A1C700736975 /* simple_number.h in Headers */,
-                                932F5B630822A1C700736975 /* reference_list.h in Headers */,
-                                932F5B640822A1C700736975 /* reference.h in Headers */,
                                 932F5B650822A1C700736975 /* completion.h in Headers */,
                                 932F5B660822A1C700736975 /* identifier.h in Headers */,
@@ -1020 +1006 @@
                                 93E26C1308B1523D00F85226 /* ucptable.c in Headers */,
                                 93E26CCF08B2921900F85226 /* softlinking.h in Headers */,
-                                652C107F08DA7B1E0020887D /* protected_reference.h in Headers */,
                                 65162EEB08E6A1FE007556CD /* SharedPtr.h in Headers */,
                                 65E217BD08E7EECC0023E5F6 /* Assertions.h in Headers */,
@@ -1034 +1019 @@
                                 6557E8F808EA5D4D0049CDFC /* HashMapPtrSpec.h in Headers */,
                                 65D7D19C08F10B5B0015ABD8 /* FastMallocInternal.h in Headers */,
+                                65D6D61E08F2676800958B28 /* IdentifierSequencedSet.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1069 +1055 @@
                                 A85D8211087B2822006A9172 /* JavaScriptCorePrefix.h in Headers */,
                                 A85D8212087B2822006A9172 /* simple_number.h in Headers */,
-                                A85D8213087B2822006A9172 /* reference_list.h in Headers */,
-                                A85D8214087B2822006A9172 /* reference.h in Headers */,
                                 A85D8215087B2822006A9172 /* completion.h in Headers */,
                                 A85D8216087B2822006A9172 /* identifier.h in Headers */,
@@ -1123 +1107 @@
                                 A883C7F408EA12860051473E /* TCSpinLock.h in Headers */,
                                 A883C7F608EA12860051473E /* TCSystemAlloc.h in Headers */,
-                                A883C7F708EA12A20051473E /* protected_reference.h in Headers */,
                                 37B800EB08EBB6520035B474 /* HashFunctions.h in Headers */,
                                 37B800EC08EBB6540035B474 /* HashMap.h in Headers */,
@@ -1130 +1113 @@
                                 37B800F008EBB65B0035B474 /* HashTable.h in Headers */,
                                 37B800F108EBB65C0035B474 /* HashTraits.h in Headers */,
+                                6512E62B08F3BA8B004A15B6 /* IdentifierSequencedSet.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1642 +1626 @@
                                 932F5BA90822A1C700736975 /* value.cpp in Sources */,
                                 932F5BAB0822A1C700736975 /* nodes2string.cpp in Sources */,
-                                932F5BAC0822A1C700736975 /* reference.cpp in Sources */,
-                                932F5BAD0822A1C700736975 /* reference_list.cpp in Sources */,
                                 932F5BAE0822A1C700736975 /* identifier.cpp in Sources */,
                                 932F5BAF0822A1C700736975 /* scope_chain.cpp in Sources */,
@@ -1690 +1672 @@
                                 6541BD7408E80A17002CBEE7 /* TCSystemAlloc.cpp in Sources */,
                                 65DFC93308EA173A00F7300B /* HashTable.cpp in Sources */,
+                                65D6D61D08F2676800958B28 /* IdentifierSequencedSet.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1739 +1722 @@
                                 A85D8259087B2822006A9172 /* value.cpp in Sources */,
                                 A85D825A087B2822006A9172 /* nodes2string.cpp in Sources */,
-                                A85D825B087B2822006A9172 /* reference.cpp in Sources */,
-                                A85D825C087B2822006A9172 /* reference_list.cpp in Sources */,
                                 A85D825D087B2822006A9172 /* identifier.cpp in Sources */,
                                 A85D825E087B2822006A9172 /* scope_chain.cpp in Sources */,
@@ -1787 +1768 @@
                                 A883C7F508EA12860051473E /* TCSystemAlloc.cpp in Sources */,
                                 37B800EF08EBB65B0035B474 /* HashTable.cpp in Sources */,
+                                6512E63608F3BADE004A15B6 /* IdentifierSequencedSet.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/JavaScriptCore/kjs/array_instance.h

@@ -40 +40 @@
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual bool deleteProperty(ExecState *exec, unsigned propertyName);
-    virtual ReferenceList propList(ExecState *exec, bool recursive);
+    virtual void getPropertyNames(ExecState *exec, IdentifierSequencedSet& propertyNames);
 
     virtual void mark();

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++;
     }

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++;
   }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -35 +35 @@
   class PropertyNode;
   class PropertyValueNode;
-  class Reference;
   class RegExp;
   class SourceElementsNode;

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);
 }
 

trunk/JavaScriptCore/kjs/object.h

@@ -48 +48 @@
   class HashEntry;
   class ListImp;
+  class IdentifierSequencedSet;
 
   // ECMA 262-3 8.6.1
@@ -423 +424 @@
      *
      * @param exec The current execution state
-     * @param recursive Whether or not properties in the object's prototype
-     * chain should be
-     * included in the list.
-     * @return A List of References to properties of the object.
+     * @param propertyNames A list of property names to be filled in by this call
      **/
-    virtual ReferenceList propList(ExecState *exec, bool recursive = true);
+    virtual void getPropertyNames(ExecState *exec, IdentifierSequencedSet& propertyNames);
 
     /**

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));
         }
     }

trunk/JavaScriptCore/kjs/property_map.h

@@ -28 +28 @@
 namespace KJS {
 
+    class IdentifierSequencedSet;
     class ObjectImp;
-    class ReferenceList;
     class ValueImp;
     
@@ -82 +82 @@
 
         void mark() const;
-        void addEnumerablesToReferenceList(ReferenceList &, ObjectImp *) const;
-        void addSparseArrayPropertiesToReferenceList(ReferenceList &, ObjectImp *) const;
+        void getEnumerablePropertyNames(IdentifierSequencedSet&) const;
+        void getSparseArrayPropertyNames(IdentifierSequencedSet&) const;
 
         void save(SavedProperties &) const;

trunk/JavaScriptCore/kjs/protect.h

@@ -25 +25 @@
 #define _KJS_PROTECT_H_
 
-#include "reference.h"
 #include "value.h"
 #include "protected_values.h"

trunk/JavaScriptCore/kjs/ustring.h

@@ -241 +241 @@
 
   public:
+    typedef Rep Impl;
+
     /**
      * Constructs a null string.
@@ -462 +464 @@
     static void globalClear();
 #endif
+
+    Impl *impl() const { return rep; }
   private:
     UString(Rep *r) { attach(r); }

trunk/JavaScriptCore/kxmlcore/HashSet.h

@@ -26 +26 @@
 #include "HashTable.h"
 #include "HashTraits.h"
-#include "hashfunctions.h"
+#include "HashFunctions.h"
 
 namespace KXMLCore {