Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes.

[wxWidgets.git] / include / wx / vector.h

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 9511ab2ab362b722fb003c62cd5d76859945bd7c..28230a9ea5c2d609836f9f8ccb890a9cbb2e556b 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -21,23 +21,171 @@
 
 #else // !wxUSE_STL
 
 
 #else // !wxUSE_STL
 

+#include "wx/utils.h"
+#include "wx/scopeguard.h"
+#include "wx/meta/movable.h"
+#include "wx/meta/if.h"
+

 #include "wx/beforestd.h"
 #include <new> // for placement new
 #include "wx/afterstd.h"
 
 #include "wx/beforestd.h"
 #include <new> // for placement new
 #include "wx/afterstd.h"
 

+namespace wxPrivate
+{
+
+// These templates encapsulate memory operations for use by wxVector; there are
+// two implementations, both in generic way for any C++ types and as an
+// optimized version for "movable" types that uses realloc() and memmove().
+
+// version for movable types:
+template<typename T>
+struct wxVectorMemOpsMovable
+{
+    static void Free(T* array)
+        { free(array); }
+
+    static T* Realloc(T* old, size_t newCapacity, size_t WXUNUSED(occupiedSize))
+        { return (T*)realloc(old, newCapacity * sizeof(T)); }
+
+    static void MemmoveBackward(T* dest, T* source, size_t count)
+        { memmove(dest, source, count * sizeof(T)); }
+
+    static void MemmoveForward(T* dest, T* source, size_t count)
+        { memmove(dest, source, count * sizeof(T)); }
+};
+
+// generic version for non-movable types:
+template<typename T>
+struct wxVectorMemOpsGeneric
+{
+    static void Free(T* array)
+        { ::operator delete(array); }
+
+    static T* Realloc(T* old, size_t newCapacity, size_t occupiedSize)
+    {
+        T *mem = (T*)::operator new(newCapacity * sizeof(T));
+        for ( size_t i = 0; i < occupiedSize; i++ )
+        {
+            ::new(mem + i) T(old[i]);
+            old[i].~T();
+        }
+        ::operator delete(old);
+        return mem;
+    }
+
+    static void MemmoveBackward(T* dest, T* source, size_t count)
+    {
+        wxASSERT( dest < source );
+        T* destptr = dest;
+        T* sourceptr = source;
+        for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr )
+        {
+            ::new(destptr) T(*sourceptr);
+            sourceptr->~T();
+        }
+    }
+
+    static void MemmoveForward(T* dest, T* source, size_t count)
+    {
+        wxASSERT( dest > source );
+        T* destptr = dest + count - 1;
+        T* sourceptr = source + count - 1;
+        for ( size_t i = count; i > 0; --i, --destptr, --sourceptr )
+        {
+            ::new(destptr) T(*sourceptr);
+            sourceptr->~T();
+        }
+    }
+};
+
+
+} // namespace wxPrivate
+

 template<typename T>
 class wxVector
 {
 template<typename T>
 class wxVector
 {

+private:
+    // This cryptic expression means "typedef Ops to wxVectorMemOpsMovable if
+    // type T is movable type, otherwise to wxVectorMemOpsGeneric".
+    //
+    // Note that we use typedef instead of privately deriving from this (which
+    // would allowed us to omit "Ops::" prefixes below) to keep VC6 happy,
+    // it can't compile code that derives from wxIf<...>::value.
+    typedef typename wxIf< wxIsMovable<T>::value,
+                           wxPrivate::wxVectorMemOpsMovable<T>,
+                           wxPrivate::wxVectorMemOpsGeneric<T> >::value
+            Ops;
+

 public:
     typedef size_t size_type;
 public:
     typedef size_t size_type;

+    typedef size_t difference_type;

     typedef T value_type;
     typedef T value_type;

+    typedef value_type* pointer;

     typedef value_type* iterator;
     typedef const value_type* const_iterator;
     typedef value_type& reference;
 
     typedef value_type* iterator;
     typedef const value_type* const_iterator;
     typedef value_type& reference;
 

+    class reverse_iterator
+    {
+    public:
+        reverse_iterator() : m_ptr(NULL) { }
+        wxEXPLICIT reverse_iterator(iterator it) : m_ptr(it) { }
+        reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
+
+        reference operator*() const { return *m_ptr; }
+        pointer operator->() const { return m_ptr; }
+
+        iterator base() const { return m_ptr; }
+
+        reverse_iterator& operator++()
+            { --m_ptr; return *this; }
+        reverse_iterator operator++(int)
+            { reverse_iterator tmp = *this; --m_ptr; return tmp; }
+        reverse_iterator& operator--()
+            { ++m_ptr; return *this; }
+        reverse_iterator operator--(int)
+            { reverse_iterator tmp = *this; ++m_ptr; return tmp; }
+
+        reverse_iterator operator+(difference_type n) const
+            { return reverse_iterator(m_ptr - n); }
+        reverse_iterator& operator+=(difference_type n)
+            { m_ptr -= n; return *this; }
+        reverse_iterator operator-(difference_type n) const
+            { return reverse_iterator(m_ptr + n); }
+        reverse_iterator& operator-=(difference_type n)
+            { m_ptr += n; return *this; }
+
+        reference operator[](difference_type n) const
+            { return *(*this + n); }
+
+        bool operator ==(const reverse_iterator& it) const
+            { return m_ptr == it.m_ptr; }
+        bool operator !=(const reverse_iterator& it) const
+            { return m_ptr != it.m_ptr; }
+
+    private:
+        value_type *m_ptr;
+    };
+

     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 

-    wxVector(const wxVector& c)
+    wxVector(size_type p_size)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(value_type());
+    }
+
+    wxVector(size_type p_size, const value_type& v)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(v);
+    }
+
+    wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL)

     {
         Copy(c);
     }
     {
         Copy(c);
     }


