Changeset 41068 in webkit for trunk/JavaScriptCore

Timestamp:

Feb 18, 2009, 3:26:35 PM (16 years ago)

Author:

[email protected]

Message:

2009-02-18 David Levin <​[email protected]>

Reviewed by Alexey Proskuryakov.

Bug 23974: Deque::Remove would be a useful method.
<​https://bugs.webkit.org/show_bug.cgi?id=23974>

Add Deque::remove and DequeIteratorBase<T>::operator=.

Why was operator= added? Every concrete iterator (DequeIterator..DequeConstReverseIterator)
was calling DequeIteratorBase::assign(), which called Base::operator=(). Base::operator=()
was not implemented. This went unnoticed because the iterator copy code has been unused.

• wtf/Deque.h: (WTF::Deque<T>::remove): (WTF::DequeIteratorBase<T>::removeFromIteratorsList): (WTF::DequeIteratorBase<T>::operator=): (WTF::DequeIteratorBase<T>::~DequeIteratorBase):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Deque.h (modified) (7 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-02-18  David Levin  <[email protected]>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Bug 23974: Deque::Remove would be a useful method.
+        <https://bugs.webkit.org/show_bug.cgi?id=23974>
+
+        Add Deque::remove and DequeIteratorBase<T>::operator=.
+
+        Why was operator= added? Every concrete iterator (DequeIterator..DequeConstReverseIterator)
+        was calling DequeIteratorBase::assign(), which called Base::operator=(). Base::operator=()
+        was not implemented. This went unnoticed because the iterator copy code has been unused.
+
+        * wtf/Deque.h:
+        (WTF::Deque<T>::remove):
+        (WTF::DequeIteratorBase<T>::removeFromIteratorsList):
+        (WTF::DequeIteratorBase<T>::operator=):
+        (WTF::DequeIteratorBase<T>::~DequeIteratorBase):
+
 2009-02-18  Gustavo Noronha Silva  <[email protected]>
 

trunk/JavaScriptCore/wtf/Deque.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76 +77 @@
         template<typename U> void prepend(const U&);
         void removeFirst();
+        void remove(iterator&);
+        void remove(const_iterator&);
 
         void clear();
@@ -86 +89 @@
         typedef DequeIteratorBase<T> IteratorBase;
 
+        void remove(size_t position);
         void invalidateIterators();
         void destroyAll();
@@ -125 +129 @@
     private:
         void addToIteratorsList();
+        void removeFromIteratorsList();
         void checkValidity() const;
         void checkValidity(const Base&) const;
@@ -448 +453 @@
     }
 
+    template<typename T>
+    inline void Deque<T>::remove(iterator& it)
+    {
+        it.checkValidity();
+        remove(it.m_index);
+    }
+
+    template<typename T>
+    inline void Deque<T>::remove(const_iterator& it)
+    {
+        it.checkValidity();
+        remove(it.m_index);
+    }
+
+    template<typename T>
+    inline void Deque<T>::remove(size_t position)
+    {
+        if (position == m_end)
+            return;
+
+        checkValidity();
+        invalidateIterators();
+
+        T* buffer = m_buffer.buffer();
+        TypeOperations::destruct(&buffer[position], &buffer[position + 1]);
+
+        // Find which segment of the circular buffer contained the remove element, and only move elements in that part.
+        if (position >= m_start) {
+            TypeOperations::moveOverlapping(buffer + m_start, buffer + position, buffer + m_start + 1);
+            m_start = (m_start + 1) % m_buffer.capacity();
+        } else {
+            TypeOperations::moveOverlapping(buffer + position + 1, buffer + m_end, buffer + position);
+            m_end = (m_end - 1 + m_buffer.capacity()) % m_buffer.capacity();
+        }
+        checkValidity();
+    }
+
 #ifdef NDEBUG
     template<typename T> inline void DequeIteratorBase<T>::checkValidity() const { }
     template<typename T> inline void DequeIteratorBase<T>::checkValidity(const DequeIteratorBase<T>&) const { }
     template<typename T> inline void DequeIteratorBase<T>::addToIteratorsList() { }
+    template<typename T> inline void DequeIteratorBase<T>::removeFromIteratorsList() { }
 #else
     template<typename T>
@@ -481 +524 @@
         m_previous = 0;
     }
-#endif
-
-    template<typename T>
-    inline DequeIteratorBase<T>::DequeIteratorBase()
-        : m_deque(0)
-    {
-    }
-
-    template<typename T>
-    inline DequeIteratorBase<T>::DequeIteratorBase(const Deque<T>* deque, size_t index)
-        : m_deque(const_cast<Deque<T>*>(deque))
-        , m_index(index)
-    {
-        addToIteratorsList();
-        checkValidity();
-    }
-
-    template<typename T>
-    inline DequeIteratorBase<T>::DequeIteratorBase(const Base& other)
-        : m_deque(other.m_deque)
-        , m_index(other.m_index)
-    {
-        addToIteratorsList();
-        checkValidity();
-    }
-
-    template<typename T>
-    inline DequeIteratorBase<T>::~DequeIteratorBase()
-    {
-#ifndef NDEBUG
-        // Delete iterator from doubly-linked list of iterators.
+
+    template<typename T>
+    void DequeIteratorBase<T>::removeFromIteratorsList()
+    {
         if (!m_deque) {
             ASSERT(!m_next);
@@ -529 +545 @@
             }
         }
-        m_deque = 0;
         m_next = 0;
         m_previous = 0;
+    }
+#endif
+
+    template<typename T>
+    inline DequeIteratorBase<T>::DequeIteratorBase()
+        : m_deque(0)
+    {
+    }
+
+    template<typename T>
+    inline DequeIteratorBase<T>::DequeIteratorBase(const Deque<T>* deque, size_t index)
+        : m_deque(const_cast<Deque<T>*>(deque))
+        , m_index(index)
+    {
+        addToIteratorsList();
+        checkValidity();
+    }
+
+    template<typename T>
+    inline DequeIteratorBase<T>::DequeIteratorBase(const Base& other)
+        : m_deque(other.m_deque)
+        , m_index(other.m_index)
+    {
+        addToIteratorsList();
+        checkValidity();
+    }
+
+    template<typename T>
+    inline DequeIteratorBase<T>& DequeIteratorBase<T>::operator=(const Base& other)
+    {
+        checkValidity();
+        other.checkValidity();
+        removeFromIteratorsList();
+
+        m_deque = other.m_deque;
+        m_index = other.m_index;
+        addToIteratorsList();
+        checkValidity();
+        return *this;
+    }
+
+    template<typename T>
+    inline DequeIteratorBase<T>::~DequeIteratorBase()
+    {
+#ifndef NDEBUG
+        removeFromIteratorsList();
+        m_deque = 0;
 #endif
     }