diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenlib/BLI_linklist_stack.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenlib/BLI_linklist_stack.h')
-rw-r--r-- | source/blender/blenlib/BLI_linklist_stack.h | 189 |
1 files changed, 97 insertions, 92 deletions
diff --git a/source/blender/blenlib/BLI_linklist_stack.h b/source/blender/blenlib/BLI_linklist_stack.h index abc799f31ba..3725682d380 100644 --- a/source/blender/blenlib/BLI_linklist_stack.h +++ b/source/blender/blenlib/BLI_linklist_stack.h @@ -42,55 +42,58 @@ * \{ */ #define BLI_LINKSTACK_DECLARE(var, type) \ - LinkNode *var; \ - BLI_mempool *var##_pool_; \ - type var##_type_ + LinkNode *var; \ + BLI_mempool *var##_pool_; \ + type var##_type_ -#define BLI_LINKSTACK_INIT(var) { \ - var = NULL; \ - var##_pool_ = BLI_mempool_create(sizeof(LinkNode), 0, 64, BLI_MEMPOOL_NOP); \ -} (void)0 +#define BLI_LINKSTACK_INIT(var) \ + { \ + var = NULL; \ + var##_pool_ = BLI_mempool_create(sizeof(LinkNode), 0, 64, BLI_MEMPOOL_NOP); \ + } \ + (void)0 -#define BLI_LINKSTACK_SIZE(var) \ - BLI_mempool_len(var##_pool_) +#define BLI_LINKSTACK_SIZE(var) BLI_mempool_len(var##_pool_) /* check for typeof() */ #ifdef __GNUC__ -#define BLI_LINKSTACK_PUSH(var, ptr) ( \ - CHECK_TYPE_INLINE(ptr, typeof(var##_type_)), \ - BLI_linklist_prepend_pool(&(var), ptr, var##_pool_)) -#define BLI_LINKSTACK_POP(var) \ - (var ? (typeof(var##_type_))BLI_linklist_pop_pool(&(var), var##_pool_) : NULL) -#define BLI_LINKSTACK_POP_DEFAULT(var, r) \ - (var ? (typeof(var##_type_))BLI_linklist_pop_pool(&(var), var##_pool_) : r) -#else /* non gcc */ -#define BLI_LINKSTACK_PUSH(var, ptr) ( \ - BLI_linklist_prepend_pool(&(var), ptr, var##_pool_)) -#define BLI_LINKSTACK_POP(var) \ - (var ? BLI_linklist_pop_pool(&(var), var##_pool_) : NULL) -#define BLI_LINKSTACK_POP_DEFAULT(var, r) \ - (var ? BLI_linklist_pop_pool(&(var), var##_pool_) : r) -#endif /* gcc check */ - -#define BLI_LINKSTACK_SWAP(var_a, var_b) { \ - CHECK_TYPE_PAIR(var_a##_type_, var_b##_type_); \ - SWAP(LinkNode *, var_a, var_b); \ - SWAP(BLI_mempool *, var_a##_pool_, var_b##_pool_); \ -} (void)0 - -#define BLI_LINKSTACK_FREE(var) { \ - BLI_mempool_destroy(var##_pool_); \ - var##_pool_ = NULL; (void)var##_pool_; \ - var = NULL; (void)var; \ - (void)&(var##_type_); \ -} (void)0 +# define BLI_LINKSTACK_PUSH(var, ptr) \ + (CHECK_TYPE_INLINE(ptr, typeof(var##_type_)), \ + BLI_linklist_prepend_pool(&(var), ptr, var##_pool_)) +# define BLI_LINKSTACK_POP(var) \ + (var ? (typeof(var##_type_))BLI_linklist_pop_pool(&(var), var##_pool_) : NULL) +# define BLI_LINKSTACK_POP_DEFAULT(var, r) \ + (var ? (typeof(var##_type_))BLI_linklist_pop_pool(&(var), var##_pool_) : r) +#else /* non gcc */ +# define BLI_LINKSTACK_PUSH(var, ptr) (BLI_linklist_prepend_pool(&(var), ptr, var##_pool_)) +# define BLI_LINKSTACK_POP(var) (var ? BLI_linklist_pop_pool(&(var), var##_pool_) : NULL) +# define BLI_LINKSTACK_POP_DEFAULT(var, r) (var ? BLI_linklist_pop_pool(&(var), var##_pool_) : r) +#endif /* gcc check */ + +#define BLI_LINKSTACK_SWAP(var_a, var_b) \ + { \ + CHECK_TYPE_PAIR(var_a##_type_, var_b##_type_); \ + SWAP(LinkNode *, var_a, var_b); \ + SWAP(BLI_mempool *, var_a##_pool_, var_b##_pool_); \ + } \ + (void)0 + +#define BLI_LINKSTACK_FREE(var) \ + { \ + BLI_mempool_destroy(var##_pool_); \ + var##_pool_ = NULL; \ + (void)var##_pool_; \ + var = NULL; \ + (void)var; \ + (void)&(var##_type_); \ + } \ + (void)0 #include "BLI_linklist.h" #include "BLI_mempool.h" /** \} */ - /* -------------------------------------------------------------------- */ /* Linked Stack, using stack memory (alloca) * @@ -98,7 +101,6 @@ * only use for lists small enough to fit on the stack. */ - /** \name Linked Stack (alloca) * \{ */ @@ -108,86 +110,89 @@ # define _BLI_SMALLSTACK_CAST(var) #endif -#define _BLI_SMALLSTACK_FAKEUSER(var) \ - (void)(&(_##var##_type)) +#define _BLI_SMALLSTACK_FAKEUSER(var) (void)(&(_##var##_type)) #define BLI_SMALLSTACK_DECLARE(var, type) \ - LinkNode *_##var##_stack = NULL, *_##var##_free = NULL, *_##var##_temp = NULL; \ - type _##var##_type + LinkNode *_##var##_stack = NULL, *_##var##_free = NULL, *_##var##_temp = NULL; \ + type _##var##_type #define BLI_SMALLSTACK_PUSH(var, data) \ -{ \ - CHECK_TYPE_PAIR(data, _##var##_type); \ - if (_##var##_free) { \ - _##var##_temp = _##var##_free; \ - _##var##_free = _##var##_free->next; \ - } \ - else { \ - _##var##_temp = alloca(sizeof(LinkNode)); \ - } \ - _##var##_temp->next = _##var##_stack; \ - _##var##_temp->link = data; \ - _##var##_stack = _##var##_temp; \ - _BLI_SMALLSTACK_FAKEUSER(var); \ -} (void)0 + { \ + CHECK_TYPE_PAIR(data, _##var##_type); \ + if (_##var##_free) { \ + _##var##_temp = _##var##_free; \ + _##var##_free = _##var##_free->next; \ + } \ + else { \ + _##var##_temp = alloca(sizeof(LinkNode)); \ + } \ + _##var##_temp->next = _##var##_stack; \ + _##var##_temp->link = data; \ + _##var##_stack = _##var##_temp; \ + _BLI_SMALLSTACK_FAKEUSER(var); \ + } \ + (void)0 /* internal use, no null check */ #define _BLI_SMALLSTACK_DEL_EX(var_src, var_dst) \ - (void)(_BLI_SMALLSTACK_FAKEUSER(var_src), \ - _BLI_SMALLSTACK_FAKEUSER(var_dst), \ - (_##var_src##_temp = _##var_src##_stack->next), \ - (_##var_src##_stack->next = _##var_dst##_free), \ - (_##var_dst##_free = _##var_src##_stack), \ - (_##var_src##_stack = _##var_src##_temp)) \ + (void)(_BLI_SMALLSTACK_FAKEUSER(var_src), \ + _BLI_SMALLSTACK_FAKEUSER(var_dst), \ + (_##var_src##_temp = _##var_src##_stack->next), \ + (_##var_src##_stack->next = _##var_dst##_free), \ + (_##var_dst##_free = _##var_src##_stack), \ + (_##var_src##_stack = _##var_src##_temp)) -#define _BLI_SMALLSTACK_DEL(var) \ - _BLI_SMALLSTACK_DEL_EX(var, var) \ +#define _BLI_SMALLSTACK_DEL(var) _BLI_SMALLSTACK_DEL_EX(var, var) /* check for typeof() */ #define BLI_SMALLSTACK_POP(var) \ - (_BLI_SMALLSTACK_CAST(var) ((_##var##_stack) ? \ - (_BLI_SMALLSTACK_DEL(var), (_##var##_free->link)) : NULL)) + (_BLI_SMALLSTACK_CAST(var)( \ + (_##var##_stack) ? (_BLI_SMALLSTACK_DEL(var), (_##var##_free->link)) : NULL)) /* support to put the free-node into another stack */ #define BLI_SMALLSTACK_POP_EX(var_src, var_dst) \ - (_BLI_SMALLSTACK_CAST(var_src) ((_##var_src##_stack) ? \ - (_BLI_SMALLSTACK_DEL_EX(var_src, var_dst), (_##var_dst##_free->link)) : NULL)) + (_BLI_SMALLSTACK_CAST(var_src)( \ + (_##var_src##_stack) ? \ + (_BLI_SMALLSTACK_DEL_EX(var_src, var_dst), (_##var_dst##_free->link)) : \ + NULL)) #define BLI_SMALLSTACK_PEEK(var) \ - (_BLI_SMALLSTACK_CAST(var) ((_##var##_stack) ? \ - _##var##_stack->link : NULL)) + (_BLI_SMALLSTACK_CAST(var)((_##var##_stack) ? _##var##_stack->link : NULL)) -#define BLI_SMALLSTACK_IS_EMPTY(var) \ - ((_BLI_SMALLSTACK_CAST(var) _##var##_stack) == NULL) +#define BLI_SMALLSTACK_IS_EMPTY(var) ((_BLI_SMALLSTACK_CAST(var) _##var##_stack) == NULL) /* fill in a lookup table */ #define BLI_SMALLSTACK_AS_TABLE(var, data) \ -{ \ - LinkNode *_##var##_iter; \ - unsigned int i; \ - for (_##var##_iter = _##var##_stack, i = 0; _##var##_iter; _##var##_iter = _##var##_iter->next, i++) { \ - (data)[i] = _BLI_SMALLSTACK_CAST(var) (_##var##_iter->link); \ - } \ -} ((void)0) + { \ + LinkNode *_##var##_iter; \ + unsigned int i; \ + for (_##var##_iter = _##var##_stack, i = 0; _##var##_iter; \ + _##var##_iter = _##var##_iter->next, i++) { \ + (data)[i] = _BLI_SMALLSTACK_CAST(var)(_##var##_iter->link); \ + } \ + } \ + ((void)0) /* loop over stack members last-added-first */ #define BLI_SMALLSTACK_ITER_BEGIN(var, item) \ - { \ - LinkNode *_##var##_iter; \ - for (_##var##_iter = _##var##_stack; _##var##_iter; _##var##_iter = _##var##_iter->next) { \ - item = _BLI_SMALLSTACK_CAST(var) (_##var##_iter->link); \ + { \ + LinkNode *_##var##_iter; \ + for (_##var##_iter = _##var##_stack; _##var##_iter; _##var##_iter = _##var##_iter->next) { \ + item = _BLI_SMALLSTACK_CAST(var)(_##var##_iter->link); #define BLI_SMALLSTACK_ITER_END \ - } \ - } (void)0 + } \ + } \ + (void)0 #define BLI_SMALLSTACK_SWAP(var_a, var_b) \ -{ \ - CHECK_TYPE_PAIR(_##var_a##_type, _##var_b##_type); \ - SWAP(LinkNode *, _##var_a##_stack, _##var_b##_stack); \ - SWAP(LinkNode *, _##var_a##_free, _##var_b##_free); \ -} (void)0 + { \ + CHECK_TYPE_PAIR(_##var_a##_type, _##var_b##_type); \ + SWAP(LinkNode *, _##var_a##_stack, _##var_b##_stack); \ + SWAP(LinkNode *, _##var_a##_free, _##var_b##_free); \ + } \ + (void)0 /** \} */ -#endif /* __BLI_LINKLIST_STACK_H__ */ +#endif /* __BLI_LINKLIST_STACK_H__ */ |