From 6f2807ac42a42d42aea9b34c89b0cbbd5755fe49 Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Sat, 20 Feb 2021 17:36:17 +0100 Subject: Renamed push_items to emplace_n --- docs/ccommon_api.md | 6 +++--- docs/cdeq_api.md | 4 ++-- docs/clist_api.md | 2 +- docs/cmap_api.md | 2 +- docs/cpque_api.md | 4 ++-- docs/cqueue_api.md | 2 +- docs/cset_api.md | 2 +- docs/csmap_api.md | 2 +- docs/csset_api.md | 2 +- docs/cstack_api.md | 2 +- docs/cvec_api.md | 4 ++-- examples/advanced.c | 2 +- examples/csmap_v1.h | 6 +++--- examples/inits.c | 10 +++++----- examples/list.c | 2 +- examples/priority.c | 2 +- stc/ccommon.h | 10 +++++----- stc/cdeq.h | 6 +++--- stc/clist.h | 6 +++--- stc/cmap.h | 2 +- stc/cpque.h | 6 +++--- stc/cqueue.h | 4 ++-- stc/csmap.h | 2 +- stc/cstack.h | 4 ++-- stc/cvec.h | 6 +++--- 25 files changed, 50 insertions(+), 50 deletions(-) diff --git a/docs/ccommon_api.md b/docs/ccommon_api.md index e9d6fe12..2302c884 100644 --- a/docs/ccommon_api.md +++ b/docs/ccommon_api.md @@ -2,11 +2,11 @@ The following handy macros are completely safe to use, i.e. they have no side-effects. -### c_init, c_push_items -**c_init** declares and initializes any container with an array of elements. **c_push_items** adds elements to any existing container: +### c_init, c_emplace_n +**c_init** declares and initializes any container with an array of elements. **c_emplace_n** adds elements to any existing container: ```c c_init (cvec_i, vec, {1, 2, 3}); -c_push_items(&vec, cvec_i, {4, 5, 6}); +c_emplace_n(&vec, cvec_i, {4, 5, 6}); ``` ### c_forrange diff --git a/docs/cdeq_api.md b/docs/cdeq_api.md index ed4730c6..09fcb535 100644 --- a/docs/cdeq_api.md +++ b/docs/cdeq_api.md @@ -64,7 +64,7 @@ void cdeq_X_push_front(cdeq_X* self, Value value); void cdeq_X_push_back(cdeq_X* self, Value value); void cdeq_X_emplace_front(cdeq_X* self, RawValue raw); void cdeq_X_emplace_back(cdeq_X* self, RawValue raw); -void cdeq_X_push_n(cdeq_X *self, const cdeq_X_rawvalue_t arr[], size_t size); +void cdeq_X_emplace_n(cdeq_X *self, const cdeq_X_rawvalue_t arr[], size_t size); void cdeq_X_pop_front(cdeq_X* self); void cdeq_X_pop_back(cdeq_X* self); @@ -119,7 +119,7 @@ int main() { printf(" %d", *i.ref); puts(""); - c_push_items(&q, cdeq_i, {1, 4, 5, 22, 33, 2}); + c_emplace_n(&q, cdeq_i, {1, 4, 5, 22, 33, 2}); c_foreach (i, cdeq_i, q) printf(" %d", *i.ref); puts(""); diff --git a/docs/clist_api.md b/docs/clist_api.md index 3482cede..b1e009e7 100644 --- a/docs/clist_api.md +++ b/docs/clist_api.md @@ -60,7 +60,7 @@ void clist_X_emplace_front(clist_X* self, RawValue raw); // non-std: void clist_X_push_back(clist_X* self, Value value); void clist_X_emplace_back(clist_X* self, RawValue raw); -void clist_X_push_n(clist_X *self, const clist_X_rawvalue_t arr[], size_t size); +void clist_X_emplace_n(clist_X *self, const clist_X_rawvalue_t arr[], size_t size); void clist_X_pop_front(clist_X* self); diff --git a/docs/cmap_api.md b/docs/cmap_api.md index ccd4532f..77e4d523 100644 --- a/docs/cmap_api.md +++ b/docs/cmap_api.md @@ -67,7 +67,7 @@ cmap_X_result_t cmap_X_insert(cmap_X* self, Key key, Mapped mapped); cmap_X_result_t cmap_X_insert_or_assign(cmap_X* self, Key key, Mapped mapped); // always update mapped cmap_X_result_t cmap_X_emplace(cmap_X* self, RawKey rkey, RawMapped rmapped); // no change if rkey in map cmap_X_result_t cmap_X_emplace_put(cmap_X* self, RawKey rkey, RawMapped rmapped); // always update rmapped -void cmap_X_push_n(cmap_X* self, const cmap_X_rawvalue_t arr[], size_t size); +void cmap_X_emplace_n(cmap_X* self, const cmap_X_rawvalue_t arr[], size_t size); cmap_X_mapped_t* cmap_X_at(const cmap_X* self, RawKey rkey); // rkey must be in map. diff --git a/docs/cpque_api.md b/docs/cpque_api.md index badc6315..d2a5d8e0 100644 --- a/docs/cpque_api.md +++ b/docs/cpque_api.md @@ -41,7 +41,7 @@ cpque_X_value_t* cpque_X_top(const cpque_X* self); void cpque_X_push(cpque_X* self, cpque_X_value_t value); void cpque_X_emplace(cpque_X* self, cpque_X_rawvalue_t raw); -void cpque_X_push_n(cpque_X *self, const cpque_X_rawvalue_t arr[], size_t size); +void cpque_X_emplace_n(cpque_X *self, const cpque_X_rawvalue_t arr[], size_t size); void cpque_X_pop(cpque_X* self); void cpque_X_erase_at(cpque_X* self, size_t idx); @@ -76,7 +76,7 @@ int main() // Push ten million random numbers to priority queue, plus some negative ones. c_forrange (N) cpque_i_push(&heap, stc64_uniform(&rng, &dist)); - c_push_items(&heap, cpque_i, {-231, -32, -873, -4, -343}); + c_emplace_n(&heap, cpque_i, {-231, -32, -873, -4, -343}); // Extract and display the fifty smallest. c_forrange (50) { diff --git a/docs/cqueue_api.md b/docs/cqueue_api.md index 653f9bfd..c5429ff6 100644 --- a/docs/cqueue_api.md +++ b/docs/cqueue_api.md @@ -36,7 +36,7 @@ cqueue_X_value_t* cqueue_X_back(cqueue_X* self); void cqueue_X_push(cqueue_X* self, cqueue_X_value_t value); void cqueue_X_emplace(cqueue_X* self, cqueue_X_rawvalue_t raw); -void cqueue_X_push_n(cqueue_X *self, const cqueue_X_rawvalue_t arr[], size_t size); +void cqueue_X_emplace_n(cqueue_X *self, const cqueue_X_rawvalue_t arr[], size_t size); void cqueue_X_pop(cqueue_X* self); diff --git a/docs/cset_api.md b/docs/cset_api.md index d2064cf2..33d48415 100644 --- a/docs/cset_api.md +++ b/docs/cset_api.md @@ -51,7 +51,7 @@ bool cset_X_contains(const cset_X* self, RawKey rkey); cset_X_result_t cset_X_insert(cset_X* self, Key key); cset_X_result_t cset_X_emplace(cset_X* self, RawKey rkey); -void cset_X_push_n(cset_X* self, const RawKey arr[], size_t size); +void cset_X_emplace_n(cset_X* self, const RawKey arr[], size_t size); size_t cset_X_erase(cset_X* self, RawKey rkey); cset_X_iter_t cset_X_erase_at(cset_X* self, cset_X_iter_t pos); diff --git a/docs/csmap_api.md b/docs/csmap_api.md index 7bc52406..f7f650fa 100644 --- a/docs/csmap_api.md +++ b/docs/csmap_api.md @@ -60,7 +60,7 @@ csmap_X_result_t csmap_X_insert(csmap_X* self, Key key, Mapped mapped); csmap_X_result_t csmap_X_insert_or_assign(csmap_X* self, Key key, Mapped mapped); // always update mapped csmap_X_result_t csmap_X_emplace(csmap_X* self, RawKey rkey, RawMapped rmapped); // no change if rkey in map csmap_X_result_t csmap_X_emplace_put(csmap_X* self, RawKey rkey, RawMapped rmapped); // always update rmapped -void csmap_X_push_n(csmap_X* self, const csmap_X_rawvalue_t arr[], size_t size); +void csmap_X_emplace_n(csmap_X* self, const csmap_X_rawvalue_t arr[], size_t size); csmap_X_mapped_t* csmap_X_at(const csmap_X* self, RawKey rkey); // rkey must be in map. diff --git a/docs/csset_api.md b/docs/csset_api.md index 79c01b72..8a8ba62e 100644 --- a/docs/csset_api.md +++ b/docs/csset_api.md @@ -46,7 +46,7 @@ bool csset_X_contains(const csset_X* self, RawKey rkey); csset_X_result_t csset_X_insert(csset_X* self, Key key); csset_X_result_t csset_X_emplace(csset_X* self, RawKey rkey); -void csset_X_push_n(csset_X* self, const RawKey arr[], size_t size); +void csset_X_emplace_n(csset_X* self, const RawKey arr[], size_t size); size_t csset_X_erase(csset_X* self, RawKey rkey); csset_X_iter_t csset_X_erase_at(csset_X* self, csset_X_iter_t pos); diff --git a/docs/cstack_api.md b/docs/cstack_api.md index 86b0e42a..37b21497 100644 --- a/docs/cstack_api.md +++ b/docs/cstack_api.md @@ -36,7 +36,7 @@ cstack_X_value_t* cstack_X_top(cstack_X* self); void cstack_X_push(cstack_X* self, cstack_X_value_t value); void cstack_X_emplace(cstack_X* self, cstack_X_rawvalue_t raw); -void cstack_X_push_n(cstack_X *self, const cstack_X_rawvalue_t arr[], size_t size); +void cstack_X_emplace_n(cstack_X *self, const cstack_X_rawvalue_t arr[], size_t size); void cstack_X_pop(cstack_X* self); diff --git a/docs/cvec_api.md b/docs/cvec_api.md index fdbd879f..3032c8e0 100644 --- a/docs/cvec_api.md +++ b/docs/cvec_api.md @@ -62,7 +62,7 @@ cvec_X_value_t* cvec_X_back(cvec_X* self); void cvec_X_push_back(cvec_X* self, Value value); void cvec_X_emplace_back(cvec_X* self, RawValue raw); -void cvec_X_push_n(cvec_X *self, const cvec_X_rawvalue_t arr[], size_t size); +void cvec_X_emplace_n(cvec_X *self, const cvec_X_rawvalue_t arr[], size_t size); void cvec_X_pop_back(cvec_X* self); @@ -116,7 +116,7 @@ int main() { // Create a vector containing integers cvec_i vec = cvec_i_init(); - c_push_items(&vec, cvec_i, {7, 5, 16, 8}); + c_emplace_n(&vec, cvec_i, {7, 5, 16, 8}); // Add two more integers to vector cvec_i_push_back(&vec, 25); diff --git a/examples/advanced.c b/examples/advanced.c index 8d045b3a..01efc10c 100644 --- a/examples/advanced.c +++ b/examples/advanced.c @@ -42,7 +42,7 @@ using_cmap_keyarg(vk, Viking, int, vikingraw_equals, vikingraw_hash, int main() { cmap_vk vikings = cmap_vk_init(); - c_push_items(&vikings, cmap_vk, { + c_emplace_n(&vikings, cmap_vk, { { {"Einar", "Norway"}, 20}, { {"Olaf", "Denmark"}, 24}, { {"Harald", "Iceland"}, 12}, diff --git a/examples/csmap_v1.h b/examples/csmap_v1.h index 33673b65..4e785a2b 100644 --- a/examples/csmap_v1.h +++ b/examples/csmap_v1.h @@ -231,7 +231,7 @@ int main(void) { return res; \ } \ STC_INLINE C##_##X##_result_t \ - C##_##X##_put(C##_##X* self, RawKey rkey MAP_ONLY_##C(, RawMapped rmapped)) { \ + C##_##X##_emplace_put(C##_##X* self, RawKey rkey MAP_ONLY_##C(, RawMapped rmapped)) { \ C##_##X##_result_t res = C##_##X##_insert_entry_(self, rkey); \ if (res.second) *KEY_REF_##C(res.first) = keyFromRaw(rkey); \ MAP_ONLY_##C( else mappedDel(&res.first->second); \ @@ -239,9 +239,9 @@ int main(void) { return res; \ } \ STC_INLINE void \ - C##_##X##_push_n(C##_##X* self, const C##_##X##_rawvalue_t arr[], size_t n) { \ + C##_##X##_emplace_n(C##_##X* self, const C##_##X##_rawvalue_t arr[], size_t n) { \ for (size_t i=0; icap;} \ STC_INLINE Value \ - cdeq_##X##_value_from_raw(RawValue raw) {return valueFromRaw(raw);} \ + cdeq_##X##_value_fromraw(RawValue raw) {return valueFromRaw(raw);} \ STC_INLINE cdeq_##X##_value_t \ cdeq_##X##_value_clone(cdeq_##X##_value_t val) {return valueFromRaw(valueToRaw(&val));} \ STC_API void \ @@ -100,7 +100,7 @@ struct cdeq_rep { size_t size, cap; void* base[]; }; } \ \ STC_API void \ - cdeq_##X##_push_n(cdeq_##X *self, const cdeq_##X##_rawvalue_t arr[], size_t n); \ + cdeq_##X##_emplace_n(cdeq_##X *self, const cdeq_##X##_rawvalue_t arr[], size_t n); \ STC_API void \ cdeq_##X##_push_back(cdeq_##X* self, Value value); \ STC_INLINE void \ @@ -226,7 +226,7 @@ static inline double _maxf(double x, double y) {return x > y ? x : y;} } \ \ STC_DEF void \ - cdeq_##X##_push_n(cdeq_##X *self, const cdeq_##X##_rawvalue_t arr[], size_t n) { \ + cdeq_##X##_emplace_n(cdeq_##X *self, const cdeq_##X##_rawvalue_t arr[], size_t n) { \ if (!n) return; \ _cdeq_##X##_expand(self, n, false); \ cdeq_##X##_value_t* p = self->data + _cdeq_rep(self)->size; \ diff --git a/stc/clist.h b/stc/clist.h index ff05f97b..9ee6fb1f 100644 --- a/stc/clist.h +++ b/stc/clist.h @@ -108,7 +108,7 @@ STC_API size_t _clist_size(const clist_void* self); STC_INLINE size_t \ clist_##X##_size(clist_##X ls) {return _clist_size((const clist_void*) &ls);} \ STC_INLINE Value \ - clist_##X##_value_from_raw(RawValue raw) {return valueFromRaw(raw);} \ + clist_##X##_value_fromraw(RawValue raw) {return valueFromRaw(raw);} \ STC_INLINE clist_##X##_value_t \ clist_##X##_value_clone(clist_##X##_value_t val) {return valueFromRaw(valueToRaw(&val));} \ \ @@ -120,7 +120,7 @@ STC_API size_t _clist_size(const clist_void* self); clist_##X##_clear(clist_##X* self) {clist_##X##_del(self);} \ \ STC_API void \ - clist_##X##_push_n(clist_##X *self, const clist_##X##_rawvalue_t arr[], size_t size); \ + clist_##X##_emplace_n(clist_##X *self, const clist_##X##_rawvalue_t arr[], size_t size); \ STC_API void \ clist_##X##_push_back(clist_##X* self, Value value); \ STC_INLINE void \ @@ -240,7 +240,7 @@ STC_API size_t _clist_size(const clist_void* self); if (!self->last) self->last = entry; \ } \ STC_DEF void \ - clist_##X##_push_n(clist_##X *self, const clist_##X##_rawvalue_t arr[], size_t size) { \ + clist_##X##_emplace_n(clist_##X *self, const clist_##X##_rawvalue_t arr[], size_t size) { \ for (size_t i=0; isize;} \ STC_INLINE Value \ - cvec_##X##_value_from_raw(RawValue raw) {return valueFromRaw(raw);} \ + cvec_##X##_value_fromraw(RawValue raw) {return valueFromRaw(raw);} \ STC_INLINE cvec_##X##_value_t \ cvec_##X##_value_clone(cvec_##X##_value_t val) {return valueFromRaw(valueToRaw(&val));} \ STC_INLINE void \ @@ -95,7 +95,7 @@ struct cvec_rep { size_t size, cap; void* data[]; }; cvec_##X##_del(self); *self = x; \ } \ STC_API void \ - cvec_##X##_push_n(cvec_##X *self, const cvec_##X##_rawvalue_t arr[], size_t size); \ + cvec_##X##_emplace_n(cvec_##X *self, const cvec_##X##_rawvalue_t arr[], size_t size); \ STC_API void \ cvec_##X##_push_back(cvec_##X* self, Value value); \ STC_INLINE void \ @@ -204,7 +204,7 @@ static struct cvec_rep _cvec_inits = {0, 0}; } \ \ STC_DEF void \ - cvec_##X##_push_n(cvec_##X *self, const cvec_##X##_rawvalue_t arr[], size_t n) { \ + cvec_##X##_emplace_n(cvec_##X *self, const cvec_##X##_rawvalue_t arr[], size_t n) { \ if (!n) return; \ cvec_##X##_reserve(self, _cvec_rep(self)->size + n); \ cvec_##X##_value_t* p = self->data + _cvec_rep(self)->size; \ -- cgit v1.2.3