Changeset 12435 in webkit for trunk/JavaScriptCore/kjs/ustring.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/ustring.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -41 +41 @@
 #include "dtoa.h"
 
-#include <algorithm>
+#include <kxmlcore/Vector.h>
 
 using std::max;
@@ -1304 +1304 @@
   // Allocate a buffer big enough to hold all the characters.
   const int length = size();
-  const unsigned bufferSize = length * 3;
-  char fixedSizeBuffer[1024];
-  char *buffer;
-  if (bufferSize > sizeof(fixedSizeBuffer)) {
-    buffer = new char [bufferSize];
-  } else {
-    buffer = fixedSizeBuffer;
-  }
+  Vector<char, 1024> buffer(length * 3);
 
   // Convert to runs of 8-bit characters.
-  char *p = buffer;
+  char *p = buffer.begin();
   const UChar *d = data();
   for (int i = 0; i != length; ++i) {
@@ -1339 +1332 @@
   // Return the result as a C string.
   CString result(buffer, p - buffer);
-  if (buffer != fixedSizeBuffer) {
-    delete [] buffer;
-  }
+
   return result;
 }