From 8ad42752b203b4bf215b791a09ddf842e7f09222 Mon Sep 17 00:00:00 2001 From: szdytom Date: Tue, 11 Jun 2024 19:10:12 +0800 Subject: [PATCH] Remove trival accessor --- include/pocketpy/common/vector.h | 3 --- src/common/sstream.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/pocketpy/common/vector.h b/include/pocketpy/common/vector.h index 9f1eb26a..0c5d0bb7 100644 --- a/include/pocketpy/common/vector.h +++ b/include/pocketpy/common/vector.h @@ -28,9 +28,6 @@ c11_vector c11_vector__copy(const c11_vector* self); void* c11_vector__at(c11_vector* self, int index); void c11_vector__reserve(c11_vector* self, int capacity); -#define c11_vector__size(self) ((self)->count) -#define c11_vector__data(self) ((self)->data) - #define c11__getitem(T, self, index) ((T*)(self)->data)[index] #define c11__setitem(T, self, index, value) ((T*)(self)->data)[index] = value; diff --git a/src/common/sstream.c b/src/common/sstream.c index 117c2021..08091c3d 100644 --- a/src/common/sstream.c +++ b/src/common/sstream.c @@ -41,8 +41,8 @@ void pkpy_SStream__append_int64(pkpy_SStream* self, int64_t i) { pkpy_SStream__append_cstr(self, str); } -pkpy_Str pkpy_SStream__to_Str(pkpy_SStream* self) { +pkpy_Str pkpy_SStream__to_Str(const pkpy_SStream* self) { pkpy_Str res; - pkpy_Str__ctor2(&res, c11_vector__data(&self->data), c11_vector__size(&self->data)); + pkpy_Str__ctor2(&res, self->data.data, self->data.count); return res; }