Changeset 16533 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Sep 22, 2006, 3:02:56 PM (19 years ago)

Author:

darin

Message:

Reviewed by Alice.

• wtf/Vector.h: Add an append that takes a pointer and length. Generalize the existing Vector append to work on vectors with any value for inlineCapacity. Change the append algorithm so it doesn't check capacity each time through the loop.

File:

• trunk/JavaScriptCore/wtf/Vector.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/Vector.h

@@ -385 +385 @@
         void clear() { resize(0); }
 
+        template<typename U> void append(const U*, size_t);
         template<typename U> void append(const U&);
-        template<typename U> void append(const Vector<U>&);
+        template<typename U, size_t c> void append(const Vector<U, c>&);
+
         template<typename U> void insert(size_t position, const U&);
+
         void remove(size_t position);
 
@@ -539 +542 @@
     }
 
-    // templatizing these is better than just letting the conversion happen implicitly,
+    // Templatizing these is better than just letting the conversion happen implicitly,
     // because for instance it allows a PassRefPtr to be appended to a RefPtr vector
     // without refcount thrash.
+
+    template<typename T, size_t inlineCapacity> template<typename U>
+    void Vector<T, inlineCapacity>::append(const U* data, size_t dataSize)
+    {
+        size_t newSize = m_size + dataSize;
+        if (newSize > capacity())
+            data = expandCapacity(newSize, data);
+        T* dest = end();
+        for (size_t i = 0; i < dataSize; ++i)
+            new (&dest[i]) T(data[i]);
+        m_size = newSize;
+    }
 
     template<typename T, size_t inlineCapacity> template<typename U>
@@ -553 +568 @@
     }
 
-    template<typename T, size_t inlineCapacity> template<typename U>
-    inline void Vector<T, inlineCapacity>::append(const Vector<U>& val)
-    {
-        if (size() + val.size() >= capacity())
-            expandCapacity(size() + val.size());
-        for (unsigned i = 0; i < val.size(); i++)
-            append(val[i]);
+    template<typename T, size_t inlineCapacity> template<typename U, size_t c>
+    inline void Vector<T, inlineCapacity>::append(const Vector<U, c>& val)
+    {
+        append(val.begin(), val.size());
     }