From d4ea76c273bbebdb2b1be7302a9a6edde2198134 Mon Sep 17 00:00:00 2001 From: tylo Date: Wed, 6 Oct 2021 09:24:37 +0200 Subject: Updates to previous commit on cvec and cdeq. Some example improvements. --- include/stc/cdeq.h | 6 +++--- include/stc/cvec.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h index deff8965..7a5ae690 100644 --- a/include/stc/cdeq.h +++ b/include/stc/cdeq.h @@ -310,7 +310,7 @@ cx_memb(_push_front)(Self* self, i_val value) { else --self->data; ++cdeq_rep_(self)->size; - *self->data = value; + *self->data = value; return self->data; } @@ -337,7 +337,7 @@ cx_memb(_erase_range_p)(Self* self, cx_value_t* p1, cx_value_t* p2) { size_t n = p2 - p1; if (n > 0) { cx_value_t* p = p1, *end = self->data + cdeq_rep_(self)->size; - while (p != p2) i_valdel(p), ++p; + while (p != p2) { i_valdel(p); ++p; } if (p1 == self->data) self->data += n; else memmove(p1, p2, (end - p2) * sizeof(i_val)); cdeq_rep_(self)->size -= n; @@ -364,4 +364,4 @@ cx_memb(_value_compare)(const cx_value_t* x, const cx_value_t* y) { #endif // i_queue #endif // IMPLEMENTATION #include "template.h" -#define CDEQ_H_INCLUDED \ No newline at end of file +#define CDEQ_H_INCLUDED diff --git a/include/stc/cvec.h b/include/stc/cvec.h index 06577cde..283e769d 100644 --- a/include/stc/cvec.h +++ b/include/stc/cvec.h @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + /* #include #include @@ -114,7 +114,7 @@ STC_INLINE cx_iter_t cx_memb(_begin)(const Self* self) STC_INLINE cx_iter_t cx_memb(_end)(const Self* self) { return c_make(cx_iter_t){self->data + cvec_rep_(self)->size}; } STC_INLINE void cx_memb(_next)(cx_iter_t* it) { ++it->ref; } -STC_INLINE cx_iter_t cx_memb(_advance)(cx_iter_t it, intptr_t offs) +STC_INLINE cx_iter_t cx_memb(_advance)(cx_iter_t it, intptr_t offs) { it.ref += offs; return it; } STC_INLINE size_t cx_memb(_index)(Self cx, cx_iter_t it) { return it.ref - cx.data; } @@ -328,7 +328,7 @@ cx_memb(_erase_range_p)(Self* self, cx_value_t* p1, cx_value_t* p2) { intptr_t len = p2 - p1; if (len > 0) { cx_value_t* p = p1, *end = self->data + cvec_rep_(self)->size; - while (p != p2) i_valdel(p), ++p; + while (p != p2) { i_valdel(p); ++p; } memmove(p1, p2, (end - p2) * sizeof(i_val)); cvec_rep_(self)->size -= len; } @@ -366,4 +366,4 @@ cx_memb(_value_compare)(const cx_value_t* x, const cx_value_t* y) { #endif #include "template.h" -#define CVEC_H_INCLUDED \ No newline at end of file +#define CVEC_H_INCLUDED -- cgit v1.2.3