Changeset 30538 in webkit for trunk/JavaScriptCore/wtf/Vector.h

Timestamp:

Feb 23, 2008, 9:19:27 PM (17 years ago)

Author:

Darin Adler

Message:

Reviewed by Anders.

• ​http://bugs.webkit.org/show_bug.cgi?id=17496 make Deque use a circular array; add iterators

• wtf/Deque.h: Wrote an all-new version of this class that uses a circular buffer. Growth policy is identical to vector. Added iterators.

• wtf/Vector.h: Made two small refinements while using this to implement Deque: Made VectorBufferBase derive from Noncopyable, which would have saved me some debugging time if it had been there. Renamed Impl and m_impl to Buffer and m_buffer.

File:

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

trunk/JavaScriptCore/wtf/Vector.h

@@ -25 +25 @@
 #include "Assertions.h"
 #include "FastMalloc.h"
+#include "Noncopyable.h"
 #include "VectorTraits.h"
 #include <limits>
@@ -241 +242 @@
 
     template<typename T>
-    class VectorBufferBase {
+    class VectorBufferBase : Noncopyable {
     public:
         void allocateBuffer(size_t newCapacity)
@@ -386 +387 @@
     class Vector {
     private:
-        typedef VectorBuffer<T, inlineCapacity> Impl;
+        typedef VectorBuffer<T, inlineCapacity> Buffer;
         typedef VectorTypeOperations<T> TypeOperations;
 
@@ -402 +403 @@
         explicit Vector(size_t size) 
             : m_size(size)
-            , m_impl(size)
+            , m_buffer(size)
         {
             TypeOperations::initialize(begin(), end());
@@ -421 +422 @@
 
         size_t size() const { return m_size; }
-        size_t capacity() const { return m_impl.capacity(); }
+        size_t capacity() const { return m_buffer.capacity(); }
         bool isEmpty() const { return !size(); }
 
@@ -427 +428 @@
         { 
             ASSERT(i < size());
-            return m_impl.buffer()[i]; 
+            return m_buffer.buffer()[i]; 
         }
         const T& at(size_t i) const 
         {
             ASSERT(i < size());
-            return m_impl.buffer()[i]; 
+            return m_buffer.buffer()[i]; 
         }
 
@@ -438 +439 @@
         const T& operator[](size_t i) const { return at(i); }
 
-        T* data() { return m_impl.buffer(); }
-        const T* data() const { return m_impl.buffer(); }
+        T* data() { return m_buffer.buffer(); }
+        const T* data() const { return m_buffer.buffer(); }
 
         iterator begin() { return data(); }
@@ -481 +482 @@
         Vector(size_t size, const T& val)
             : m_size(size)
-            , m_impl(size)
+            , m_buffer(size)
         {
             TypeOperations::uninitializedFill(begin(), end(), val);
@@ -496 +497 @@
         {
             std::swap(m_size, other.m_size);
-            m_impl.swap(other.m_impl);
+            m_buffer.swap(other.m_buffer);
         }
 
@@ -505 +506 @@
 
         size_t m_size;
-        Impl m_impl;
+        Buffer m_buffer;
     };
 
@@ -511 +512 @@
     Vector<T, inlineCapacity>::Vector(const Vector& other)
         : m_size(other.size())
-        , m_impl(other.capacity())
+        , m_buffer(other.capacity())
     {
         TypeOperations::uninitializedCopy(other.begin(), other.end(), begin());
@@ -520 +521 @@
     Vector<T, inlineCapacity>::Vector(const Vector<T, otherCapacity>& other)
         : m_size(other.size())
-        , m_impl(other.capacity())
+        , m_buffer(other.capacity())
     {
         TypeOperations::uninitializedCopy(other.begin(), other.end(), begin());
@@ -653 +654 @@
         T* oldBuffer = begin();
         T* oldEnd = end();
-        m_impl.allocateBuffer(newCapacity);
+        m_buffer.allocateBuffer(newCapacity);
         TypeOperations::move(oldBuffer, oldEnd, begin());
-        m_impl.deallocateBuffer(oldBuffer);
+        m_buffer.deallocateBuffer(oldBuffer);
     }
 
@@ -681 +682 @@
             ptr = expandCapacity(size() + 1, ptr);
             
+#if COMPILER(MSVC7)
         // FIXME: MSVC7 generates compilation errors when trying to assign
         // a pointer to a Vector of its base class (i.e. can't downcast). So far
         // I've been unable to determine any logical reason for this, so I can
-        // only assume it is a bug with the compiler. Casting is very bad
-        // however because it subverts implicit conversions, so a better 
-        // solution is direly needed. 
-#if COMPILER(MSVC7)
+        // only assume it is a bug with the compiler. Casting is a bad solution,
+        // however, because it subverts implicit conversions, so a better 
+        // one is needed. 
         new (end()) T(static_cast<T>(*ptr));
 #else
@@ -777 +778 @@
     inline T* Vector<T, inlineCapacity>::releaseBuffer()
     {
-        T* buffer = m_impl.releaseBuffer();
+        T* buffer = m_buffer.releaseBuffer();
         if (inlineCapacity && !buffer && m_size) {
             // If the vector had some data, but no buffer to release,