From 1e534bd30747bb99a7baf4b534b5fd3081605bf9 Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Fri, 16 Oct 2020 21:01:29 +0200 Subject: [PATCH] Rename derefence type of an iterator of a dict or a B+Treee into _ittref_t. --- m-bptree.h | 16 ++++++++-------- m-dict.h | 20 ++++++++++---------- tests/test-mbptree.c | 10 +++++----- tests/test-mdict.c | 4 ++-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/m-bptree.h b/m-bptree.h index 8e846b94..9506c432 100644 --- a/m-bptree.h +++ b/m-bptree.h @@ -37,8 +37,8 @@ #define BPTREE_DEF2(name, N, key_type, ...) \ M_BEGIN_PROTECTED_CODE \ BPTREEI_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, N, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), 1, 0, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _type_t) ), \ - (name, N, key_type, __VA_ARGS__, 1, 0, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _type_t) ))) \ + ((name, N, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), 1, 0, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _itref_t) ), \ + (name, N, key_type, __VA_ARGS__, 1, 0, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _itref_t) ))) \ M_END_PROTECTED_CODE @@ -63,8 +63,8 @@ #define BPTREE_DEF(name, N, ...) \ M_BEGIN_PROTECTED_CODE \ BPTREEI_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, N, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), 0, 0, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _type_t) ), \ - (name, N, __VA_ARGS__, __VA_ARGS__, 0, 0, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _type_t) ))) \ + ((name, N, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), 0, 0, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _itref_t) ), \ + (name, N, __VA_ARGS__, __VA_ARGS__, 0, 0, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _itref_t) ))) \ M_END_PROTECTED_CODE @@ -90,8 +90,8 @@ #define BPTREE_MULTI_DEF2(name, N, key_type, ...) \ M_BEGIN_PROTECTED_CODE \ BPTREEI_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, N, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), 1, 1, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _type_t) ), \ - (name, N, key_type, __VA_ARGS__, 1, 1, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _type_t) ))) \ + ((name, N, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), 1, 1, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _itref_t) ), \ + (name, N, key_type, __VA_ARGS__, 1, 1, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _itref_t) ))) \ M_END_PROTECTED_CODE @@ -118,8 +118,8 @@ #define BPTREE_MULTI_DEF(name, N, ...) \ M_BEGIN_PROTECTED_CODE \ BPTREEI_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, N, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), 0, 1, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _type_t) ), \ - (name, N, __VA_ARGS__, __VA_ARGS__, 0, 1, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _type_t) ))) \ + ((name, N, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), 0, 1, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _itref_t) ), \ + (name, N, __VA_ARGS__, __VA_ARGS__, 0, 1, M_C(name, _t), M_C(name, _node_ct), M_C(name, _pit_ct), M_C(name, _it_t), M_C(name, _itref_t) ))) \ M_BEGIN_PROTECTED_CODE diff --git a/m-dict.h b/m-dict.h index d779204b..bccd6cae 100644 --- a/m-dict.h +++ b/m-dict.h @@ -39,8 +39,8 @@ #define DICT_DEF2(name, key_type, ...) \ M_BEGIN_PROTECTED_CODE \ DICTI_DEF2_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(),M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t) ), \ - (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t) ))) \ + ((name, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(),M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ), \ + (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ))) \ M_END_PROTECTED_CODE @@ -70,8 +70,8 @@ #define DICT_STOREHASH_DEF2(name, key_type, ...) \ M_BEGIN_PROTECTED_CODE \ DICTI_SHASH_DEF2_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(),M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t) ), \ - (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t) ))) \ + ((name, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(),M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ), \ + (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ))) \ M_END_PROTECTED_CODE @@ -103,8 +103,8 @@ #define DICT_OA_DEF2(name, key_type, ...) \ M_BEGIN_PROTECTED_CODE \ DICTI_OA_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(),M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t) ), \ - (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t) ))) \ + ((name, key_type, M_GLOBAL_OPLIST_OR_DEF(key_type)(), __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(),M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ), \ + (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ))) \ M_END_PROTECTED_CODE @@ -132,8 +132,8 @@ #define DICT_SET_DEF(name, ...) \ M_BEGIN_PROTECTED_CODE \ DICTI_SET_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(),M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t)), \ - (name, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t)))) \ + ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(),M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t)), \ + (name, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t)))) \ M_END_PROTECTED_CODE @@ -158,8 +158,8 @@ #define DICT_OASET_DEF(name, ...) \ M_BEGIN_PROTECTED_CODE \ DICTI_OASET_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ - ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t) ), \ - (name, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _type_t) ))) \ + ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ), \ + (name, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ))) \ M_END_PROTECTED_CODE diff --git a/tests/test-mbptree.c b/tests/test-mbptree.c index 7c37ad81..ba60a806 100644 --- a/tests/test-mbptree.c +++ b/tests/test-mbptree.c @@ -364,7 +364,7 @@ static void test5(void) btree_it_t it, it2; int i = 0; for(btree_it(it, b), btree_it_set(it2, it); !btree_end_p(it); btree_next(it)) { - const btree_type_t *item = btree_cref(it); + const btree_itref_t *item = btree_cref(it); assert (*item->key_ptr == i); assert (*item->value_ptr == 1000*i); i++; @@ -377,7 +377,7 @@ static void test5(void) i = 500; for(btree_it_from(it, b, 500); !btree_it_until_p(it, 600); btree_next(it)) { - const btree_type_t *item = btree_cref(it); + const btree_itref_t *item = btree_cref(it); assert (*item->key_ptr == i); assert (*item->value_ptr == 1000*i); i++; @@ -387,7 +387,7 @@ static void test5(void) btree_erase (b, 500); i = 501; for(btree_it_from(it, b, 500); !btree_it_until_p(it, 600); btree_next(it)) { - const btree_type_t *item = btree_cref(it); + const btree_itref_t *item = btree_cref(it); assert (*item->key_ptr == i); assert (*item->value_ptr == 1000*i); i++; @@ -526,7 +526,7 @@ test_multimap(void) for(multimap_it_from(it, b, k); multimap_it_while_p(it, k); multimap_next(it)) { - const multimap_type_t *ref = multimap_cref(it); + const multimap_itref_t *ref = multimap_cref(it); assert(*ref->key_ptr == k); assert(*ref->value_ptr == j); j--; @@ -562,7 +562,7 @@ test_multiset(void) for(multiset_it_from(it, b, k); multiset_it_while_p(it, k); multiset_next(it)) { - const multiset_type_t *ref = multiset_cref(it); + const multiset_itref_t *ref = multiset_cref(it); assert(*ref == k); j++; } diff --git a/tests/test-mdict.c b/tests/test-mdict.c index 2f48de16..a4992c0c 100644 --- a/tests/test-mdict.c +++ b/tests/test-mdict.c @@ -443,7 +443,7 @@ static void test_it_oa(void) dict_oa_int_it_t it; size_t s = 0; for(dict_oa_int_it(it, d1); !dict_oa_int_end_p(it); dict_oa_int_next(it)) { - dict_oa_int_type_t *pair = dict_oa_int_ref(it); + dict_oa_int_itref_t *pair = dict_oa_int_ref(it); assert (pair->key >= 0 && pair->key < 200); assert (pair->value == pair->key + 1); s++; @@ -469,7 +469,7 @@ static void test_it_oa(void) s = 0; for(dict_oa_int_it_last(it, d1); !dict_oa_int_end_p(it); dict_oa_int_previous(it)) { - dict_oa_int_type_t *pair = dict_oa_int_ref(it); + dict_oa_int_itref_t *pair = dict_oa_int_ref(it); assert (pair->key >= 0 && pair->key < 200); assert (pair->value == pair->key + 1); s++;