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 11:27:22 +08:00
parent 07b2c142b8
commit b396d80672
3 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/unicstl_config.h
View File

@ -27,7 +27,8 @@
* @brief debug * @brief debug
* *
*/ */
#define NDEBUG #define NDEBUG // assert disable
#define UNICSTL_DEBUG #define UNICSTL_DEBUG
#ifdef UNICSTL_DEBUG #ifdef UNICSTL_DEBUG

13
src/stack.c
View File

@ -300,6 +300,9 @@ static bool stack_init(struct _stack* self, uint32_t obj_size)
const void* stack_iter_next(struct _iterator* iter) const void* stack_iter_next(struct _iterator* iter)
{ {
assert(iter != NULL);
assert(iter->parent != NULL);
stack_t self = (stack_t)iter->parent; stack_t self = (stack_t)iter->parent;
void *obj = self->_head->obj + self->_iter._cur * self->_obj_size; void *obj = self->_head->obj + self->_iter._cur * self->_obj_size;
self->_iter._cur += 1; self->_iter._cur += 1;
@ -308,8 +311,10 @@ const void* stack_iter_next(struct _iterator* iter)
bool stack_iter_hasnext(struct _iterator* iter) bool stack_iter_hasnext(struct _iterator* iter)
{ {
stack_t self = (stack_t)iter->parent; assert(iter != NULL);
assert(iter->parent != NULL);
stack_t self = (stack_t)iter->parent;
if(self->_iter._cur < self->size(self)) if(self->_iter._cur < self->size(self))
{ {
return true; return true;
@ -320,15 +325,11 @@ bool stack_iter_hasnext(struct _iterator* iter)
iterator_t stack_iter(struct _stack* self) iterator_t stack_iter(struct _stack* self)
{ {
assert(self != NULL); assert(self != NULL);
if (self == NULL) self->_iter.parent = self;
{
return NULL;
}
self->_iter._cur = 0; self->_iter._cur = 0;
return &self->_iter; return &self->_iter;
} }
static bool stack_init2(struct _stack* self, uint32_t obj_size, uint32_t capacity) static bool stack_init2(struct _stack* self, uint32_t obj_size, uint32_t capacity)
{ {
assert(self != NULL); assert(self != NULL);

40
test/test_stack.c
View File

@ -440,6 +440,44 @@ static void test_stack2_struct(void)
TEST_ASSERT_NULL(stack); TEST_ASSERT_NULL(stack);
} }
static void test_stack2_iter(void)
{
uint32_t i = 0;
int data[] = { 1,2,3,4,5,6,7,8,9,10 };
int temp = 0;
uint32_t len = sizeof(data) / sizeof(data[0]);
uint32_t capacity = len;
stack_t stack = NULL;
stack = stack_new2(sizeof(int), capacity);
TEST_ASSERT_NOT_NULL(stack);
stack->print_obj = print_num;
TEST_ASSERT_FALSE(stack->peek(stack, &temp));
TEST_ASSERT_TRUE(stack->clear(stack));
for (i = 0; i < len; i++)
{
TEST_ASSERT_TRUE(stack->push(stack, &data[i]));
TEST_ASSERT_EQUAL_INT(i + 1, stack->size(stack));
TEST_ASSERT_TRUE(stack->peek(stack, &temp));
TEST_ASSERT_EQUAL_INT(data[i], temp);
}
iterator_t iter = stack->iter(stack);
TEST_ASSERT_NOT_NULL(iter);
i = 0;
while(iter->hasnext(iter))
{
temp = *(int *)iter->next(iter);
printf("%d ", temp);
TEST_ASSERT_EQUAL_INT(data[len - 1 - i], temp);
i++;
}
stack_free(&stack);
TEST_ASSERT_NULL(stack);
}
void test_stack(void) void test_stack(void)
{ {
UnitySetTestFile(__FILE__); UnitySetTestFile(__FILE__);
@ -454,4 +492,6 @@ void test_stack(void)
RUN_TEST(test_stack2_num); RUN_TEST(test_stack2_num);
RUN_TEST(test_stack2_struct); RUN_TEST(test_stack2_struct);
RUN_TEST(test_stack2_iter);
} }