From cbcee23091bf58971de8f94adc54e1406177bda5 Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Sun, 7 Mar 2021 22:28:32 +0100 Subject: Corrected more constness. --- docs/carray_api.md | 16 ++++++++-------- docs/cdeq_api.md | 6 +++--- docs/clist_api.md | 4 ++-- docs/cqueue_api.md | 4 ++-- docs/cset_api.md | 4 ++-- docs/csset_api.md | 4 ++-- docs/cvec_api.md | 6 +++--- examples/csmap_v1.h | 4 ++-- stc/carray.h | 12 ++++++------ stc/cdeq.h | 6 +++--- stc/clist.h | 4 ++-- stc/cqueue.h | 4 ++-- stc/csmap.h | 8 ++++---- stc/cvec.h | 6 +++--- 14 files changed, 44 insertions(+), 44 deletions(-) diff --git a/docs/carray_api.md b/docs/carray_api.md index cdf1bf96..0e0d8996 100644 --- a/docs/carray_api.md +++ b/docs/carray_api.md @@ -42,16 +42,16 @@ size_t carrayNX_xdim(carrayNX arr); size_t carrayNX_ydim(carrayNX arr); // not N=3 size_t carrayNX_zdim(carrayNX arr); // only N=3 -Value* carray1X_at(carray1X *self, size_t x); -Value* carray2X_at(carray2X *self, size_t y, size_t x); -Value* carray3X_at(carray3X *self, size_t z, size_t y, size_t x); +Value* carray1X_at(const carray1X *self, size_t x); +Value* carray2X_at(const carray2X *self, size_t y, size_t x); +Value* carray3X_at(const carray3X *self, size_t z, size_t y, size_t x); -carray1X carray2X_at1(carray2X *self, size_t y); -carray2X carray3X_at1(carray3X *self, size_t z); -carray1X carray3X_at2(carray3X *self, size_t z, size_t y); +carray1X carray2X_at1(const carray2X *self, size_t y); +carray2X carray3X_at1(const carray3X *self, size_t z); +carray1X carray3X_at2(const carray3X *self, size_t z, size_t y); -carrayNX_iter_t carrayNX_begin(carrayNX* self); -carrayNX_iter_t carrayNX_end(carrayNX* self); +carrayNX_iter_t carrayNX_begin(const carrayNX* self); +carrayNX_iter_t carrayNX_end(const carrayNX* self); void carrayNX_next(carrayNX_iter_t* it); carrayNX_value_t* carrayNX_itval(carrayNX_iter_t it); ``` diff --git a/docs/cdeq_api.md b/docs/cdeq_api.md index 1f0ef0ce..1783b948 100644 --- a/docs/cdeq_api.md +++ b/docs/cdeq_api.md @@ -51,9 +51,9 @@ bool cdeq_X_empty(cdeq_X deq); size_t cdeq_X_size(cdeq_X deq); size_t cdeq_X_capacity(cdeq_X deq); -cdeq_X_value_t* cdeq_X_at(cdeq_X* self, size_t idx); -cdeq_X_value_t* cdeq_X_front(cdeq_X* self); -cdeq_X_value_t* cdeq_X_back(cdeq_X* self); +cdeq_X_value_t* cdeq_X_at(const cdeq_X* self, size_t idx); +cdeq_X_value_t* cdeq_X_front(const cdeq_X* self); +cdeq_X_value_t* cdeq_X_back(const cdeq_X* self); void cdeq_X_push_front(cdeq_X* self, Value value); void cdeq_X_push_back(cdeq_X* self, Value value); diff --git a/docs/clist_api.md b/docs/clist_api.md index a63bfbd9..a3497703 100644 --- a/docs/clist_api.md +++ b/docs/clist_api.md @@ -50,8 +50,8 @@ void clist_X_del(clist_X* self); // destructor bool clist_X_empty(clist_X list); size_t clist_X_size(clist_X list); // note: O(n) -clist_X_value_t* clist_X_front(clist_X* self); -clist_X_value_t* clist_X_back(clist_X* self); +clist_X_value_t* clist_X_front(const clist_X* self); +clist_X_value_t* clist_X_back(const clist_X* self); void clist_X_push_front(clist_X* self, Value value); void clist_X_emplace_front(clist_X* self, RawValue raw); diff --git a/docs/cqueue_api.md b/docs/cqueue_api.md index 4890a4ea..30b6d4d0 100644 --- a/docs/cqueue_api.md +++ b/docs/cqueue_api.md @@ -31,8 +31,8 @@ void cqueue_X_del(cqueue_X* self); // destructor size_t cqueue_X_size(cqueue_X q); bool cqueue_X_empty(cqueue_X q); -cqueue_X_value_t* cqueue_X_front(cqueue_X* self); -cqueue_X_value_t* cqueue_X_back(cqueue_X* self); +cqueue_X_value_t* cqueue_X_front(const cqueue_X* self); +cqueue_X_value_t* cqueue_X_back(const 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); diff --git a/docs/cset_api.md b/docs/cset_api.md index 5629ae07..6d5f9b2e 100644 --- a/docs/cset_api.md +++ b/docs/cset_api.md @@ -55,8 +55,8 @@ void cset_X_emplace_n(cset_X* self, const RawKey arr[], size_t si 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); -cset_X_iter_t cset_X_begin(cset_X* self); -cset_X_iter_t cset_X_end(cset_X* self); +cset_X_iter_t cset_X_begin(const cset_X* self); +cset_X_iter_t cset_X_end(const cset_X* self); void cset_X_next(cset_X_iter_t* it); cset_X_value_t* cset_X_itval(cset_X_iter_t it); diff --git a/docs/csset_api.md b/docs/csset_api.md index cc1c23c0..5d593b6f 100644 --- a/docs/csset_api.md +++ b/docs/csset_api.md @@ -50,8 +50,8 @@ void csset_X_emplace_n(csset_X* self, const RawKey arr[], size_t 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); -csset_X_iter_t csset_X_begin(csset_X* self); -csset_X_iter_t csset_X_end(csset_X* self); +csset_X_iter_t csset_X_begin(const csset_X* self); +csset_X_iter_t csset_X_end(const csset_X* self); void csset_X_next(csset_X_iter_t* it); csset_X_value_t* csset_X_itval(csset_X_iter_t it); diff --git a/docs/cvec_api.md b/docs/cvec_api.md index 5b6cd61a..ac9a0397 100644 --- a/docs/cvec_api.md +++ b/docs/cvec_api.md @@ -55,9 +55,9 @@ bool cvec_X_empty(cvec_X vec); size_t cvec_X_size(cvec_X vec); size_t cvec_X_capacity(cvec_X vec); -cvec_X_value_t* cvec_X_at(cvec_X* self, size_t idx); -cvec_X_value_t* cvec_X_front(cvec_X* self); -cvec_X_value_t* cvec_X_back(cvec_X* self); +cvec_X_value_t* cvec_X_at(const cvec_X* self, size_t idx); +cvec_X_value_t* cvec_X_front(const cvec_X* self); +cvec_X_value_t* cvec_X_back(const cvec_X* self); void cvec_X_push_back(cvec_X* self, Value value); void cvec_X_emplace_back(cvec_X* self, RawValue raw); diff --git a/examples/csmap_v1.h b/examples/csmap_v1.h index b9b70a02..c2489df4 100644 --- a/examples/csmap_v1.h +++ b/examples/csmap_v1.h @@ -270,13 +270,13 @@ int main(void) { }) \ \ STC_INLINE C##_##X##_value_t* \ - C##_##X##_front(C##_##X* self) { \ + C##_##X##_front(const C##_##X* self) { \ C##_##X##_node_t *tn = self->root; \ while (tn->link[0]->level) tn = tn->link[0]; \ return &tn->value; \ } \ STC_INLINE C##_##X##_value_t* \ - C##_##X##_back(C##_##X* self) { \ + C##_##X##_back(const C##_##X* self) { \ C##_##X##_node_t *tn = self->root; \ while (tn->link[1]->level) tn = tn->link[1]; \ return &tn->value; \ diff --git a/stc/carray.h b/stc/carray.h index d5735fc8..289bcb97 100644 --- a/stc/carray.h +++ b/stc/carray.h @@ -128,30 +128,30 @@ int main() } \ \ STC_INLINE Value* \ - carray1##X##_at(carray1##X *a, size_t x) { return a->data + x; } \ + carray1##X##_at(const carray1##X *a, size_t x) { return a->data + x; } \ \ STC_INLINE carray1##X \ - carray2##X##_at1(carray2##X *a, size_t y) { \ + carray2##X##_at1(const carray2##X *a, size_t y) { \ carray1##X sub = {a->data + y*_carray_xdim(*a), _carray_xdim(*a)}; \ return sub; \ } \ STC_INLINE Value* \ - carray2##X##_at(carray2##X *a, size_t y, size_t x) { \ + carray2##X##_at(const carray2##X *a, size_t y, size_t x) { \ return a->data + y*_carray_xdim(*a) + x; \ } \ \ STC_INLINE carray2##X \ - carray3##X##_at1(carray3##X *a, size_t z) { \ + carray3##X##_at1(const carray3##X *a, size_t z) { \ carray2##X sub = {a->data + z*_carray_ydim(*a)*_carray_xdim(*a), _carray_xdim(*a), _carray_ydim(*a)}; \ return sub; \ } \ STC_INLINE carray1##X \ - carray3##X##_at2(carray3##X *a, size_t z, size_t y) { \ + carray3##X##_at2(const carray3##X *a, size_t z, size_t y) { \ carray1##X sub = {a->data + (z*_carray_ydim(*a) + y)*_carray_xdim(*a), _carray_xdim(*a)}; \ return sub; \ } \ STC_INLINE Value* \ - carray3##X##_at(carray3##X *a, size_t z, size_t y, size_t x) { \ + carray3##X##_at(const carray3##X *a, size_t z, size_t y, size_t x) { \ return a->data + (z*_carray_ydim(*a) + y)*_carray_xdim(*a) + x; \ } \ typedef carray1##X carray1##X##_t diff --git a/stc/cdeq.h b/stc/cdeq.h index 34d30360..a543ff85 100644 --- a/stc/cdeq.h +++ b/stc/cdeq.h @@ -166,11 +166,11 @@ typedef int (*c_cmp_fn)(const void*, const void*); } \ \ STC_INLINE cdeq_##X##_value_t* \ - cdeq_##X##_front(cdeq_##X* self) {return self->data;} \ + cdeq_##X##_front(const cdeq_##X* self) {return self->data;} \ STC_INLINE cdeq_##X##_value_t* \ - cdeq_##X##_back(cdeq_##X* self) {return self->data + cdeq_rep_(self)->size - 1;} \ + cdeq_##X##_back(const cdeq_##X* self) {return self->data + cdeq_rep_(self)->size - 1;} \ STC_INLINE cdeq_##X##_value_t* \ - cdeq_##X##_at(cdeq_##X* self, size_t i) { \ + cdeq_##X##_at(const cdeq_##X* self, size_t i) { \ assert(i < cdeq_rep_(self)->size); \ return self->data + i; \ } \ diff --git a/stc/clist.h b/stc/clist.h index 41b2c5d4..9b012d4e 100644 --- a/stc/clist.h +++ b/stc/clist.h @@ -197,9 +197,9 @@ STC_API size_t _clist_size(const clist_void* self); clist_##X##_sort(clist_##X* self); \ \ STC_INLINE Value* \ - clist_##X##_front(clist_##X* self) {return &self->last->next->value;} \ + clist_##X##_front(const clist_##X* self) {return &self->last->next->value;} \ STC_INLINE Value* \ - clist_##X##_back(clist_##X* self) {return &self->last->value;} \ + clist_##X##_back(const clist_##X* self) {return &self->last->value;} \ \ _c_implement_clist_7(X, Value, valueCompareRaw, valueDel, valueFromRaw, valueToRaw, RawValue) \ typedef clist_##X clist_##X##_t diff --git a/stc/cqueue.h b/stc/cqueue.h index d6959271..45fa54ee 100644 --- a/stc/cqueue.h +++ b/stc/cqueue.h @@ -74,9 +74,9 @@ STC_INLINE bool \ cqueue_##X##_empty(cqueue_##X q) {return ctype##_empty(q);} \ STC_INLINE cqueue_##X##_value_t* \ - cqueue_##X##_front(cqueue_##X* self) {return ctype##_front(self);} \ + cqueue_##X##_front(const cqueue_##X* self) {return ctype##_front(self);} \ STC_INLINE cqueue_##X##_value_t* \ - cqueue_##X##_back(cqueue_##X* self) {return ctype##_back(self);} \ + cqueue_##X##_back(const cqueue_##X* self) {return ctype##_back(self);} \ STC_INLINE void \ cqueue_##X##_pop(cqueue_##X* self) {ctype##_pop_front(self);} \ STC_INLINE void \ diff --git a/stc/csmap.h b/stc/csmap.h index 4107c1a2..cdd27c4d 100644 --- a/stc/csmap.h +++ b/stc/csmap.h @@ -292,8 +292,8 @@ struct csmap_rep { size_t root, disp, head, size, cap; void* nodes[]; }; return &C##_##X##_find_it(self, rkey, &it)->second; \ }) \ \ - STC_API C##_##X##_value_t* C##_##X##_front(C##_##X* self); \ - STC_API C##_##X##_value_t* C##_##X##_back(C##_##X* self); \ + STC_API C##_##X##_value_t* C##_##X##_front(const C##_##X* self); \ + STC_API C##_##X##_value_t* C##_##X##_back(const C##_##X* self); \ STC_API void C##_##X##_next(C##_##X##_iter_t* it); \ \ STC_INLINE C##_##X##_iter_t \ @@ -337,14 +337,14 @@ static struct csmap_rep _smap_inits = {0, 0, 0, 0}; } \ \ STC_DEF C##_##X##_value_t* \ - C##_##X##_front(C##_##X* self) { \ + C##_##X##_front(const C##_##X* self) { \ C##_##X##_node_t *d = self->nodes; \ C##_##X##_size_t tn = (C##_##X##_size_t) _csmap_rep(self)->root; \ while (d[tn].link[0]) tn = d[tn].link[0]; \ return &d[tn].value; \ } \ STC_DEF C##_##X##_value_t* \ - C##_##X##_back(C##_##X* self) { \ + C##_##X##_back(const C##_##X* self) { \ C##_##X##_node_t *d = self->nodes; \ C##_##X##_size_t tn = (C##_##X##_size_t) _csmap_rep(self)->root; \ while (d[tn].link[1]) tn = d[tn].link[1]; \ diff --git a/stc/cvec.h b/stc/cvec.h index b2ecc319..de76ff97 100644 --- a/stc/cvec.h +++ b/stc/cvec.h @@ -149,11 +149,11 @@ typedef int (*c_cmp_fn)(const void*, const void*); } \ \ STC_INLINE cvec_##X##_value_t* \ - cvec_##X##_front(cvec_##X* self) {return self->data;} \ + cvec_##X##_front(const cvec_##X* self) {return self->data;} \ STC_INLINE cvec_##X##_value_t* \ - cvec_##X##_back(cvec_##X* self) {return self->data + _cvec_rep(self)->size - 1;} \ + cvec_##X##_back(const cvec_##X* self) {return self->data + _cvec_rep(self)->size - 1;} \ STC_INLINE cvec_##X##_value_t* \ - cvec_##X##_at(cvec_##X* self, size_t i) { \ + cvec_##X##_at(const cvec_##X* self, size_t i) { \ assert(i < _cvec_rep(self)->size); \ return self->data + i; \ } \ -- cgit v1.2.3