From 6b064870f50d41725fa371e42977069380fbb386 Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sat, 30 Oct 2021 23:26:27 +0200 Subject: [PATCH] Rename CLEAN operator in RESET operator --- README.md | 8 ++++---- doc/API.txt | 2 ++ m-algo.h | 16 ++++++++-------- m-array.h | 2 +- m-bitset.h | 2 +- m-bptree.h | 4 ++-- m-buffer.h | 2 +- m-concurrent.h | 6 +++--- m-core.h | 12 ++++++------ m-deque.h | 2 +- m-dict.h | 4 ++-- m-i-list.h | 2 +- m-i-shared.h | 2 +- m-list.h | 2 +- m-prioqueue.h | 2 +- m-rbtree.h | 2 +- m-shared.h | 2 +- m-string.h | 4 ++-- m-tuple.h | 18 +++++++++--------- m-variant.h | 8 ++++---- tests/check-generic.hpp | 4 ++-- 21 files changed, 54 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 827087f5..c20806f0 100644 --- a/README.md +++ b/README.md @@ -537,7 +537,7 @@ Other documented operators are: * MOVE(objd, objc): Set 'objd' to the same state than 'objc' by stealing as resources as possible from 'objc' and then clear 'objc' (destructor of 'objc'). It is equivalent to calling SET(objd,objc) then CLEAR(objc) or CLEAR(objd) and then INIT\_MOVE(objd, objc). TBC if this operator is really needed as calling CLEAR then INIT\_MOVE is what do all known implementation, and is efficient. A MOVE operator shall not fail. * INIT\_WITH(obj, ...): Initialize the object 'obj' with the given variable set of arguments (constructor). Arguments can be of different types. It is up to the method of the objet to decide how to initialize the object based on this initialization array. This operator is used in the M\_LET macro to initialize objects with their given values. * SWAP(objd, objc): Swap the states of the object 'objc' and the object 'objd'. -* CLEAN(obj): Empty the container from all its objects. Nearly like CLEAR except that the container 'obj' remains initialized (but empty). +* RESET(obj): Reset the object to its init state (Emptying the object if it is an object). * EMPTY\_P(obj) --> bool: Test if the container object is empty (true) or not. * GET\_SIZE (container) --> size\_t: Return the number of elements in the container object. * HASH (obj) --> size\_t: return a hash of the object (not a secure hash but one that is usable for a hash table). Default is performing a hash of the memory representation of the object. This default implementation is invalid if the object holds pointer to other objects. @@ -4788,7 +4788,7 @@ This method is only defined if the base container exports the MOVE operator. Reset the concurrent container. Afterwards the container is empty, but remains initialized. -This method is only defined if the base container exports the CLEAN operator. +This method is only defined if the base container exports the RESET operator. ##### void name\_clear(name\_t concurrent) @@ -6303,7 +6303,7 @@ than a 'size\_t'. ##### M\_GET\_SUB oplist ##### M\_GET\_MUL oplist ##### M\_GET\_DIV oplist -##### M\_GET\_CLEAN oplist +##### M\_GET\_RESET oplist ##### M\_GET\_PUSH oplist ##### M\_GET\_POP oplist ##### M\_GET\_REVERSE oplist @@ -7483,7 +7483,7 @@ and as second argument the object in the source container. Extract the items of the container 'containerSrc' of oplist 'oplistSrc' into the 'containerDest' of oplist 'oplistDest': - CLEAN (containerDest) + RESET (containerDest) for each item in containerSrc do [ if func([arguments,] item) ] Push item in containerDest diff --git a/doc/API.txt b/doc/API.txt index 136aa7e8..e01eb7aa 100644 --- a/doc/API.txt +++ b/doc/API.txt @@ -70,3 +70,5 @@ V0.5.*: * M_INVERT is renamed into M_REVERSE to be more coherent with the REVERS * Remove of UPDATE operator. Use of SET for RBTREE or ADD for DICT instead. * Make the _clean suffix for reseting the container to empty deprecated. Use new _reset suffix instead. * Make the _get_at suffix for always getting a value deprecated. Use new _safe_get suffix instead. + * Rename CLEAN operator in RESET operator. + diff --git a/m-algo.h b/m-algo.h index 9ef1d60d..4fd48a8e 100644 --- a/m-algo.h +++ b/m-algo.h @@ -690,7 +690,7 @@ static inline void \ M_C(name, _fill_n) (container_t l, size_t n, type_t const value) \ { \ - M_CALL_CLEAN(cont_oplist, l); \ + M_CALL_RESET(cont_oplist, l); \ for(size_t i = 0; i < n; i++) { \ M_CALL_PUSH(cont_oplist, l, value); \ } \ @@ -718,7 +718,7 @@ { \ type_t tmp; \ M_CALL_INIT_SET(type_oplist, tmp, value); \ - M_CALL_CLEAN(cont_oplist, l); \ + M_CALL_RESET(cont_oplist, l); \ for(size_t i = 0; i < n; i++) { \ M_CALL_PUSH(cont_oplist, l, tmp); \ M_CALL_ADD(type_oplist, tmp, tmp, inc); \ @@ -751,7 +751,7 @@ M_C(name, _transform_cb_ct) func) \ { \ M_ASSERT(dst != src); \ - M_CALL_CLEAN(cont_oplist, dst); \ + M_CALL_RESET(cont_oplist, dst); \ for M_EACH(item, src, cont_oplist) { \ type_t tmp; \ M_CALL_INIT(type_oplist, tmp); \ @@ -1045,7 +1045,7 @@ #define M_ALG0_TRANSFORM(contD, contDop, contS, contSop, func) do { \ - M_CALL_CLEAN(contDop, contD); \ + M_CALL_RESET(contDop, contD); \ for M_EACH(_item, contS, contSop) { \ M_GET_SUBTYPE contDop _tmp; \ M_CALL_INIT(M_GET_OPLIST contDop, _tmp); \ @@ -1056,7 +1056,7 @@ } while (0) #define M_ALG0_TRANSFORM_ARG(contD, contDop, contS, contSop, func, ...) do { \ - M_CALL_CLEAN(contDop, contD); \ + M_CALL_RESET(contDop, contD); \ for M_EACH(_item, contS, contSop) { \ M_GET_SUBTYPE contDop _tmp; \ M_CALL_INIT(M_GET_OPLIST contDop, _tmp); \ @@ -1069,7 +1069,7 @@ #define M_ALG0_EXTRACT(contDst, contDstOplist, \ contSrc, contSrcOplist) do { \ - M_CALL_CLEAN(contDstOplist, contDst); \ + M_CALL_RESET(contDstOplist, contDst); \ for M_EACH(_item, contSrc, contSrcOplist) { \ M_IF_METHOD(PUSH, contDstOplist)( \ M_CALL_PUSH(contDstOplist, contDst, *_item); \ @@ -1083,7 +1083,7 @@ #define M_ALG0_EXTRACT_FUNC(contDst, contDstOplist, \ contSrc, contSrcOplist, \ condFunc) do { \ - M_CALL_CLEAN(contDstOplist, contDst); \ + M_CALL_RESET(contDstOplist, contDst); \ for M_EACH(_item, contSrc, contSrcOplist) { \ if (condFunc (*_item)) { \ M_IF_METHOD(PUSH, contDstOplist)( \ @@ -1099,7 +1099,7 @@ #define M_ALG0_EXTRACT_ARG(contDst, contDstOplist, \ contSrc, contSrcOplist, \ condFunc, ...) do { \ - M_CALL_CLEAN(contDstOplist, contDst); \ + M_CALL_RESET(contDstOplist, contDst); \ for M_EACH(_item, contSrc, contSrcOplist) { \ if (condFunc (__VA_ARGS__, *_item)) { \ M_IF_METHOD(PUSH, contDstOplist)( \ diff --git a/m-array.h b/m-array.h index 55ed9d18..e1819444 100644 --- a/m-array.h +++ b/m-array.h @@ -106,7 +106,7 @@ ,IT_CREF(M_C(name,_cref)) \ ,M_IF_METHOD(INIT_SET, oplist)(IT_INSERT(M_C(name,_insert)) ,) \ ,M_IF_AT_LEAST_METHOD(SET,INIT_MOVE,oplist)(IT_REMOVE(M_C(name,_remove)),) \ - ,CLEAN(M_C(name,_reset)) \ + ,RESET(M_C(name,_reset)) \ ,KEY_TYPE(size_t) \ ,VALUE_TYPE(M_C(name, _subtype_ct)) \ ,KEY_OPLIST(M_DEFAULT_OPLIST) \ diff --git a/m-bitset.h b/m-bitset.h index a957824b..96ee1ca7 100644 --- a/m-bitset.h +++ b/m-bitset.h @@ -847,7 +847,7 @@ bitset_popcount(const bitset_t set) ,IT_NEXT(bitset_next) \ ,IT_PREVIOUS(bitset_previous) \ ,IT_CREF(bitset_cref) \ - ,CLEAN(bitset_reset) \ + ,RESET(bitset_reset) \ ,PUSH(bitset_push_back) \ ,POP(bitset_pop_back) \ ,HASH(bitset_hash) \ diff --git a/m-bptree.h b/m-bptree.h index 4734643c..22e5afcc 100644 --- a/m-bptree.h +++ b/m-bptree.h @@ -175,7 +175,7 @@ IT_NEXT(M_C(name,_next)), \ IT_REF(M_C(name,_ref)), \ IT_CREF(M_C(name,_cref)), \ - CLEAN(M_C(name,_reset)), \ + RESET(M_C(name,_reset)), \ PUSH(M_C(name,_push)), \ GET_MIN(M_C(name,_min)), \ GET_MAX(M_C(name,_max)), \ @@ -227,7 +227,7 @@ IT_EQUAL_P(M_C(name,_it_equal_p)), \ IT_NEXT(M_C(name,_next)), \ IT_CREF(M_C(name,_cref)), \ - CLEAN(M_C(name,_reset)), \ + RESET(M_C(name,_reset)), \ GET_MIN(M_C(name,_min)), \ GET_MAX(M_C(name,_max)), \ KEY_TYPE(M_C(name, _key_ct)), \ diff --git a/m-buffer.h b/m-buffer.h index e223eb95..8891b633 100644 --- a/m-buffer.h +++ b/m-buffer.h @@ -1274,7 +1274,7 @@ M_C(name, _init)(buffer_t v, size_t size) \ ,NAME(name) \ ,TYPE(M_C(name,_ct)) \ ,SUBTYPE(M_C(name, _subtype_ct)) \ - ,CLEAN(M_C(name,_reset)) \ + ,RESET(M_C(name,_reset)) \ ,PUSH(M_C(name,_push)) \ ,POP(M_C(name,_pop)) \ ,OPLIST(oplist) \ diff --git a/m-concurrent.h b/m-concurrent.h index 164257aa..d028d8af 100644 --- a/m-concurrent.h +++ b/m-concurrent.h @@ -109,7 +109,7 @@ ,OPLIST(oplist) \ ,M_IF_METHOD(EMPTY_P, oplist)(EMPTY_P(M_C(name,_empty_p)),) \ ,M_IF_METHOD(GET_SIZE, oplist)(GET_SIZE(M_C(name,_size)),) \ - ,M_IF_METHOD(CLEAN, oplist)(CLEAN(M_C(name,_reset)),) \ + ,M_IF_METHOD(RESET, oplist)(RESET(M_C(name,_reset)),) \ ,M_IF_METHOD(KEY_TYPE, oplist)(KEY_TYPE(M_GET_KEY_TYPE oplist),) \ ,M_IF_METHOD(VALUE_TYPE, oplist)(VALUE_TYPE(M_GET_VALUE_TYPE oplist),) \ ,M_IF_METHOD(KEY_TYPE, oplist)(KEY_OPLIST(M_GET_KEY_OPLIST oplist),) \ @@ -414,13 +414,13 @@ } \ ,) \ \ - M_IF_METHOD(CLEAN, oplist)( \ + M_IF_METHOD(RESET, oplist)( \ static inline void \ M_C(name, _reset)(concurrent_t out) \ { \ M_C0NCURRENT_CONTRACT(out); \ M_C(name, _write_lock)(out); \ - M_CALL_CLEAN(oplist, out->data); \ + M_CALL_RESET(oplist, out->data); \ M_C(name, _write_unlock)(out); \ } \ static inline void M_ATTR_DEPRECATED \ diff --git a/m-core.h b/m-core.h index 88331232..ae811b37 100644 --- a/m-core.h +++ b/m-core.h @@ -2750,7 +2750,7 @@ static inline size_t m_core_cstr_hash(const char str[]) #define M_SUB_SUB(a) ,a, #define M_MUL_MUL(a) ,a, #define M_DIV_DIV(a) ,a, -#define M_CLEAN_CLEAN(a) ,a, +#define M_RESET_RESET(a) ,a, #define M_KEY_TYPE_KEY_TYPE(a) ,a, #define M_VALUE_TYPE_VALUE_TYPE(a) ,a, #define M_KEY_OPLIST_KEY_OPLIST(a) ,a, @@ -2834,7 +2834,7 @@ static inline size_t m_core_cstr_hash(const char str[]) #define M_GET_SUB(...) M_GET_METHOD(SUB, M_SUB_DEFAULT, __VA_ARGS__) #define M_GET_MUL(...) M_GET_METHOD(MUL, M_MUL_DEFAULT, __VA_ARGS__) #define M_GET_DIV(...) M_GET_METHOD(DIV, M_DIV_DEFAULT, __VA_ARGS__) -#define M_GET_CLEAN(...) M_GET_METHOD(CLEAN, M_NO_DEFAULT, __VA_ARGS__) +#define M_GET_RESET(...) M_GET_METHOD(RESET, M_NO_DEFAULT, __VA_ARGS__) #define M_GET_KEY_TYPE(...) M_GET_METHOD(KEY_TYPE, M_NO_DEF_TYPE, __VA_ARGS__) #define M_GET_VALUE_TYPE(...) M_GET_METHOD(VALUE_TYPE, M_NO_DEF_TYPE, __VA_ARGS__) #define M_GET_KEY_OPLIST(...) M_GET_METHOD(KEY_OPLIST, M_NO_DEF_TYPE, __VA_ARGS__) @@ -2908,7 +2908,7 @@ static inline size_t m_core_cstr_hash(const char str[]) #define M_CALL_SUB(oplist, ...) M_APPLY_API(M_GET_SUB oplist, oplist, __VA_ARGS__) #define M_CALL_MUL(oplist, ...) M_APPLY_API(M_GET_MUL oplist, oplist, __VA_ARGS__) #define M_CALL_DIV(oplist, ...) M_APPLY_API(M_GET_DIV oplist, oplist, __VA_ARGS__) -#define M_CALL_CLEAN(oplist, ...) M_APPLY_API(M_GET_CLEAN oplist, oplist, __VA_ARGS__) +#define M_CALL_RESET(oplist, ...) M_APPLY_API(M_GET_RESET oplist, oplist, __VA_ARGS__) #define M_CALL_GET_KEY(oplist, ...) M_APPLY_API(M_GET_GET_KEY oplist, oplist, __VA_ARGS__) #define M_CALL_SET_KEY(oplist, ...) M_APPLY_API(M_GET_SET_KEY oplist, oplist, __VA_ARGS__) #define M_CALL_GET_SET_KEY(oplist, ...) M_APPLY_API(M_GET_GET_SET_KEY oplist, oplist, __VA_ARGS__) @@ -3159,7 +3159,7 @@ static inline size_t m_core_cstr_hash(const char str[]) (INIT(M_INIT_DEFAULT), INIT_SET(M_SET_DEFAULT), SET(M_SET_DEFAULT), \ CLEAR(M_NOTHING_DEFAULT), EQUAL(M_EQUAL_DEFAULT), CMP(M_CMP_DEFAULT), \ INIT_MOVE(M_MOVE_DEFAULT), MOVE(M_MOVE_DEFAULT) , \ - CLEAN(M_INIT_DEFAULT), \ + RESET(M_INIT_DEFAULT), \ ADD(M_ADD_DEFAULT), SUB(M_SUB_DEFAULT), \ MUL(M_MUL_DEFAULT), DIV(M_DIV_DEFAULT), \ HASH(M_HASH_DEFAULT), SWAP(M_SWAP_DEFAULT) , \ @@ -3172,7 +3172,7 @@ static inline size_t m_core_cstr_hash(const char str[]) (INIT(M_INIT_DEFAULT), INIT_SET(M_SET_DEFAULT), SET(M_SET_DEFAULT), \ CLEAR(M_NOTHING_DEFAULT), EQUAL(M_EQUAL_DEFAULT), CMP(M_CMP_DEFAULT), \ INIT_MOVE(M_MOVE_DEFAULT), MOVE(M_MOVE_DEFAULT) , \ - CLEAN(M_INIT_DEFAULT), \ + RESET(M_INIT_DEFAULT), \ ADD(M_ADD_DEFAULT), SUB(M_SUB_DEFAULT), \ MUL(M_MUL_DEFAULT), DIV(M_DIV_DEFAULT), \ HASH(M_HASH_DEFAULT), SWAP(M_SWAP_DEFAULT) , \ @@ -3185,7 +3185,7 @@ static inline size_t m_core_cstr_hash(const char str[]) (INIT(M_INIT_DEFAULT), INIT_SET(M_SET_DEFAULT), SET(M_SET_DEFAULT), \ CLEAR(M_NOTHING_DEFAULT), EQUAL(M_EQUAL_DEFAULT), CMP(M_CMP_DEFAULT), \ INIT_MOVE(M_MOVE_DEFAULT), MOVE(M_MOVE_DEFAULT) , \ - CLEAN(M_INIT_DEFAULT), \ + RESET(M_INIT_DEFAULT), \ ADD(M_ADD_DEFAULT), SUB(M_SUB_DEFAULT), \ MUL(M_MUL_DEFAULT), DIV(M_DIV_DEFAULT), \ HASH(M_HASH_DEFAULT), SWAP(M_SWAP_DEFAULT) ) diff --git a/m-deque.h b/m-deque.h index bbb45d8f..1988588f 100644 --- a/m-deque.h +++ b/m-deque.h @@ -1024,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,_reset)) \ + ,RESET(M_C(name,_reset)) \ ,GET_SIZE(M_C(name, _size)) \ ,PUSH(M_C(name,_push_back)) \ ,POP(M_C(name,_pop_back)) \ diff --git a/m-dict.h b/m-dict.h index f3e750c2..8de661e6 100644 --- a/m-dict.h +++ b/m-dict.h @@ -1062,7 +1062,7 @@ INIT_MOVE(M_C(name, _init_move)), \ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)), \ - CLEAN(M_C(name, _reset)), \ + RESET(M_C(name, _reset)), \ NAME(name), \ TYPE(M_C(name, _ct)), \ SUBTYPE(M_C(name, _subtype_ct)), \ @@ -1120,7 +1120,7 @@ INIT_MOVE(M_C(name, _init_move)), \ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)), \ - CLEAN(M_C(name, _reset)), \ + RESET(M_C(name, _reset)), \ NAME(name), \ TYPE(M_C(name, _ct)), \ SUBTYPE(M_C(name, _subtype_ct)), \ diff --git a/m-i-list.h b/m-i-list.h index 9baf6551..63d0c6cc 100644 --- a/m-i-list.h +++ b/m-i-list.h @@ -99,7 +99,7 @@ typedef struct m_ilist_head_s { MOVE(M_C(name, _move)), \ NAME(name), \ TYPE(M_C(name,_ct)), \ - CLEAN(M_C(name,_reset)), \ + RESET(M_C(name,_reset)), \ SUBTYPE(M_C(name,_subtype_ct)), \ EMPTY_P(M_C(name,_empty_p)), \ IT_TYPE(M_C(name,_it_ct)), \ diff --git a/m-i-shared.h b/m-i-shared.h index 16cb7d9e..736b8f6a 100644 --- a/m-i-shared.h +++ b/m-i-shared.h @@ -91,7 +91,7 @@ M_BEGIN_PROTECTED_CODE INIT_SET(API_4(M_C(name, _init_set))), \ SET(M_C(name, _set) M_IPTR), \ CLEAR(M_C(name, _clear)), \ - CLEAN(M_C(name, _reset) M_IPTR), \ + RESET(M_C(name, _reset) M_IPTR), \ NAME(name), \ TYPE(M_C(name, _ct)), \ OPLIST(oplist), \ diff --git a/m-list.h b/m-list.h index 21b49bc4..50a2e139 100644 --- a/m-list.h +++ b/m-list.h @@ -124,7 +124,7 @@ IT_CREF(M_C(name,_cref)), \ IT_INSERT(M_C(name, _insert)), \ IT_REMOVE(M_C(name,_remove)), \ - CLEAN(M_C(name,_reset)), \ + RESET(M_C(name,_reset)), \ PUSH(M_C(name,_push_back)), \ POP(M_C(name,_pop_back)), \ PUSH_MOVE(M_C(name,_push_move)), \ diff --git a/m-prioqueue.h b/m-prioqueue.h index 58fcf69e..51da99d6 100644 --- a/m-prioqueue.h +++ b/m-prioqueue.h @@ -83,7 +83,7 @@ ,NAME(name) \ ,TYPE(M_C(name,_ct)) \ ,SUBTYPE(M_C(name, _subtype_ct)) \ - ,CLEAN(M_C(name,_reset)) \ + ,RESET(M_C(name,_reset)) \ ,PUSH(M_C(name,_push)) \ ,POP(M_C(name,_pop)) \ ,OPLIST(oplist) \ diff --git a/m-rbtree.h b/m-rbtree.h index 525bebda..58667d56 100644 --- a/m-rbtree.h +++ b/m-rbtree.h @@ -97,7 +97,7 @@ IT_PREVIOUS(M_C(name,_previous)), \ IT_CREF(M_C(name,_cref)), \ IT_REMOVE(M_C(name,_remove)), \ - CLEAN(M_C(name,_reset)), \ + RESET(M_C(name,_reset)), \ PUSH(M_C(name,_push)), \ GET_MIN(M_C(name,_min)), \ GET_MAX(M_C(name,_max)), \ diff --git a/m-shared.h b/m-shared.h index 17360df8..cfc8fe49 100644 --- a/m-shared.h +++ b/m-shared.h @@ -112,7 +112,7 @@ M_BEGIN_PROTECTED_CODE INIT_SET(M_C(name, _init_set)), \ SET(M_C(name, _set)) \ INIT_MOVE(M_C(name, _init_move)), \ - CLEAN(M_C(name, _reset)), \ + RESET(M_C(name, _reset)), \ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)) \ ,NAME(name) \ diff --git a/m-string.h b/m-string.h index fe39984d..3beb53c5 100644 --- a/m-string.h +++ b/m-string.h @@ -1713,7 +1713,7 @@ string_utf8_p(string_t str) string_t tmp; \ size_t size = string_size(str); \ string_init(tmp); \ - M_CALL_CLEAN(oplist, cont); \ + M_CALL_RESET(oplist, cont); \ for(size_t i = 0 ; i < size; i++) { \ char c = string_get_char(str, i); \ if (c == sep) { \ @@ -1829,7 +1829,7 @@ namespace m_lib { (INIT(string_init),INIT_SET(string_init_set), SET(string_set), \ INIT_WITH(M_STRING_INIT_WITH), \ INIT_MOVE(string_init_move), MOVE(string_move), \ - SWAP(string_swap), CLEAN(string_reset), \ + SWAP(string_swap), RESET(string_reset), \ EMPTY_P(string_empty_p), \ CLEAR(string_clear), HASH(string_hash), EQUAL(string_equal_p), \ CMP(string_cmp), TYPE(string_t), \ diff --git a/m-tuple.h b/m-tuple.h index d678aa79..9f6f9e8a 100644 --- a/m-tuple.h +++ b/m-tuple.h @@ -148,7 +148,7 @@ namespace m_lib { M_TUPL3_IF_ALL(INIT_MOVE, __VA_ARGS__)(M_TUPL3_DEFINE_INIT_MOVE(name, __VA_ARGS__),) \ M_TUPL3_IF_ALL(MOVE, __VA_ARGS__)(M_TUPL3_DEFINE_MOVE(name, __VA_ARGS__),) \ M_TUPL3_IF_ALL(SWAP, __VA_ARGS__)(M_TUPL3_DEFINE_SWAP(name, __VA_ARGS__),) \ - M_TUPL3_IF_ALL(CLEAN, __VA_ARGS__)(M_TUPL3_DEFINE_CLEAN(name, __VA_ARGS__),) + M_TUPL3_IF_ALL(RESET, __VA_ARGS__)(M_TUPL3_DEFINE_RESET(name, __VA_ARGS__),) /* Provide order for _cmp_order */ #define M_TUPL3_ORDER_CONVERT(name, x) M_C(name, M_C(M_TUPL3_ORDER_CONVERT_, x)) @@ -176,7 +176,7 @@ namespace m_lib { #define M_TUPL3_GET_IN_SERIAL(f,t,o) M_GET_IN_SERIAL o #define M_TUPL3_GET_PARSE_STR(f,t,o) M_GET_PARSE_STR o #define M_TUPL3_GET_SWAP(f,t,o) M_GET_SWAP o -#define M_TUPL3_GET_CLEAN(f,t,o) M_GET_CLEAN o +#define M_TUPL3_GET_RESET(f,t,o) M_GET_RESET o /* Call the method associated to the given operator for the given parameter of the tuple t=(name, type, oplist) */ @@ -196,7 +196,7 @@ namespace m_lib { #define M_TUPL3_CALL_OUT_SERIAL(t, ...) M_APPLY_API(M_TUPL3_GET_OUT_SERIAL t, M_TUPL3_GET_OPLIST t, __VA_ARGS__) #define M_TUPL3_CALL_IN_SERIAL(t, ...) M_APPLY_API(M_TUPL3_GET_IN_SERIAL t, M_TUPL3_GET_OPLIST t, __VA_ARGS__) #define M_TUPL3_CALL_SWAP(t, ...) M_APPLY_API(M_TUPL3_GET_SWAP t, M_TUPL3_GET_OPLIST t, __VA_ARGS__) -#define M_TUPL3_CALL_CLEAN(t, ...) M_APPLY_API(M_TUPL3_GET_CLEAN t, M_TUPL3_GET_OPLIST t, __VA_ARGS__) +#define M_TUPL3_CALL_RESET(t, ...) M_APPLY_API(M_TUPL3_GET_RESET t, M_TUPL3_GET_OPLIST t, __VA_ARGS__) /* Define the type of a tuple */ @@ -627,19 +627,19 @@ namespace m_lib { M_TUPL3_CALL_SWAP(a, el1 -> M_TUPL3_GET_FIELD a, el2 -> M_TUPL3_GET_FIELD a); -/* Define a CLEAN method by calling the CLEAN methods for all params */ -#define M_TUPL3_DEFINE_CLEAN(name, ...) \ +/* Define a RESET method by calling the RESET methods for all params */ +#define M_TUPL3_DEFINE_RESET(name, ...) \ static inline void M_C(name, _reset)(M_C(name,_ct) el1) { \ M_TUPL3_CONTRACT(el1); \ - M_MAP(M_TUPL3_DEFINE_CLEAN_FUNC , __VA_ARGS__) \ + M_MAP(M_TUPL3_DEFINE_RESET_FUNC , __VA_ARGS__) \ } \ static inline void M_ATTR_DEPRECATED \ M_C(name, _clean)(M_C(name,_ct) el1) { \ M_C(name, _reset)(el1); \ } -#define M_TUPL3_DEFINE_CLEAN_FUNC(a) \ - M_TUPL3_CALL_CLEAN(a, el1 -> M_TUPL3_GET_FIELD a); +#define M_TUPL3_DEFINE_RESET_FUNC(a) \ + M_TUPL3_CALL_RESET(a, el1 -> M_TUPL3_GET_FIELD a); /* INIT_WITH macro enabling recursive INIT_WITH initialization @@ -736,7 +736,7 @@ namespace m_lib { M_IF_METHOD_ALL(INIT_MOVE, __VA_ARGS__)(INIT_MOVE(M_C(name, _init_move)),), \ M_IF_METHOD_ALL(MOVE, __VA_ARGS__)(MOVE(M_C(name, _move)),), \ M_IF_METHOD_ALL(SWAP, __VA_ARGS__)(SWAP(M_C(name, _swap)),), \ - M_IF_METHOD_ALL(CLEAN, __VA_ARGS__)(CLEAN(M_C(name, _reset)),), \ + M_IF_METHOD_ALL(RESET, __VA_ARGS__)(RESET(M_C(name, _reset)),), \ M_IF_METHOD(NEW, M_RET_ARG1(__VA_ARGS__,))(NEW(M_DELAY2(M_GET_NEW) M_RET_ARG1(__VA_ARGS__,)),), \ M_IF_METHOD(REALLOC, M_RET_ARG1(__VA_ARGS__,))(REALLOC(M_DELAY2(M_GET_REALLOC) M_RET_ARG1(__VA_ARGS__,)),), \ M_IF_METHOD(DEL, M_RET_ARG1(__VA_ARGS__,))(DEL(M_DELAY2(M_GET_DEL) M_RET_ARG1(__VA_ARGS__,)),), \ diff --git a/m-variant.h b/m-variant.h index 94e60b2e..31da86bd 100644 --- a/m-variant.h +++ b/m-variant.h @@ -111,7 +111,7 @@ M_VAR1ANT_DEFINE_INIT_SETTER_FIELD(name, __VA_ARGS__) \ M_VAR1ANT_DEFINE_SETTER_FIELD(name, __VA_ARGS__) \ M_VAR1ANT_DEFINE_GETTER_FIELD(name, __VA_ARGS__) \ - M_VAR1ANT_DEFINE_CLEAN_FUNC(name, __VA_ARGS__) \ + M_VAR1ANT_DEFINE_RESET_FUNC(name, __VA_ARGS__) \ M_VAR1ANT_IF_ALL(HASH, __VA_ARGS__) \ (M_VAR1ANT_DEFINE_HASH(name, __VA_ARGS__),) \ M_VAR1ANT_IF_ALL(EQUAL, __VA_ARGS__) \ @@ -710,8 +710,8 @@ break; \ -/* Define the CLEAN function */ -#define M_VAR1ANT_DEFINE_CLEAN_FUNC(name, ...) \ +/* Define the RESET function */ +#define M_VAR1ANT_DEFINE_RESET_FUNC(name, ...) \ static inline void M_C(name, _reset)(M_C(name,_ct) my) \ { \ M_VAR1ANT_CONTRACT(name, my); \ @@ -741,7 +741,7 @@ INIT_SET(M_C(name, _init_set)), \ SET(M_C(name,_set)), \ CLEAR(M_C(name, _clear)), \ - CLEAN(M_C(name, _reset)), \ + RESET(M_C(name, _reset)), \ NAME(name), \ TYPE(M_C(name,_ct)), \ EMPTY_P(M_C(name,_empty_p)), \ diff --git a/tests/check-generic.hpp b/tests/check-generic.hpp index 65cc4907..30bc03f6 100644 --- a/tests/check-generic.hpp +++ b/tests/check-generic.hpp @@ -118,9 +118,9 @@ void test(int select_test, int index, break; #endif -#if M_TEST_METHOD_P(CLEAN, CONT_OPL) +#if M_TEST_METHOD_P(RESET, CONT_OPL) case 5: - M_CALL_CLEAN(CONT_OPL, c0); + M_CALL_RESET(CONT_OPL, c0); c1.clear(); break; #endif