Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added DoublyLinkedListMemberGetLink class which directly accesses the 

link member in the element class. Usually more comfortable for structs.
* Added Add() method as synonym for Insert().
* Made fGetLink member static to save memory in objects using it.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11188 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-02-02 01:48:43 +00:00
parent ef13ad9efd
commit 2cfdb0ed38
1 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
headers/private/kernel/util/DoublyLinkedList.h
View File

@ -189,6 +189,25 @@ public:
} }
}; };
// DoublyLinkedListMemberGetLink
template<typename Element,
DoublyLinkedListLink<Element> Element::* LinkMember = &Element::fLink>
class DoublyLinkedListMemberGetLink {
private:
typedef DoublyLinkedListLink<Element> Link;
public:
inline Link *operator()(Element *element) const
{
return &(element->*LinkMember);
}
inline const Link *operator()(const Element *element) const
{
return &(element->*LinkMember);
}
};
// for convenience // for convenience
#define DOUBLY_LINKED_LIST_TEMPLATE_LIST \ #define DOUBLY_LINKED_LIST_TEMPLATE_LIST \
template<typename Element, typename GetLink> template<typename Element, typename GetLink>
@ -294,13 +313,12 @@ public:
public: public:
DoublyLinkedList() : fFirst(NULL), fLast(NULL) {} DoublyLinkedList() : fFirst(NULL), fLast(NULL) {}
DoublyLinkedList(const GetLink &getLink)
: fFirst(NULL), fLast(NULL), fGetLink(getLink) {}
~DoublyLinkedList() {} ~DoublyLinkedList() {}
inline bool IsEmpty() const { return (fFirst == NULL); } inline bool IsEmpty() const { return (fFirst == NULL); }
inline void Insert(Element *element, bool back = true); inline void Insert(Element *element, bool back = true);
inline void Add(Element *element, bool back = true);
inline void Remove(Element *element); inline void Remove(Element *element);
inline void Swap(Element *a, Element *b); inline void Swap(Element *a, Element *b);
@ -328,7 +346,8 @@ public:
private: private:
Element *fFirst; Element *fFirst;
Element *fLast; Element *fLast;
GetLink fGetLink;
static GetLink sGetLink;
}; };
@ -342,21 +361,21 @@ DOUBLY_LINKED_LIST_CLASS_NAME::Insert(Element *element, bool back)
if (element) { if (element) {
if (back) { if (back) {
// append // append
Link *elLink = fGetLink(element); Link *elLink = sGetLink(element);
elLink->previous = fLast; elLink->previous = fLast;
elLink->next = NULL; elLink->next = NULL;
if (fLast) if (fLast)
fGetLink(fLast)->next = element; sGetLink(fLast)->next = element;
else else
fFirst = element; fFirst = element;
fLast = element; fLast = element;
} else { } else {
// prepend // prepend
Link *elLink = fGetLink(element); Link *elLink = sGetLink(element);
elLink->previous = NULL; elLink->previous = NULL;
elLink->next = fFirst; elLink->next = fFirst;
if (fFirst) if (fFirst)
fGetLink(fFirst)->previous = element; sGetLink(fFirst)->previous = element;
else else
fLast = element; fLast = element;
fFirst = element; fFirst = element;
@ -364,19 +383,27 @@ DOUBLY_LINKED_LIST_CLASS_NAME::Insert(Element *element, bool back)
} }
} }
// Add
DOUBLY_LINKED_LIST_TEMPLATE_LIST
void
DOUBLY_LINKED_LIST_CLASS_NAME::Add(Element *element, bool back)
{
Insert(element, back);
}
// Remove // Remove
DOUBLY_LINKED_LIST_TEMPLATE_LIST DOUBLY_LINKED_LIST_TEMPLATE_LIST
void void
DOUBLY_LINKED_LIST_CLASS_NAME::Remove(Element *element) DOUBLY_LINKED_LIST_CLASS_NAME::Remove(Element *element)
{ {
if (element) { if (element) {
Link *elLink = fGetLink(element); Link *elLink = sGetLink(element);
if (elLink->previous) if (elLink->previous)
fGetLink(elLink->previous)->next = elLink->next; sGetLink(elLink->previous)->next = elLink->next;
else else
fFirst = elLink->next; fFirst = elLink->next;
if (elLink->next) if (elLink->next)
fGetLink(elLink->next)->previous = elLink->previous; sGetLink(elLink->next)->previous = elLink->previous;
else else
fLast = elLink->previous; fLast = elLink->previous;
elLink->previous = NULL; elLink->previous = NULL;
@ -390,30 +417,30 @@ void
DOUBLY_LINKED_LIST_CLASS_NAME::Swap(Element *a, Element *b) DOUBLY_LINKED_LIST_CLASS_NAME::Swap(Element *a, Element *b)
{ {
if (a && b && a != b) { if (a && b && a != b) {
Link *aLink = fGetLink(a); Link *aLink = sGetLink(a);
Link *bLink = fGetLink(b); Link *bLink = sGetLink(b);
Element *aPrev = aLink->previous; Element *aPrev = aLink->previous;
Element *bPrev = bLink->previous; Element *bPrev = bLink->previous;
Element *aNext = aLink->next; Element *aNext = aLink->next;
Element *bNext = bLink->next; Element *bNext = bLink->next;
// place a // place a
if (bPrev) if (bPrev)
fGetLink(bPrev)->next = a; sGetLink(bPrev)->next = a;
else else
fFirst = a; fFirst = a;
if (bNext) if (bNext)
fGetLink(bNext)->previous = a; sGetLink(bNext)->previous = a;
else else
fLast = a; fLast = a;
aLink->previous = bPrev; aLink->previous = bPrev;
aLink->next = bNext; aLink->next = bNext;
// place b // place b
if (aPrev) if (aPrev)
fGetLink(aPrev)->next = b; sGetLink(aPrev)->next = b;
else else
fFirst = b; fFirst = b;
if (aNext) if (aNext)
fGetLink(aNext)->previous = b; sGetLink(aNext)->previous = b;
else else
fLast = b; fLast = b;
bLink->previous = aPrev; bLink->previous = aPrev;
@ -428,8 +455,8 @@ DOUBLY_LINKED_LIST_CLASS_NAME::MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME *fromList)
{ {
if (fromList && fromList->fFirst) { if (fromList && fromList->fFirst) {
if (fFirst) { if (fFirst) {
fGetLink(fLast)->next = fromList->fFirst; sGetLink(fLast)->next = fromList->fFirst;
fGetLink(fFirst)->previous = fLast; sGetLink(fFirst)->previous = fLast;
fLast = fromList->fLast; fLast = fromList->fLast;
} else { } else {
fFirst = fromList->fFirst; fFirst = fromList->fFirst;
@ -447,7 +474,7 @@ DOUBLY_LINKED_LIST_CLASS_NAME::RemoveAll()
{ {
Element *element = fFirst; Element *element = fFirst;
while (element) { while (element) {
Link *elLink = fGetLink(element); Link *elLink = sGetLink(element);
element = elLink->next; element = elLink->next;
elLink->previous = NULL; elLink->previous = NULL;
elLink->next = NULL; elLink->next = NULL;
@ -463,7 +490,7 @@ DOUBLY_LINKED_LIST_CLASS_NAME::GetPrevious(Element *element) const
{ {
Element *result = NULL; Element *result = NULL;
if (element) if (element)
result = fGetLink(element)->previous; result = sGetLink(element)->previous;
return result; return result;
} }
@ -474,7 +501,7 @@ DOUBLY_LINKED_LIST_CLASS_NAME::GetNext(Element *element) const
{ {
Element *result = NULL; Element *result = NULL;
if (element) if (element)
result = fGetLink(element)->next; result = sGetLink(element)->next;
return result; return result;
} }
@ -489,6 +516,10 @@ DOUBLY_LINKED_LIST_CLASS_NAME::Size() const
return count; return count;
} }
// sGetLink
DOUBLY_LINKED_LIST_TEMPLATE_LIST
GetLink DOUBLY_LINKED_LIST_CLASS_NAME::sGetLink;
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif // _KERNEL_UTIL_DOUBLY_LINKED_LIST_H #endif // _KERNEL_UTIL_DOUBLY_LINKED_LIST_H