Added flags to stack
This commit is contained in:
Leonardo committed
1 parent
b3fa566725
commit
ffb03890df
2 files changed
+112
No files matched your search
@@ -221,11 +221,13 @@ struct cmc_callbacks_stack
|
|||||||
bool PFX##_full(struct SNAME *_stack_); \
|
bool PFX##_full(struct SNAME *_stack_); \
|
||||||
size_t PFX##_count(struct SNAME *_stack_); \
|
size_t PFX##_count(struct SNAME *_stack_); \
|
||||||
size_t PFX##_capacity(struct SNAME *_stack_); \
|
size_t PFX##_capacity(struct SNAME *_stack_); \
|
||||||
|
int PFX##_flag(struct SNAME *_stack_); \
|
||||||
/* Collection Utility */ \
|
/* Collection Utility */ \
|
||||||
bool PFX##_resize(struct SNAME *_stack_, size_t capacity); \
|
bool PFX##_resize(struct SNAME *_stack_, size_t capacity); \
|
||||||
struct SNAME *PFX##_copy_of(struct SNAME *_stack_); \
|
struct SNAME *PFX##_copy_of(struct SNAME *_stack_); \
|
||||||
bool PFX##_equals(struct SNAME *_stack1_, struct SNAME *_stack2_); \
|
bool PFX##_equals(struct SNAME *_stack1_, struct SNAME *_stack2_); \
|
||||||
struct cmc_string PFX##_to_string(struct SNAME *_stack_); \
|
struct cmc_string PFX##_to_string(struct SNAME *_stack_); \
|
||||||
|
bool PFX##_print(struct SNAME *_stack_, FILE *fptr); \
|
||||||
\
|
\
|
||||||
/* Iterator Functions */ \
|
/* Iterator Functions */ \
|
||||||
/* Iterator Allocation and Deallocation */ \
|
/* Iterator Allocation and Deallocation */ \
|
||||||
@@ -341,6 +343,7 @@ struct cmc_callbacks_stack
|
|||||||
memset(_stack_->buffer, 0, sizeof(V) * _stack_->capacity); \
|
memset(_stack_->buffer, 0, sizeof(V) * _stack_->capacity); \
|
||||||
\
|
\
|
||||||
_stack_->count = 0; \
|
_stack_->count = 0; \
|
||||||
|
_stack_->flag = cmc_flags.OK; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
void PFX##_free(struct SNAME *_stack_) \
|
void PFX##_free(struct SNAME *_stack_) \
|
||||||
@@ -363,6 +366,8 @@ struct cmc_callbacks_stack
|
|||||||
\
|
\
|
||||||
if (callbacks) \
|
if (callbacks) \
|
||||||
_stack_->callbacks = callbacks; \
|
_stack_->callbacks = callbacks; \
|
||||||
|
\
|
||||||
|
_stack_->flag = cmc_flags.OK; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
bool PFX##_push(struct SNAME *_stack_, V element) \
|
bool PFX##_push(struct SNAME *_stack_, V element) \
|
||||||
@@ -375,29 +380,43 @@ struct cmc_callbacks_stack
|
|||||||
\
|
\
|
||||||
_stack_->buffer[_stack_->count++] = element; \
|
_stack_->buffer[_stack_->count++] = element; \
|
||||||
\
|
\
|
||||||
|
_stack_->flag = cmc_flags.OK; \
|
||||||
|
\
|
||||||
return true; \
|
return true; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
bool PFX##_pop(struct SNAME *_stack_) \
|
bool PFX##_pop(struct SNAME *_stack_) \
|
||||||
{ \
|
{ \
|
||||||
if (PFX##_empty(_stack_)) \
|
if (PFX##_empty(_stack_)) \
|
||||||
|
{ \
|
||||||
|
_stack_->flag = cmc_flags.EMPTY; \
|
||||||
return false; \
|
return false; \
|
||||||
|
} \
|
||||||
\
|
\
|
||||||
_stack_->buffer[--_stack_->count] = (V){ 0 }; \
|
_stack_->buffer[--_stack_->count] = (V){ 0 }; \
|
||||||
\
|
\
|
||||||
|
_stack_->flag = cmc_flags.OK; \
|
||||||
|
\
|
||||||
return true; \
|
return true; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
V PFX##_top(struct SNAME *_stack_) \
|
V PFX##_top(struct SNAME *_stack_) \
|
||||||
{ \
|
{ \
|
||||||
if (PFX##_empty(_stack_)) \
|
if (PFX##_empty(_stack_)) \
|
||||||
|
{ \
|
||||||
|
_stack_->flag = cmc_flags.EMPTY; \
|
||||||
return (V){ 0 }; \
|
return (V){ 0 }; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
_stack_->flag = cmc_flags.OK; \
|
||||||
\
|
\
|
||||||
return _stack_->buffer[_stack_->count - 1]; \
|
return _stack_->buffer[_stack_->count - 1]; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
bool PFX##_contains(struct SNAME *_stack_, V element) \
|
bool PFX##_contains(struct SNAME *_stack_, V element) \
|
||||||
{ \
|
{ \
|
||||||
|
_stack_->flag = cmc_flags.OK; \
|
||||||
|
\
|
||||||
for (size_t i = 0; i < _stack_->count; i++) \
|
for (size_t i = 0; i < _stack_->count; i++) \
|
||||||
{ \
|
{ \
|
||||||
if (_stack_->f_val->cmp(_stack_->buffer[i], element) == 0) \
|
if (_stack_->f_val->cmp(_stack_->buffer[i], element) == 0) \
|
||||||
@@ -427,19 +446,34 @@ struct cmc_callbacks_stack
|
|||||||
return _stack_->capacity; \
|
return _stack_->capacity; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
|
int PFX##_flag(struct SNAME *_stack_) \
|
||||||
|
{ \
|
||||||
|
return _stack_->flag; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
bool PFX##_resize(struct SNAME *_stack_, size_t capacity) \
|
bool PFX##_resize(struct SNAME *_stack_, size_t capacity) \
|
||||||
{ \
|
{ \
|
||||||
|
_stack_->flag = cmc_flags.OK; \
|
||||||
|
\
|
||||||
if (_stack_->capacity == capacity) \
|
if (_stack_->capacity == capacity) \
|
||||||
return true; \
|
return true; \
|
||||||
\
|
\
|
||||||
if (capacity < _stack_->count) \
|
if (capacity < _stack_->count) \
|
||||||
|
{ \
|
||||||
|
_stack_->flag = cmc_flags.INVALID; \
|
||||||
return false; \
|
return false; \
|
||||||
|
} \
|
||||||
\
|
\
|
||||||
V *new_buffer = \
|
V *new_buffer = \
|
||||||
_stack_->alloc->realloc(_stack_->buffer, sizeof(V) * capacity); \
|
_stack_->alloc->realloc(_stack_->buffer, sizeof(V) * capacity); \
|
||||||
\
|
\
|
||||||
if (!new_buffer) \
|
if (!new_buffer) \
|
||||||
|
{ \
|
||||||
|
_stack_->flag = cmc_flags.ALLOC; \
|
||||||
return false; \
|
return false; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
/* TODO zero out new slots */ \
|
||||||
\
|
\
|
||||||
_stack_->buffer = new_buffer; \
|
_stack_->buffer = new_buffer; \
|
||||||
_stack_->capacity = capacity; \
|
_stack_->capacity = capacity; \
|
||||||
@@ -454,7 +488,10 @@ struct cmc_callbacks_stack
|
|||||||
_stack_->alloc, _stack_->callbacks); \
|
_stack_->alloc, _stack_->callbacks); \
|
||||||
\
|
\
|
||||||
if (!result) \
|
if (!result) \
|
||||||
|
{ \
|
||||||
|
_stack_->flag = cmc_flags.ERROR; \
|
||||||
return NULL; \
|
return NULL; \
|
||||||
|
} \
|
||||||
\
|
\
|
||||||
if (_stack_->f_val->cpy) \
|
if (_stack_->f_val->cpy) \
|
||||||
{ \
|
{ \
|
||||||
@@ -467,11 +504,16 @@ struct cmc_callbacks_stack
|
|||||||
\
|
\
|
||||||
result->count = _stack_->count; \
|
result->count = _stack_->count; \
|
||||||
\
|
\
|
||||||
|
_stack_->flag = cmc_flags.OK; \
|
||||||
|
\
|
||||||
return result; \
|
return result; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
bool PFX##_equals(struct SNAME *_stack1_, struct SNAME *_stack2_) \
|
bool PFX##_equals(struct SNAME *_stack1_, struct SNAME *_stack2_) \
|
||||||
{ \
|
{ \
|
||||||
|
_stack1_->flag = cmc_flags.OK; \
|
||||||
|
_stack2_->flag = cmc_flags.OK; \
|
||||||
|
\
|
||||||
if (_stack1_->count != _stack2_->count) \
|
if (_stack1_->count != _stack2_->count) \
|
||||||
return false; \
|
return false; \
|
||||||
\
|
\
|
||||||
@@ -497,6 +539,17 @@ struct cmc_callbacks_stack
|
|||||||
return n >= 0 ? str : (struct cmc_string){ 0 }; \
|
return n >= 0 ? str : (struct cmc_string){ 0 }; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
|
bool PFX##_print(struct SNAME *_stack_, FILE *fptr) \
|
||||||
|
{ \
|
||||||
|
for (size_t i = 0; i < _stack_->count; i++) \
|
||||||
|
{ \
|
||||||
|
if (!_stack_->f_val->str(fptr, _stack_->buffer[i])) \
|
||||||
|
return false; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
return true; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
struct SNAME##_iter *PFX##_iter_new(struct SNAME *target) \
|
struct SNAME##_iter *PFX##_iter_new(struct SNAME *target) \
|
||||||
{ \
|
{ \
|
||||||
struct SNAME##_iter *iter = \
|
struct SNAME##_iter *iter = \
|
||||||
|
|||||||
@@ -612,4 +612,63 @@ CMC_CREATE_UNIT(stack_test, true, {
|
|||||||
|
|
||||||
s_free(s);
|
s_free(s);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
CMC_CREATE_TEST(flags, {
|
||||||
|
struct stack *s = s_new(100, s_ftab_val);
|
||||||
|
|
||||||
|
cmc_assert_not_equals(ptr, NULL, s);
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
|
||||||
|
// clear
|
||||||
|
s->flag = cmc_flags.ERROR;
|
||||||
|
s_clear(s);
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
|
||||||
|
// customize
|
||||||
|
s->flag = cmc_flags.ERROR;
|
||||||
|
s_customize(s, NULL, NULL);
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
|
||||||
|
// push
|
||||||
|
s->flag = cmc_flags.ERROR;
|
||||||
|
cmc_assert(s_push(s, 1));
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
|
||||||
|
// pop
|
||||||
|
s->flag = cmc_flags.ERROR;
|
||||||
|
cmc_assert(s_pop(s));
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
|
||||||
|
cmc_assert(!s_pop(s));
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.EMPTY, s_flag(s));
|
||||||
|
|
||||||
|
// top
|
||||||
|
s->flag = cmc_flags.ERROR;
|
||||||
|
s_top(s);
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.EMPTY, s_flag(s));
|
||||||
|
|
||||||
|
cmc_assert(s_push(s, 1));
|
||||||
|
s_top(s);
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
|
||||||
|
// contains
|
||||||
|
s->flag = cmc_flags.ERROR;
|
||||||
|
cmc_assert(s_contains(s, 1));
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
|
||||||
|
// copy_of
|
||||||
|
s->flag = cmc_flags.ERROR;
|
||||||
|
struct stack *s2 = s_copy_of(s);
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s2));
|
||||||
|
|
||||||
|
// equals
|
||||||
|
s->flag = cmc_flags.ERROR;
|
||||||
|
s2->flag = cmc_flags.ERROR;
|
||||||
|
cmc_assert(s_equals(s, s2));
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s));
|
||||||
|
cmc_assert_equals(int32_t, cmc_flags.OK, s_flag(s2));
|
||||||
|
|
||||||
|
s_free(s);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
Reference in new issue
Block a user