improve doubly linked list in the same way as the last commit

This commit is contained in:
jacekpoz 2024-03-11 12:05:05 +01:00
parent e07bb4eee0
commit 2eeca32ac9
Signed by: poz
SSH key fingerprint: SHA256:JyLeVWE4bF3tDnFeUpUaJsPsNlJyBldDGV/dIKSLyN8
2 changed files with 12 additions and 22 deletions

View file

@ -14,6 +14,7 @@ typedef struct {
size_t length; size_t length;
size_t element_size; size_t element_size;
Node *head; Node *head;
Node *tail;
} DoublyLinkedList; } DoublyLinkedList;
typedef struct { typedef struct {

View file

@ -17,6 +17,7 @@ DoublyLinkedList doubly_linked_list_new(size_t element_size) {
ret.length = 0; ret.length = 0;
ret.element_size = element_size; ret.element_size = element_size;
ret.head = NULL; ret.head = NULL;
ret.tail = NULL;
return ret; return ret;
} }
@ -26,20 +27,18 @@ void doubly_linked_list_insert(DoublyLinkedList *l, void *value) {
l->head = node_new(value, l->element_size); l->head = node_new(value, l->element_size);
l->head->next = l->head; l->head->next = l->head;
l->head->prev = l->head; l->head->prev = l->head;
l->tail = l->head;
l->length += 1; l->length += 1;
return; return;
} }
Node *tail = l->head; l->tail->next = node_new(value, l->element_size);
while (tail->next != l->head) { l->tail->next->next = l->head;
tail = tail->next; l->tail->next->prev = l->tail;
}
tail->next = node_new(value, l->element_size); l->tail = l->tail->next;
tail->next->next = l->head;
tail->next->prev = tail;
l->head->prev = tail->next; l->head->prev = l->tail;
l->length += 1; l->length += 1;
} }
@ -47,21 +46,11 @@ DoublyLinkedList doubly_linked_list_merge(DoublyLinkedList l1, DoublyLinkedList
if (l1.head == NULL) return l2; if (l1.head == NULL) return l2;
if (l2.head == NULL) return l1; if (l2.head == NULL) return l1;
Node *l1_tail = l1.head; l2.head->prev = l1.tail;
while (l1_tail->next != l1.head) { l1.tail->next = l2.head;
l1_tail = l1_tail->next;
}
l2.head->prev = l1_tail; l1.head->prev = l2.tail;
l1_tail->next = l2.head; l2.tail->next = l1.head;
Node *l2_tail = l2.head;
while (l2_tail->next != l2.head) {
l2_tail = l2_tail->next;
}
l1.head->prev = l2_tail;
l2_tail->next = l1.head;
l1.length += l2.length; l1.length += l2.length;