pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

tllist: use __typeof__ instead of __typeof

Browse source
This commit is contained in:
Daniel Eklöf 2018-12-15 11:45:57 +01:00
parent b4a3a09ae4
commit c67234e34f
1 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
tllist.h
View file

@ -38,35 +38,35 @@
#define tll_length(list) (list).length #define tll_length(list) (list).length
/* Adds a new item to the back of the list */ /* Adds a new item to the back of the list */
#define tll_push_back(list, new_item) \ #define tll_push_back(list, new_item) \
do { \ do { \
__typeof((list).head) __e = malloc(sizeof(*__e)); \ __typeof__((list).head) __e = malloc(sizeof(*__e)); \
__e->item = (new_item); \ __e->item = (new_item); \
__e->prev = (list).tail; \ __e->prev = (list).tail; \
__e->next = NULL; \ __e->next = NULL; \
if ((list).head == NULL) \ if ((list).head == NULL) \
(list).head = (list).tail = __e; \ (list).head = (list).tail = __e; \
else { \ else { \
(list).tail->next = __e; \ (list).tail->next = __e; \
(list).tail = __e; \ (list).tail = __e; \
} \ } \
(list).length++; \ (list).length++; \
} while (0) } while (0)
/* Adds a new item to the front of the list */ /* Adds a new item to the front of the list */
#define tll_push_front(list, new_item) \ #define tll_push_front(list, new_item) \
do { \ do { \
__typeof((list).head) __e = malloc(sizeof(*__e)); \ __typeof__((list).head) __e = malloc(sizeof(*__e)); \
__e->item = (new_item); \ __e->item = (new_item); \
__e->prev = NULL; \ __e->prev = NULL; \
__e->next = (list).head; \ __e->next = (list).head; \
if ((list).head == NULL) \ if ((list).head == NULL) \
(list).head = (list).tail = __e; \ (list).head = (list).tail = __e; \
else { \ else { \
(list).head->prev = __e; \ (list).head->prev = __e; \
(list).head = __e; \ (list).head = __e; \
} \ } \
(list).length++; \ (list).length++; \
} while (0) } while (0)
@ -100,21 +100,21 @@
* Removes an entry from the list. <it> is an iterator. I.e. you can * Removes an entry from the list. <it> is an iterator. I.e. you can
* only call this from inside a tll_foreach() or tll_rforeach() loop. * only call this from inside a tll_foreach() or tll_rforeach() loop.
*/ */
#define tll_remove(list, it) \ #define tll_remove(list, it) \
do { \ do { \
assert((list).length > 0); \ assert((list).length > 0); \
__typeof((list).head) __prev = it->prev; \ __typeof__((list).head) __prev = it->prev; \
__typeof((list).head) __next = it->next; \ __typeof__((list).head) __next = it->next; \
if (__prev != NULL) \ if (__prev != NULL) \
__prev->next = __next; \ __prev->next = __next; \
else \ else \
(list).head = __next; \ (list).head = __next; \
if (__next != NULL) \ if (__next != NULL) \
__next->prev = __prev; \ __next->prev = __prev; \
else \ else \
(list).tail = __prev; \ (list).tail = __prev; \
free(it); \ free(it); \
(list).length--; \ (list).length--; \
} while (0) } while (0)
/* Same as tll_remove(), but calls free_callback(it->item) */ /* Same as tll_remove(), but calls free_callback(it->item) */
@ -128,17 +128,17 @@
* Removes the first element from the list, and returns it (note: * Removes the first element from the list, and returns it (note:
* returns the *actual* item, not an iterator. * returns the *actual* item, not an iterator.
*/ */
#define tll_pop_front(list) \ #define tll_pop_front(list) \
({__typeof((list).head) it = (list).head; \ ({__typeof__((list).head) it = (list).head; \
__typeof((list).head->item) __ret = it->item; \ __typeof__((list).head->item) __ret = it->item; \
tll_remove((list), it); \ tll_remove((list), it); \
__ret; \ __ret; \
}) })
/* Same as tll_pop_front(), but returns/removes the *last* element */ /* Same as tll_pop_front(), but returns/removes the *last* element */
#define tll_pop_back(list) \ #define tll_pop_back(list) \
({__typeof((list).tail) it = (list).tail; \ ({__typeof__((list).tail) it = (list).tail; \
__typeof((list).tail->item) __ret = it->item; \ __typeof__((list).tail->item) __ret = it->item; \
tll_remove((list), it); \ tll_remove((list), it); \
__ret; \ __ret; \
}) })