admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename DEQUE _clean in _reset to avoid confusing _clean & _clear functions. See #97

Browse Source
This commit is contained in:
Patrick Pelissier committed 2021-10-28 17:40:56 +02:00
1 parent f6e3cbbb65
commit 2695cd6f3e
3 files changed
+18 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

README.md
+2 -2
View File
@@ -1997,9 +1997,9 @@ After-wise 'ref' is cleared and can no longer be used.
Clear the deque 'deque (aka destructor). The deque can't be used anymore, except with a constructor.
##### void name\_clean(name\_t deque)
##### void name\_reset(name\_t deque)
Clean the deque (the deque becomes empty). The deque remains initialized but is empty.
Reset the deque (the deque becomes empty but remains initialized but is empty).
##### type *name\_back(const name\_t deque)
m-deque.h
+12 -6
View File
@@ -202,7 +202,7 @@
} \
\
static inline void \
M_C(name, _clean)(deque_t d) \
M_C(name, _reset)(deque_t d) \
{ \
M_D3QU3_CONTRACT(d); \
node_t *min_node = NULL; \
@@ -226,11 +226,17 @@
M_D3QU3_CONTRACT(d); \
} \
\
static inline void M_ATTR_DEPRECATED \
M_C(name, _clean)(deque_t d) \
{ \
M_C(name, _reset)(d); \
} \
\
static inline void \
M_C(name, _clear)(deque_t d) \
{ \
M_D3QU3_CONTRACT(d); \
M_C(name, _clean)(d); \
M_C(name, _reset)(d); \
/* We have registered the delete operator to clear all objects */ \
M_C(name, _node_list_clear)(d->list); \
/* It is safer to clean some variables */ \
@@ -876,7 +882,7 @@
{ \
M_D3QU3_CONTRACT(deque); \
M_ASSERT (str != NULL); \
M_C(name,_clean)(deque); \
M_C(name,_reset)(deque); \
bool success = false; \
int c = *str++; \
if (M_UNLIKELY (c != '[')) goto exit; \
@@ -908,7 +914,7 @@
{ \
M_D3QU3_CONTRACT(deque); \
M_ASSERT (file != NULL); \
M_C(name,_clean)(deque); \
M_C(name,_reset)(deque); \
int c = fgetc(file); \
if (M_UNLIKELY (c != '[')) return false; \
c = fgetc(file); \
@@ -963,7 +969,7 @@
m_serial_local_t local; \
m_serial_return_code_t ret; \
size_t estimated_size = 0; \
M_C(name,_clean)(deque); \
M_C(name,_reset)(deque); \
ret = f->m_interface->read_array_start(local, f, &estimated_size); \
if (M_UNLIKELY (ret != M_SERIAL_OK_CONTINUE)) return ret; \
type item; \
@@ -1018,7 +1024,7 @@
,IT_PREVIOUS(M_C(name,_previous)) \
,IT_REF(M_C(name,_ref)) \
,IT_CREF(M_C(name,_cref)) \
,CLEAN(M_C(name,_clean)) \
,CLEAN(M_C(name,_reset)) \
,GET_SIZE(M_C(name, _size)) \
,PUSH(M_C(name,_push_back)) \
,POP(M_C(name,_pop_back)) \
tests/test-mdeque.c
+4 -4
View File
@@ -190,7 +190,7 @@ static void test_it(void)
assert (deque_last_p(it));
assert (deque_end_p(it) || *deque_cref (it) == (int)(1996+i));
}
deque_clean(d);
deque_reset(d);
for(int i = 0; i < 4000; i++) {
deque_push_back(d, i);
deque_it(it, d);
@@ -202,7 +202,7 @@ static void test_it(void)
}
assert(z == i+1);
}
deque_clean(d);
deque_reset(d);
for(int i = 0; i < 4000; i++) {
deque_push_front(d, i);
deque_it_last(it, d);
@@ -243,7 +243,7 @@ static void test_set(void)
assert (deque_end_p (it2));
assert (deque_equal_p(d, e));
assert (deque_hash(d) != 0);
deque_clean (e);
deque_reset (e);
assert (deque_size (d) == 1997);
assert (deque_size (e) == 0);
deque_swap(d, e);
@@ -360,7 +360,7 @@ static void test_io(void)
assert (deque_mpz_equal_p (d1, d2));
fclose(f);
deque_mpz_clean(d1);
deque_mpz_reset(d1);
deque_mpz_get_str(str, d1, false);
assert (string_cmp_str (str, "[]") == 0);