nf7/nf7
nf7/nf7
1
0
Fork 0
Code Issues 9 Pull Requests Projects 3 Releases 5 Wiki Activity

enhance array util

Browse Source
This commit is contained in:
falsycat 2023-11-29 07:44:23 +09:00
parent 2df6937a94
commit 5a84ca7d8d
2 changed files with 71 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
util/array.h
View File

@ -8,28 +8,68 @@
#include "util/malloc.h"
#define NF7_UTIL_ARRAY(PREFIX, T) \
// HOW TO USE
// To use an array, you must prepare an array struct, and use its functions for
// any operations to the array.
//
// When you need an array of integers, the following array structs are
// available:
// - nf7_util_array_u8 / nf7_util_array_s8
// - nf7_util_array_u16 / nf7_util_array_s16
// - nf7_util_array_u32 / nf7_util_array_s32
// - nf7_util_array_u64 / nf7_util_array_s64
//
// When you need an array of any other types, expand NF7_UTIL_ARRAY macro on
// your *.h like this:
// `NF7_UTIL_ARRAY(my_array, struct A);`
// In addition, expand `NF7_UTIL_ARRAY_IMPL` macro on your *.c like this:
// `NF7_UTIL_ARRAY_IMPL(, my_array, struct A);`
// After that, `struct my_array` can be used as an array struct.
//
// If you need the functions be inline, expand NF7_UTIL_ARRAY_INLINE macro on
// your *.h as same as NF7_UTIL_ARRAY but NF7_UTIL_ARRAY_IMPL is unnecessary.
//
// You can see declarations of the functions on a definition of
// NF7_UTIL_ARRAY_DECL macro. They all are prefixed by a name of your array
// struct.
#define NF7_UTIL_ARRAY_TYPE(PREFIX, T) \
struct PREFIX { \
struct nf7_util_malloc* malloc; \
\
uint64_t n; \
T* ptr; \
}; \
\
static inline void PREFIX##_init(struct PREFIX* this, struct nf7_util_malloc* malloc) { \
static_assert(true)
#define NF7_UTIL_ARRAY_DECL(ATTR, PREFIX, T) \
ATTR void PREFIX##_init(struct PREFIX*, struct nf7_util_malloc*); \
ATTR void PREFIX##_deinit(struct PREFIX*); \
ATTR bool PREFIX##_resize(struct PREFIX*, uint64_t); \
ATTR bool PREFIX##_insert(struct PREFIX*, uint64_t, T); \
ATTR void PREFIX##_remove(struct PREFIX*, uint64_t); \
ATTR bool PREFIX##_find(struct PREFIX*, uint64_t*, const T); \
ATTR bool PREFIX##_find_and_remove(struct PREFIX*, const T); \
static_assert(true)
#define NF7_UTIL_ARRAY_IMPL(ATTR, PREFIX, T) \
ATTR void PREFIX##_init(struct PREFIX* this, struct nf7_util_malloc* malloc) { \
assert(nullptr != this); \
assert(nullptr != malloc); \
*this = (struct PREFIX) { \
.malloc = malloc, \
}; \
} \
static inline void PREFIX##_deinit(struct PREFIX* this) { \
ATTR void PREFIX##_deinit(struct PREFIX* this) { \
assert(nullptr != this); \
nf7_util_malloc_del(this->malloc, this->ptr); \
*this = (struct PREFIX) {0}; \
} \
\
static inline bool PREFIX##_resize(struct PREFIX* this, uint64_t n) { \
ATTR bool PREFIX##_resize(struct PREFIX* this, uint64_t n) { \
assert(nullptr != this); \
\
if (this->n == n) { \
@ -52,7 +92,7 @@
return true; \
} \
\
static inline bool PREFIX##_insert(struct PREFIX* this, uint64_t idx, T item) { \
ATTR bool PREFIX##_insert(struct PREFIX* this, uint64_t idx, T item) { \
assert(nullptr != this); \
\
if (idx > this->n) { \
@ -67,7 +107,7 @@
return true; \
} \
\
static inline void PREFIX##_remove(struct PREFIX* this, uint64_t idx) { \
ATTR void PREFIX##_remove(struct PREFIX* this, uint64_t idx) { \
assert(nullptr != this); \
\
if (0 == this->n) { \
@ -81,7 +121,7 @@
PREFIX##_resize(this, this->n - 1); \
} \
\
static inline bool PREFIX##_find(struct PREFIX* this, uint64_t* idx, const T needle) { \
ATTR bool PREFIX##_find(struct PREFIX* this, uint64_t* idx, const T needle) { \
assert(nullptr != this); \
assert(nullptr != idx); \
\
@ -93,7 +133,7 @@
} \
return false; \
} \
static inline bool PREFIX##_find_and_remove(struct PREFIX* this, const T needle) { \
ATTR bool PREFIX##_find_and_remove(struct PREFIX* this, const T needle) { \
assert(nullptr != this); \
\
uint64_t idx; \
@ -105,11 +145,24 @@
} \
static_assert(true)
NF7_UTIL_ARRAY(nf7_util_array_u8 , uint8_t);
NF7_UTIL_ARRAY(nf7_util_array_u16, uint16_t);
NF7_UTIL_ARRAY(nf7_util_array_u32, uint32_t);
NF7_UTIL_ARRAY(nf7_util_array_u64, uint64_t);
NF7_UTIL_ARRAY(nf7_util_array_s8 , int8_t);
NF7_UTIL_ARRAY(nf7_util_array_s16, int16_t);
NF7_UTIL_ARRAY(nf7_util_array_s32, int32_t);
NF7_UTIL_ARRAY(nf7_util_array_s64, int64_t);
#define NF7_UTIL_ARRAY(PREFIX, T) \
NF7_UTIL_ARRAY_TYPE(PREFIX, T); \
NF7_UTIL_ARRAY_DECL(, PREFIX, T); \
static_assert(true)
#define NF7_UTIL_ARRAY_INLINE(PREFIX, T) \
NF7_UTIL_ARRAY_TYPE(PREFIX, T); \
NF7_UTIL_ARRAY_DECL(static inline, PREFIX, T); \
NF7_UTIL_ARRAY_IMPL(static inline, PREFIX, T); \
static_assert(true)
NF7_UTIL_ARRAY_INLINE(nf7_util_array_u8 , uint8_t);
NF7_UTIL_ARRAY_INLINE(nf7_util_array_u16, uint16_t);
NF7_UTIL_ARRAY_INLINE(nf7_util_array_u32, uint32_t);
NF7_UTIL_ARRAY_INLINE(nf7_util_array_u64, uint64_t);
NF7_UTIL_ARRAY_INLINE(nf7_util_array_s8 , int8_t);
NF7_UTIL_ARRAY_INLINE(nf7_util_array_s16, int16_t);
NF7_UTIL_ARRAY_INLINE(nf7_util_array_s32, int32_t);
NF7_UTIL_ARRAY_INLINE(nf7_util_array_s64, int64_t);

2
util/signal.h
View File

@ -8,7 +8,7 @@
struct nf7_util_signal;
struct nf7_util_signal_recv;
NF7_UTIL_ARRAY(nf7_util_signal_recvs, struct nf7_util_signal_recv*);
NF7_UTIL_ARRAY_INLINE(nf7_util_signal_recvs, struct nf7_util_signal_recv*);
struct nf7_util_signal {