Changeset 12435 in webkit for trunk/JavaScriptCore/kjs/internal.cpp

Timestamp:

Jan 28, 2006, 8:12:59 PM (19 years ago)

Author:

mjs

Message:

Reviewed by Dave Hyatt.

• added a Vector class ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6894

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/internal.cpp: (KJS::Parser::saveNewNode): Apply Vector. (KJS::clearNewNodes): ditto
• kjs/number_object.cpp: (integer_part_noexp): ditto (char_sequence): ditto
• kjs/ustring.cpp: (KJS::UString::UTF8String): ditto
• kxmlcore/HashMap.h: (KXMLCore::deleteAllValues): Tweaked this to only apply to HashMap, other versions are useful for other containers.
• kxmlcore/Vector.h: Added. Implemented a Vector class, which should be usable for all Array/QVector style purposes, and also as a stack buffer with oversize handling. Also some helper classes to make vector operations as efficient as possible for POD types and for simple non-PODs like RefPtr. (KXMLCore::): (KXMLCore::VectorTypeOperations::destruct): (KXMLCore::VectorTypeOperations::initialize): (KXMLCore::VectorTypeOperations::move): (KXMLCore::VectorTypeOperations::uninitializedCopy): (KXMLCore::VectorTypeOperations::uninitializedFill): (KXMLCore::VectorBuffer::VectorBuffer): (KXMLCore::VectorBuffer::~VectorBuffer): (KXMLCore::VectorBuffer::deallocateBuffer): (KXMLCore::VectorBuffer::inlineBuffer): (KXMLCore::Vector::Vector): (KXMLCore::Vector::~Vector): (KXMLCore::Vector::size): (KXMLCore::Vector::capacity): (KXMLCore::Vector::isEmpty): (KXMLCore::Vector::at): (KXMLCore::Vector::operator[]): (KXMLCore::Vector::data): (KXMLCore::Vector::operator T*): (KXMLCore::Vector::operator const T*): (KXMLCore::Vector::begin): (KXMLCore::Vector::end): (KXMLCore::Vector::clear): (KXMLCore::Vector::fill): (KXMLCore::Vector::operator=): (KXMLCore::::Vector): (KXMLCore::::operator): (KXMLCore::::fill): (KXMLCore::::expandCapacity): (KXMLCore::::resize): (KXMLCore::::reserveCapacity): (KXMLCore::::append): (KXMLCore::deleteAllValues):
• kxmlcore/VectorTraits.h: Added. (KXMLCore::VectorTraits): Traits to enable making Vector efficient for simple types.

File:

• trunk/JavaScriptCore/kjs/internal.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -44 +44 @@
 #include <assert.h>
 #include <kxmlcore/HashMap.h>
+#include <kxmlcore/Vector.h>
 #include <math.h>
 #include <stdio.h>
@@ -353 +354 @@
 int Parser::sid = 0;
 
-const int initialCapacity = 64;
-const int growthFactor = 2;
-
-static int numNewNodes;
-static int newNodesCapacity;
-static Node **newNodes;
+static Vector<RefPtr<Node> >* newNodes;
 
 void Parser::saveNewNode(Node *node)
 {
-  if (numNewNodes == newNodesCapacity) {
-    newNodesCapacity = (newNodesCapacity == 0) ? initialCapacity : newNodesCapacity * growthFactor;
-    newNodes = (Node **)fastRealloc(newNodes, sizeof(Node *) * newNodesCapacity);
-  }
-
-  newNodes[numNewNodes++] = node;
+    if (!newNodes)
+        newNodes = new Vector<RefPtr<Node> >;
+
+    newNodes->append(node);
 }
 
 static void clearNewNodes()
 {
-  for (int i = 0; i < numNewNodes; i++) {
-    if (newNodes[i]->refcount() == 0)
-      delete newNodes[i];
-  }
-  fastFree(newNodes);
-  newNodes = 0;
-  numNewNodes = 0;
-  newNodesCapacity = 0;
+    delete newNodes;
+    newNodes = 0;
 }