From 0b64431209cb7acf86f4db055e69e23b7a9d8ef6 Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Wed, 6 Jan 2021 23:48:03 +0100 Subject: Renamed split_after to splice_out --- docs/clist_api.md | 6 +++--- stc/clist.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/clist_api.md b/docs/clist_api.md index b056629d..ab8a6e98 100644 --- a/docs/clist_api.md +++ b/docs/clist_api.md @@ -79,7 +79,7 @@ clist_X_iter_t clist_X_splice_after(clist_X* self, clist_X_iter_t pos, clis clist_X_iter_t clist_X_splice_front(clist_X* self, clist_X* other); clist_X_iter_t clist_X_splice_back(clist_X* self, clist_X* other); -clist_X clist_X_split_after(clist_X* self, clist_X_iter_t pos1, clist_X_iter_t pos2); +clist_X clist_X_splice_out(clist_X* self, clist_X_iter_t pos1, clist_X_iter_t pos2); clist_X_iter_t clist_X_find(const clist_X* self, RawValue raw); clist_X_iter_t clist_X_find_before(const clist_X* self, @@ -99,13 +99,13 @@ clist_X_iter_t clist_X_fwd(clist_X_iter it, size_t n); clist_X_value_t clist_X_value_clone(clist_X_value_t val); ``` -The `clist_X_split_after(self, it1, it2)` can be combined with `clist_X_splice_after(self, pos, other)` to mimic c++ `std::forward_list::splice_after(pos, other, it1, it2)`. Note however, that `it2` is included in elements to be spliced, unlike with `std::forward_list()`. E.g, splice in 2, 3 after 10 in L2: +The `clist_X_splice_out(self, it1, it2)` can be combined with `clist_X_splice_after(self, pos, other)` to mimic c++ `std::forward_list::splice_after(pos, other, it1, it2)`. Note however, that `it2` is included in elements to be spliced, unlike with `std::forward_list()`. E.g, splice in 2, 3 after 10 in L2: ```c c_init (clist_i, L1, {1, 2, 3, 4, 5}); c_init (clist_i, L2, {10, 20, 30, 40, 50}); clist_i_iter_t it = clist_i_fwd(clist_i_begin(&L1), 2); -clist_i tmp = clist_i_split_after(&L1, clist_i_begin(&L1), it); +clist_i tmp = clist_i_splice_out(&L1, clist_i_begin(&L1), it); clist_i_splice_after(&L2, clist_i_begin(&L2), &tmp); // C++: diff --git a/stc/clist.h b/stc/clist.h index 8454984a..ebae89fc 100644 --- a/stc/clist.h +++ b/stc/clist.h @@ -322,7 +322,7 @@ STC_API size_t _clist_size(const clist_void* self); } \ \ STC_DEF clist_##X \ - clist_##X##_split_after(clist_##X* self, clist_##X##_iter_t pos1, clist_##X##_iter_t pos2) { \ + clist_##X##_splice_out(clist_##X* self, clist_##X##_iter_t pos1, clist_##X##_iter_t pos2) { \ clist_##X##_node_t *node1 = _clist_node(X, pos1.ref), *next1 = node1->next, \ *node2 = _clist_node(X, pos2.ref); \ node1->next = node2->next, node2->next = next1; \ -- cgit v1.2.3