From a950e156253d7ad406a09f144668f1846a9d2cff Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sat, 12 Jun 2021 11:11:30 +0200 Subject: [PATCH] Adding method for NAME operator for basic containers --- m-array.h | 1 + m-bptree.h | 2 ++ m-buffer.h | 1 + m-concurrent.h | 1 + m-deque.h | 1 + m-dict.h | 2 ++ m-i-list.h | 1 + m-i-shared.h | 1 + m-list.h | 1 + m-prioqueue.h | 1 + m-rbtree.h | 1 + m-shared.h | 1 + m-snapshot.h | 1 + m-tuple.h | 1 + m-variant.h | 1 + 15 files changed, 17 insertions(+) diff --git a/m-array.h b/m-array.h index 13a17211..82cd0322 100644 --- a/m-array.h +++ b/m-array.h @@ -83,6 +83,7 @@ ,MOVE(M_C(name, _move)) \ ,SWAP(M_C(name, _swap)) \ ,TYPE(M_C(name,_ct)) \ + ,NAME(name) \ ,SUBTYPE(M_C(name, _subtype_ct)) \ ,EMPTY_P(M_C(name,_empty_p)) \ ,IT_TYPE(M_C(name,_it_ct)), \ diff --git a/m-bptree.h b/m-bptree.h index 0656b8c8..f25ef411 100644 --- a/m-bptree.h +++ b/m-bptree.h @@ -163,6 +163,7 @@ INIT_MOVE(M_C(name, _init_move)), \ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)), \ + NAME(name), \ TYPE(M_C(name,_ct)), \ SUBTYPE(M_C(name, _subtype_ct)), \ IT_TYPE(M_C(name, _it_ct)), \ @@ -214,6 +215,7 @@ INIT_MOVE(M_C(name, _init_move)), \ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)), \ + NAME(name), \ TYPE(M_C(name,_ct)), \ SUBTYPE(M_C(name, _subtype_ct)), \ EMPTY_P(M_C(name,_empty_p)), \ diff --git a/m-buffer.h b/m-buffer.h index d054fd42..5b2b8299 100644 --- a/m-buffer.h +++ b/m-buffer.h @@ -1265,6 +1265,7 @@ M_C(name, _init)(buffer_t v, size_t size) \ ,INIT_SET(M_C(name, _init_set)) \ ,SET(M_C(name, _set)) \ ,CLEAR(M_C(name, _clear)) \ + ,NAME(name) \ ,TYPE(M_C(name,_ct)) \ ,SUBTYPE(M_C(name, _subtype_ct)) \ ,CLEAN(M_C(name,_clean)) \ diff --git a/m-concurrent.h b/m-concurrent.h index ad55a36f..7cd0237b 100644 --- a/m-concurrent.h +++ b/m-concurrent.h @@ -103,6 +103,7 @@ ,M_IF_METHOD(INIT_MOVE, oplist)(INIT_MOVE(M_C(name, _init_move)),) \ ,M_IF_METHOD(MOVE, oplist)(MOVE(M_C(name, _move)),) \ ,M_IF_METHOD(SWAP,oplist)(SWAP(M_C(name, _swap)),) \ + ,NAME(name) \ ,TYPE(M_C(name,_ct)) \ ,SUBTYPE(M_C(name, _subtype_ct)) \ ,OPLIST(oplist) \ diff --git a/m-deque.h b/m-deque.h index 32cdd58d..493e2633 100644 --- a/m-deque.h +++ b/m-deque.h @@ -988,6 +988,7 @@ ,INIT_MOVE(M_C(name, _init_move)) \ ,MOVE(M_C(name, _move)) \ ,SWAP(M_C(name, _swap)) \ + ,NAME(name) \ ,TYPE(M_C(name,_ct)) \ ,SUBTYPE(M_C(name, _subtype_ct)) \ ,EMPTY_P(M_C(name,_empty_p)) \ diff --git a/m-dict.h b/m-dict.h index 47ce5614..5b31c5ad 100644 --- a/m-dict.h +++ b/m-dict.h @@ -1052,6 +1052,7 @@ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)), \ CLEAN(M_C(name, _clean)), \ + NAME(name), \ TYPE(M_C(name, _ct)), \ SUBTYPE(M_C(name, _subtype_ct)), \ EMPTY_P(M_C(name,_empty_p)), \ @@ -1107,6 +1108,7 @@ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)), \ CLEAN(M_C(name, _clean)), \ + NAME(name), \ TYPE(M_C(name, _ct)), \ SUBTYPE(M_C(name, _subtype_ct)), \ EMPTY_P(M_C(name,_empty_p)), \ diff --git a/m-i-list.h b/m-i-list.h index df0a2cf6..8efef849 100644 --- a/m-i-list.h +++ b/m-i-list.h @@ -97,6 +97,7 @@ typedef struct m_ilist_head_s { CLEAR(M_C(name, _clear)), \ INIT_MOVE(M_C(name, _init_move)), \ MOVE(M_C(name, _move)), \ + NAME(name), \ TYPE(M_C(name,_ct)), \ CLEAN(M_C(name,_clean)), \ SUBTYPE(M_C(name,_subtype_ct)), \ diff --git a/m-i-shared.h b/m-i-shared.h index 9b200696..619833e5 100644 --- a/m-i-shared.h +++ b/m-i-shared.h @@ -92,6 +92,7 @@ M_BEGIN_PROTECTED_CODE SET(M_C(name, _set) M_IPTR), \ CLEAR(M_C(name, _clear)), \ CLEAN(M_C(name, _clean) M_IPTR), \ + NAME(name), \ TYPE(M_C(name, _ct)), \ OPLIST(oplist), \ SUBTYPE(M_C(name, _subtype_ct)) \ diff --git a/m-list.h b/m-list.h index fd15fe10..ffb6fba6 100644 --- a/m-list.h +++ b/m-list.h @@ -93,6 +93,7 @@ MOVE(M_C(name, _move)), \ INIT_MOVE(M_C(name, _init_move)), \ SWAP(M_C(name, _swap)), \ + NAME(name), \ TYPE(M_C(name,_ct)), \ SUBTYPE(M_C(name,_subtype_ct)), \ EMPTY_P(M_C(name,_empty_p)), \ diff --git a/m-prioqueue.h b/m-prioqueue.h index 163cc7b3..60e86cbc 100644 --- a/m-prioqueue.h +++ b/m-prioqueue.h @@ -80,6 +80,7 @@ ,INIT_MOVE(M_C(name, _init_move)) \ ,MOVE(M_C(name, _move)) \ ,SWAP(M_C(name, _swap)) \ + ,NAME(name) \ ,TYPE(M_C(name,_ct)) \ ,SUBTYPE(M_C(name, _subtype_ct)) \ ,CLEAN(M_C(name,_clean)) \ diff --git a/m-rbtree.h b/m-rbtree.h index 9d49e2a5..55f44321 100644 --- a/m-rbtree.h +++ b/m-rbtree.h @@ -80,6 +80,7 @@ INIT_MOVE(M_C(name, _init_move)), \ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)), \ + NAME(name), \ TYPE(M_C(name,_ct)), \ SUBTYPE(M_C(name, _subtype_ct)), \ EMPTY_P(M_C(name,_empty_p)), \ diff --git a/m-shared.h b/m-shared.h index 8681ca66..edb61b22 100644 --- a/m-shared.h +++ b/m-shared.h @@ -115,6 +115,7 @@ M_BEGIN_PROTECTED_CODE CLEAN(M_C(name, _clean)), \ MOVE(M_C(name, _move)), \ SWAP(M_C(name, _swap)) \ + ,NAME(name) \ ,TYPE(M_C(name, _ct)) \ ,M_IF_METHOD(NEW, oplist)(NEW(M_GET_NEW oplist),) \ ,M_IF_METHOD(REALLOC, oplist)(REALLOC(M_GET_REALLOC oplist),) \ diff --git a/m-snapshot.h b/m-snapshot.h index 88958cd5..250eff27 100644 --- a/m-snapshot.h +++ b/m-snapshot.h @@ -109,6 +109,7 @@ M_BEGIN_PROTECTED_CODE ,INIT_SET(M_C(name, _init_set)) \ ,SET(M_C(name, _set)) \ ,CLEAR(M_C(name, _clear)) \ + ,NAME(name) \ ,TYPE(M_C(name, _ct)) \ ,SUBTYPE(M_C(name, _subtype_ct)) \ ,OPLIST(oplist) \ diff --git a/m-tuple.h b/m-tuple.h index a746c526..b0704da4 100644 --- a/m-tuple.h +++ b/m-tuple.h @@ -653,6 +653,7 @@ namespace m_lib { INIT_WITH(M_C(name, _init_emplace)), \ SET(M_C(name,_set)), \ CLEAR(M_C(name, _clear)), \ + NAME(name), \ TYPE(M_C(name,_ct)), \ M_IF_METHOD_ALL(CMP, __VA_ARGS__)(CMP(M_C(name, _cmp)),), \ M_IF_METHOD_ALL(HASH, __VA_ARGS__)(HASH(M_C(name, _hash)),), \ diff --git a/m-variant.h b/m-variant.h index f2a7b69c..bc61053c 100644 --- a/m-variant.h +++ b/m-variant.h @@ -738,6 +738,7 @@ SET(M_C(name,_set)), \ CLEAR(M_C(name, _clear)), \ CLEAN(M_C(name, _clean)), \ + NAME(name), \ TYPE(M_C(name,_ct)), \ EMPTY_P(M_C(name,_empty_p)), \ M_IF_METHOD_ALL(HASH, __VA_ARGS__)(HASH(M_C(name, _hash)),), \