[c] Made kvec.h use Spine FREE/MALLOC so custom allocators need only be injected in a single place. Thanks @Rattenhirn.

This commit is contained in:
badlogic 2017-01-23 10:45:24 +01:00
parent 369cda4335
commit c2cfbc6cb8

View File

@ -43,50 +43,63 @@ int main() {
* The initial version.
2017-19-18 (0.1.1):
Spine Special Edition
* Made helper macros for alloc, free and memcpy, which can be overridden.
* Made these helpers point to the Spine C Runtime alloc and free functions by default
* Reimplemented kv_resize to use alloc and free instead of realloc
* Changed kv_push to use kv_resize instead of realloc
* Removed kv_pushp and kv_a macros because the weren't used
* Removed stdlib include
*/
#ifndef AC_KVEC_H
#define AC_KVEC_H
#include <stdlib.h>
#ifndef _kv_free
#define _kv_free(type, p) (FREE(p))
#endif
#ifndef _kv_alloc
#define _kv_alloc(type, s) ((type*)(MALLOC(type, (s))))
#endif
#ifndef _kv_copy
#define _kv_copy(type, d, s, n) memcpy((d), (s), sizeof(type) * (n))
#endif
#define kv_roundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x))
#define kvec_t(type) struct { size_t n, m; type *a; }
#define kv_init(v) ((v).n = (v).m = 0, (v).a = 0)
#define kv_destroy(v) free((v).a)
#define kv_destroy(v) _kv_free(type, (v).a)
#define kv_A(v, i) ((v).a[(i)])
#define kv_array(v) ((v).a)
#define kv_pop(v) ((v).a[--(v).n])
#define kv_size(v) ((v).n)
#define kv_max(v) ((v).m)
#define kv_resize(type, v, s) ((v).m = (s), (v).a = (type*)realloc((v).a, sizeof(type) * (v).m))
#define kv_trim(type, v) (kv_resize(type, (v), kv_size(v)))
#define kv_resize(type, v, s) do { \
type* b = _kv_alloc(type, (s)); \
if (((s) > 0) && ((v).m > 0)) \
_kv_copy(type, b, (v).a, ((s) < (v).m)? (s) : (v).m); \
_kv_free(type, (v).a); \
(v).a = b; (v).m = (s); \
} while (0)
#define kv_trim(type, v) kv_resize(type, (v), kv_size(v))
#define kv_copy(type, v1, v0) do { \
if ((v1).m < (v0).n) kv_resize(type, v1, (v0).n); \
(v1).n = (v0).n; \
memcpy((v1).a, (v0).a, sizeof(type) * (v0).n); \
_kv_copy(type, (v1).a, (v0).a, (v0).n); \
} while (0) \
#define kv_push(type, v, x) do { \
if ((v).n == (v).m) { \
(v).m = (v).m? (v).m<<1 : 2; \
(v).a = (type*)realloc((v).a, sizeof(type) * (v).m); \
} \
if ((v).n == (v).m) \
kv_resize(type, (v), ((v).m? (v).m<<1 : 2)); \
(v).a[(v).n++] = (x); \
} while (0)
#define kv_pushp(type, v) (((v).n == (v).m)? \
((v).m = ((v).m? (v).m<<1 : 2), \
(v).a = (type*)realloc((v).a, sizeof(type) * (v).m), 0) \
: 0), ((v).a + ((v).n++))
#define kv_a(type, v, i) (((v).m <= (size_t)(i)? \
((v).m = (v).n = (i) + 1, kv_roundup32((v).m), \
(v).a = (type*)realloc((v).a, sizeof(type) * (v).m), 0) \
: (v).n <= (size_t)(i)? (v).n = (i) + 1 \
: 0), (v).a[(i)])
#endif