From 302c5eb30089dd3cbbf10b6cd26b8c7e50b2abb9 Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sat, 29 Apr 2023 10:50:04 +0200 Subject: [PATCH] Remove export passthrough of NEW/DEL/REALLOC/FREE interface from the container oplist. It has no real practical purpose. NEW/DEL/REALLOC/FREE shall be a property of the container to be defined, and not a property for an already defined container. --- m-array.h | 3 --- m-bptree.h | 6 ------ m-concurrent.h | 3 --- m-deque.h | 3 --- m-dict.h | 6 ------ m-i-list.h | 2 -- m-i-shared.h | 3 --- m-list.h | 3 --- m-rbtree.h | 3 --- m-shared.h | 3 --- m-tuple.h | 3 --- m-variant.h | 3 --- 12 files changed, 41 deletions(-) diff --git a/m-array.h b/m-array.h index 56b6a75c..e87bdba9 100644 --- a/m-array.h +++ b/m-array.h @@ -131,9 +131,6 @@ ,M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_F(name, _in_serial)),) \ ,M_IF_METHOD(EQUAL, oplist)(EQUAL(M_F(name, _equal_p)),) \ ,M_IF_METHOD(HASH, oplist)(HASH(M_F(name, _hash)),) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) diff --git a/m-bptree.h b/m-bptree.h index 4377e1f6..feaa6800 100644 --- a/m-bptree.h +++ b/m-bptree.h @@ -188,9 +188,6 @@ M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_F(name, _in_serial)),), \ M_IF_METHOD(EQUAL, oplist)(EQUAL(M_F(name, _equal_p)),), \ M_IF_METHOD(HASH, oplist)(HASH(M_F(name, _hash)),) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) @@ -247,9 +244,6 @@ M_IF_METHOD_BOTH(IN_SERIAL, key_oplist, value_oplist)(IN_SERIAL(M_F(name, _in_serial)),), \ M_IF_METHOD_BOTH(EQUAL, key_oplist, value_oplist)(EQUAL(M_F(name, _equal_p)),), \ M_IF_METHOD_BOTH(HASH, key_oplist, value_oplist)(HASH(M_F(name, _hash)),) \ - ,M_IF_METHOD(NEW, key_oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, key_oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, key_oplist)(DEL(M_GET_DEL oplist),) \ ) diff --git a/m-concurrent.h b/m-concurrent.h index 44175077..c5c95f21 100644 --- a/m-concurrent.h +++ b/m-concurrent.h @@ -130,9 +130,6 @@ ,M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_F(name, _in_serial)),) \ ,M_IF_METHOD(EQUAL, oplist)(EQUAL(M_F(name, _equal_p)),) \ ,M_IF_METHOD(HASH, oplist)(HASH(M_F(name, _hash)),) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) diff --git a/m-deque.h b/m-deque.h index 7f73eaf3..1c141c1c 100644 --- a/m-deque.h +++ b/m-deque.h @@ -1133,9 +1133,6 @@ ,M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_F(name, _in_serial)),) \ ,M_IF_METHOD(EQUAL, oplist)(EQUAL(M_F(name, _equal_p)),) \ ,M_IF_METHOD(HASH, oplist)(HASH(M_F(name, _hash)),) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) diff --git a/m-dict.h b/m-dict.h index 45090626..f63d835a 100644 --- a/m-dict.h +++ b/m-dict.h @@ -1098,9 +1098,6 @@ ,M_IF_METHOD_BOTH(OUT_SERIAL, key_oplist, value_oplist)(OUT_SERIAL(M_F(name, _out_serial)),) \ ,M_IF_METHOD_BOTH(IN_SERIAL, key_oplist, value_oplist)(IN_SERIAL(M_F(name, _in_serial)),) \ ,M_IF_METHOD(EQUAL, value_oplist)(EQUAL(M_F(name, _equal_p)),) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW key_oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC key_oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL key_oplist),) \ ) /* Deferred evaluation for the definition, @@ -1157,9 +1154,6 @@ ,M_IF_METHOD(OUT_SERIAL, oplist)(OUT_SERIAL(M_F(name, _out_serial)),) \ ,M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_F(name, _in_serial)),) \ ,EQUAL(M_F(name, _equal_p)), \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) /* Define Lower Bound for hash table (TODO: Common macro for both implementation) */ diff --git a/m-i-list.h b/m-i-list.h index d45bc608..58ff8914 100644 --- a/m-i-list.h +++ b/m-i-list.h @@ -120,8 +120,6 @@ typedef struct m_il1st_head_s { M_IF_METHOD(NEW, oplist)(IT_INSERT(M_F(name,_insert)),), \ OPLIST(oplist), \ SPLICE_BACK(M_F(name,_splice_back)) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) diff --git a/m-i-shared.h b/m-i-shared.h index 0907e2af..8a0cd17e 100644 --- a/m-i-shared.h +++ b/m-i-shared.h @@ -98,9 +98,6 @@ M_BEGIN_PROTECTED_CODE TYPE(M_F(name, _ct)), \ OPLIST(oplist), \ SUBTYPE(M_F(name, _subtype_ct)) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) diff --git a/m-list.h b/m-list.h index 9323bfda..dbac581b 100644 --- a/m-list.h +++ b/m-list.h @@ -141,9 +141,6 @@ ,M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_F(name, _in_serial)),) \ ,M_IF_METHOD(EQUAL, oplist)(EQUAL(M_F(name, _equal_p)),) \ ,M_IF_METHOD(HASH, oplist)(HASH(M_F(name, _hash)),) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) /* Deferred evaluation for the list definition, diff --git a/m-rbtree.h b/m-rbtree.h index 62ba39da..b765ad91 100644 --- a/m-rbtree.h +++ b/m-rbtree.h @@ -109,9 +109,6 @@ M_IF_METHOD(IN_SERIAL, oplist)(IN_SERIAL(M_F(name, _in_serial)),), \ M_IF_METHOD(EQUAL, oplist)(EQUAL(M_F(name, _equal_p)),), \ M_IF_METHOD(HASH, oplist)(HASH(M_F(name, _hash)),) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) diff --git a/m-shared.h b/m-shared.h index 59dbda98..b199e14d 100644 --- a/m-shared.h +++ b/m-shared.h @@ -119,9 +119,6 @@ M_BEGIN_PROTECTED_CODE SWAP(M_F(name, _swap)) \ ,NAME(name) \ ,TYPE(M_F(name, _ct)) \ - ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ - ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ - ,M_IF_METHOD(DEL, oplist)(DEL(M_GET_DEL oplist),) \ ) // OPLIST to handle a counter of atomic type diff --git a/m-tuple.h b/m-tuple.h index b1badb6e..e53115f1 100644 --- a/m-tuple.h +++ b/m-tuple.h @@ -742,9 +742,6 @@ namespace m_lib { M_IF_METHOD_ALL(MOVE, __VA_ARGS__)(MOVE(M_F(name, _move)),), \ M_IF_METHOD_ALL(SWAP, __VA_ARGS__)(SWAP(M_F(name, _swap)),), \ M_IF_METHOD_ALL(RESET, __VA_ARGS__)(RESET(M_F(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__,)),), \ EMPLACE_TYPE( ( M_REDUCE2(M_TUPL3_OPLIST_SUBTYPE, M_ID, name, M_SEQ(1, M_NARGS(__VA_ARGS__))) ) ) \ ) diff --git a/m-variant.h b/m-variant.h index e072ab0b..4d9af399 100644 --- a/m-variant.h +++ b/m-variant.h @@ -787,9 +787,6 @@ static inline void \ M_IF_METHOD_ALL(INIT_MOVE, __VA_ARGS__)(INIT_MOVE(M_F(name, _init_move)),), \ M_IF_METHOD_ALL(INIT_MOVE, __VA_ARGS__)(MOVE(M_F(name, _move)),), \ M_IF_METHOD_ALL(SWAP, __VA_ARGS__)(SWAP(M_F(name, _swap)),), \ - 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__,)),), \ )