system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: Calculate CircularQueue::end() correctly (for real this time)

Browse source 
Both my approach and the previous approach were wrong for different
cases. I've changed the Iterators index from storage-relative to
queue-relative, and it's much simpler and more obviously correct.

fixes #10383
This commit is contained in:
Peter Elliott 2021-10-07 20:06:51 -06:00 committed by Andreas Kling
parent c27f91142d
commit 39baadcddf
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
AK/CircularQueue.h
View file

@ -73,13 +73,11 @@ public:
bool operator!=(const ConstIterator& other) { return m_index != other.m_index; }
ConstIterator& operator++()
{
m_index = (m_index + 1) % Capacity;
if (m_index == m_queue.m_head)
m_index = m_queue.m_size;
++m_index;
return *this;
}
const T& operator*() const { return m_queue.elements()[m_index]; }
const T& operator*() const { return m_queue.at(m_index); }
private:
friend class CircularQueue;
@ -92,8 +90,8 @@ public:
size_t m_index { 0 };
};
ConstIterator begin() const { return ConstIterator(*this, m_head); }
ConstIterator end() const { return ConstIterator(*this, (m_head + size()) % Capacity); }
ConstIterator begin() const { return ConstIterator(*this, 0); }
ConstIterator end() const { return ConstIterator(*this, size()); }
size_t head_index() const { return m_head; }