RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 13:17:44 +00:00
Code Issues Activity Actions

AK: Add basic const iteration to IntrusiveList

Browse source
This commit is contained in:
Andreas Kling 2021-03-11 14:12:33 +01:00
parent b7b7a48c66
commit 1b2ea12062
1 changed files with 41 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

86
AK/IntrusiveList.h
View file

@ -60,14 +60,21 @@ public:
class Iterator { class Iterator {
public: public:
Iterator(); Iterator() = default;
Iterator(T* value); Iterator(T* value)
: m_value(value)
{
}
T& operator*() const; T& operator*() const { return *m_value; }
T* operator->() const; T* operator->() const { return m_value; }
bool operator==(const Iterator& other) const; bool operator==(const Iterator& other) const { return other.m_value == m_value; }
bool operator!=(const Iterator& other) const { return !(*this == other); } bool operator!=(const Iterator& other) const { return !(*this == other); }
Iterator& operator++(); Iterator& operator++()
{
m_value = IntrusiveList<T, member>::next(m_value);
return *this;
}
Iterator& erase(); Iterator& erase();
private: private:
@ -75,7 +82,32 @@ public:
}; };
Iterator begin(); Iterator begin();
Iterator end(); Iterator end() { return Iterator {}; }
class ConstIterator {
public:
ConstIterator() = default;
ConstIterator(const T* value)
: m_value(value)
{
}
const T& operator*() const { return *m_value; }
const T* operator->() const { return m_value; }
bool operator==(const ConstIterator& other) const { return other.m_value == m_value; }
bool operator!=(const ConstIterator& other) const { return !(*this == other); }
ConstIterator& operator++()
{
m_value = IntrusiveList<T, member>::next(const_cast<T*>(m_value));
return *this;
}
private:
const T* m_value { nullptr };
};
ConstIterator begin() const;
ConstIterator end() const { return ConstIterator {}; }
private: private:
static T* next(T* current); static T* next(T* current);
@ -97,42 +129,6 @@ private:
IntrusiveListNode* m_prev = nullptr; IntrusiveListNode* m_prev = nullptr;
}; };
template<class T, IntrusiveListNode T::*member>
inline IntrusiveList<T, member>::Iterator::Iterator()
{
}
template<class T, IntrusiveListNode T::*member>
inline IntrusiveList<T, member>::Iterator::Iterator(T* value)
: m_value(value)
{
}
template<class T, IntrusiveListNode T::*member>
inline T& IntrusiveList<T, member>::Iterator::operator*() const
{
return *m_value;
}
template<class T, IntrusiveListNode T::*member>
inline T* IntrusiveList<T, member>::Iterator::operator->() const
{
return m_value;
}
template<class T, IntrusiveListNode T::*member>
inline bool IntrusiveList<T, member>::Iterator::operator==(const Iterator& other) const
{
return other.m_value == m_value;
}
template<class T, IntrusiveListNode T::*member>
inline typename IntrusiveList<T, member>::Iterator& IntrusiveList<T, member>::Iterator::operator++()
{
m_value = IntrusiveList<T, member>::next(m_value);
return *this;
}
template<class T, IntrusiveListNode T::*member> template<class T, IntrusiveListNode T::*member>
inline typename IntrusiveList<T, member>::Iterator& IntrusiveList<T, member>::Iterator::erase() inline typename IntrusiveList<T, member>::Iterator& IntrusiveList<T, member>::Iterator::erase()
{ {
@ -265,9 +261,9 @@ inline typename IntrusiveList<T, member>::Iterator IntrusiveList<T, member>::beg
} }
template<class T, IntrusiveListNode T::*member> template<class T, IntrusiveListNode T::*member>
inline typename IntrusiveList<T, member>::Iterator IntrusiveList<T, member>::end() inline typename IntrusiveList<T, member>::ConstIterator IntrusiveList<T, member>::begin() const
{ {
return Iterator(); return m_storage.m_first ? ConstIterator(node_to_value(*m_storage.m_first)) : ConstIterator();
} }
template<class T, IntrusiveListNode T::*member> template<class T, IntrusiveListNode T::*member>