apaki/unicstl
1
0
Fork 0
mirror of https://gitee.com/apaki/unicstl.git synced 2025-05-17 19:41:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

删除旧版迭代器

Browse Source
This commit is contained in:
建峰 2025-04-24 10:31:51 +08:00
parent 0768e026dc
commit d805d56fc9
3 changed files with 40 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/list.h
View File

@ -25,7 +25,6 @@ struct _list
uint32_t _cur;
struct _iterator _iter;
iterator_t (*iter)(struct _list* self);
// kernel
bool (*append)(struct _list* self, void* obj); // Append object to the end of the list.
@ -39,9 +38,7 @@ struct _list
bool (*set)(struct _list* self, int index, void* obj);
// iter
void* (*begin)(struct _list* self);
void* (*next)(struct _list* self);
void* (*end)(struct _list* self);
iterator_t (*iter)(struct _list* self);
// base
uint32_t(*size)(struct _list* self);

92
src/list.c
View File

@ -179,29 +179,32 @@ static void list_print(struct _list* self)
}
}
static void* list_begin(struct _list* self)
static const void* list_iter_next(struct _iterator* iter)
{
self->_cur = 0;
return self->obj;
}
static void* list_end(struct _list* self)
{
return (char*)self->obj + self->_size * self->_obj_size;
}
static void* list_next(struct _list* self)
{
void *obj = NULL;
// if add this, can't go to end
// if(self->_cur < self->_size - 1)
{
self->_cur += 1;
}
obj = (char*)self->obj + self->_cur * self->_obj_size;
list_t self = (list_t)iter->parent;
void *obj = self->obj + self->_iter._cur * self->_obj_size;
self->_iter._cur += 1;
return obj;
}
static bool list_iter_hasnext(struct _iterator* iter)
{
list_t self = (list_t)iter->parent;
if(self->_iter._cur < self->size(self))
{
return true;
}
return false;
}
iterator_t list_iter(struct _list* self)
{
self->_iter.parent = self;
self->_iter._cur = 0;
return &self->_iter;
}
static bool list_init2(struct _list* list, uint32_t obj_size, uint32_t capacity)
{
assert(list != NULL);
@ -236,9 +239,10 @@ static bool list_init2(struct _list* list, uint32_t obj_size, uint32_t capacity)
list->size = list_size;
list->sort = list_sort;
list->begin = list_begin;
list->next = list_next;
list->end = list_end;
// iterator
list->iter = list_iter;
list->_iter.next = list_iter_next;
list->_iter.hasnext = list_iter_hasnext;
// 3. set array
// list->obj = (void*)calloc(list->_capacity, list->_obj_size);
@ -250,50 +254,20 @@ static bool list_init2(struct _list* list, uint32_t obj_size, uint32_t capacity)
return true;
}
static const void* list_iter_next(struct _iterator* iter)
{
list_t self = (list_t)iter->parent;
void *obj = self->obj + self->_iter._cur * self->_obj_size;
self->_iter._cur += 1;
return obj;
}
static bool list_iter_hasnext(struct _iterator* iter)
{
list_t self = (list_t)iter->parent;
if(self->_iter._cur < self->size(self))
{
return true;
}
return false;
}
iterator_t list_iter(struct _list* self)
{
self->_iter.parent = self;
self->_iter._cur = 0;
self->_iter.next = list_iter_next;
self->_iter.hasnext = list_iter_hasnext;
return &self->_iter;
}
list_t list_new2(uint32_t obj_size, uint32_t capacity)
{
struct _list* list = NULL;
list = (struct _list*)calloc(1, sizeof(struct _list));
if(list != NULL)
if(list == NULL)
{
if(list_init2(list, obj_size, capacity) != true)
{
free(list);
// list = NULL;
return NULL;
}
return NULL;
}
list->iter = list_iter;
if(list_init2(list, obj_size, capacity) != true)
{
free(list);
return NULL;
}
return list;
}

10
test/test_list.c
View File

@ -284,6 +284,7 @@ static void test_list_struct(void)
TEST_ASSERT_NULL(list);
}
#if 0
static void test_list_iter(void)
{
int temp = 0;
@ -327,8 +328,8 @@ static void test_list_iter(void)
TEST_ASSERT_TRUE(list->clear(list));
list_free(&list);
}
void list_iter_test(void)
#else
void test_list_iter(void)
{
int temp = 0;
int data[] = { 1,2,3,4,5,6,7,8,9,10 };
@ -359,12 +360,13 @@ void list_iter_test(void)
while(iter->hasnext(iter))
{
iter_data = *(int*)iter->next(iter);
// printf("%d ", dd);
// printf("%d ", iter_data);
TEST_ASSERT_EQUAL_INT(data[idx], iter_data);
idx++;
}
list_free(&list);
}
#endif
void test_list(void)
{
@ -379,6 +381,4 @@ void test_list(void)
RUN_TEST(test_list_struct);
RUN_TEST(test_list_iter);
RUN_TEST(list_iter_test);
}