@@ -47,6 +195,13 @@ public:
         clear();
     }
 
         clear();
     }
 

+    void swap(wxVector& v)
+    {
+        wxSwap(m_size, v.m_size);
+        wxSwap(m_capacity, v.m_capacity);
+        wxSwap(m_values, v.m_values);
+    }
+

     void clear()
     {
         // call destructors of stored objects:
     void clear()
     {
         // call destructors of stored objects:


@@ -55,9 +210,10 @@ public:
             m_values[i].~T();
         }
 
             m_values[i].~T();
         }
 

-        free(m_values);
+        Ops::Free(m_values);

         m_values = NULL;
         m_values = NULL;

-        m_size = m_capacity = 0;
+        m_size =
+        m_capacity = 0;

     }
 
     void reserve(size_type n)
     }
 
     void reserve(size_type n)


@@ -76,11 +232,26 @@ public:
         if ( m_capacity + increment > n )
             n = m_capacity + increment;
 
         if ( m_capacity + increment > n )
             n = m_capacity + increment;
 

-        m_values = (value_type*)realloc(m_values, n * sizeof(value_type));
-
+        m_values = Ops::Realloc(m_values, n * sizeof(value_type), m_size);

         m_capacity = n;
     }
 
         m_capacity = n;
     }
 

+    void resize(size_type n)
+    {
+        if ( n < m_size )
+            Shrink(n);
+        else if ( n > m_size )
+            Extend(n, value_type());
+    }
+
+    void resize(size_type n, const value_type& v)
+    {
+        if ( n < m_size )
+            Shrink(n);
+        else if ( n > m_size )
+            Extend(n, v);
+    }
+

     size_type size() const
     {
         return m_size;
     size_type size() const
     {
         return m_size;


@@ -98,7 +269,11 @@ public:
 
     wxVector& operator=(const wxVector& vb)
     {
 
     wxVector& operator=(const wxVector& vb)
     {

-        Copy(vb);
+        if (this != &vb)
+        {
+            clear();
+            Copy(vb);
+        }

         return *this;
     }
 
         return *this;
     }
 


@@ -109,7 +284,7 @@ public:
         // use placement new to initialize new object in preallocated place in
         // m_values and store 'v' in it:
         void* const place = m_values + m_size;
         // use placement new to initialize new object in preallocated place in
         // m_values and store 'v' in it:
         void* const place = m_values + m_size;

-        new(place) value_type(v);
+        ::new(place) value_type(v);

 
         // only increase m_size if the ctor didn't throw an exception; notice
         // that if it _did_ throw, everything is OK, because we only increased
 
         // only increase m_size if the ctor didn't throw an exception; notice
         // that if it _did_ throw, everything is OK, because we only increased


@@ -147,6 +322,9 @@ public:
     const_iterator end() const { return m_values + size(); }
     iterator end() { return m_values + size(); }
 
     const_iterator end() const { return m_values + size(); }
     iterator end() { return m_values + size(); }
 

+    reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
+    reverse_iterator rend() { return reverse_iterator(begin() - 1); }
+

     iterator insert(iterator it, const value_type& v = value_type())
     {
         // NB: this must be done before reserve(), because reserve()
     iterator insert(iterator it, const value_type& v = value_type())
     {
         // NB: this must be done before reserve(), because reserve()


@@ -156,43 +334,28 @@ public:
 
         reserve(size() + 1);
 
 
         reserve(size() + 1);
 

+        // the place where the new element is going to be inserted
+        value_type * const place = m_values + idx;
+

         // unless we're inserting at the end, move following elements out of
         // the way:
         if ( after > 0 )
         // unless we're inserting at the end, move following elements out of
         // the way:
         if ( after > 0 )

-        {
-            memmove(m_values + idx + 1,
-                    m_values + idx,
-                    after * sizeof(value_type));
-        }
+            Ops::MemmoveForward(place + 1, place, after);

 
 

-#if wxUSE_EXCEPTIONS
-        try
-        {
-#endif
-            // use placement new to initialize new object in preallocated place
-            // in m_values and store 'v' in it:
-            void* const place = m_values + idx;
-            new(place) value_type(v);
-#if wxUSE_EXCEPTIONS
-        }
-        catch ( ... )
-        {
-            // if the ctor threw an exception, we need to move all the elements
-            // back to their original positions in m_values
-            if ( after > 0 )
-            {
-                memmove(m_values + idx,
-                        m_values + idx + 1,
-                        after * sizeof(value_type));
-            }
-
-            throw; // rethrow the exception
-        }
-#endif // wxUSE_EXCEPTIONS
+        // if the ctor called below throws an exception, we need to move all
+        // the elements back to their original positions in m_values
+        wxScopeGuard moveBack = wxMakeGuard(
+                Ops::MemmoveBackward, place, place + 1, after);
+        if ( !after )
+            moveBack.Dismiss();
+
+        // use placement new to initialize new object in preallocated place in
+        // m_values and store 'v' in it:
+        ::new(place) value_type(v);

 
 

-        // increment m_size only if ctor didn't throw -- if it did, we'll be
-        // left with m_values larger than necessary, but number of elements will
-        // be the same
+        // now that we did successfully add the new element, increment the size
+        // and disable moving the items back
+        moveBack.Dismiss();

         m_size++;
 
         return begin() + idx;
         m_size++;
 
         return begin() + idx;


@@ -215,14 +378,12 @@ public:
 
         // erase elements by calling their destructors:
         for ( iterator i = first; i < last; ++i )
 
         // erase elements by calling their destructors:
         for ( iterator i = first; i < last; ++i )

-            i->~value_type();
+            i->~T();

 
         // once that's done, move following elements over to the freed space:
         if ( after > 0 )
         {
 
         // once that's done, move following elements over to the freed space:
         if ( after > 0 )
         {

-            memmove(m_values + idx,
-                    m_values + idx + count,
-                    after * sizeof(value_type));
+            Ops::MemmoveBackward(m_values + idx, m_values + idx + count, after);

         }
 
         m_size -= count;
         }
 
         m_size -= count;


@@ -241,7 +402,6 @@ private:
 
     void Copy(const wxVector& vb)
     {
 
     void Copy(const wxVector& vb)
     {

-        clear();

         reserve(vb.size());
 
         for ( const_iterator i = vb.begin(); i != vb.end(); ++i )
         reserve(vb.size());
 
         for ( const_iterator i = vb.begin(); i != vb.end(); ++i )


@@ -249,6 +409,20 @@ private:
     }
 
 private:
     }
 
 private:

+    void Shrink(size_type n)
+    {
+        for ( size_type i = n; i < m_size; i++ )
+            m_values[i].~T();
+        m_size = n;
+    }
+
+    void Extend(size_type n, const value_type& v)
+    {
+        reserve(n);
+        for ( size_type i = m_size; i < n; i++ )
+            push_back(v);
+    }
+

     size_type m_size,
               m_capacity;
     value_type *m_values;
     size_type m_size,
               m_capacity;
     value_type *m_values;