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

Rename derefence type of an iterator of a dict or a B+Treee into _ittref_t.

Browse Source
This commit is contained in:
Patrick Pelissier committed 2020-10-16 21:01:29 +02:00
1 parent 7a517ee3ae
commit 1e534bd307
4 files changed
+25 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

m-bptree.h
+8 -8
View File
@@ -37,8 +37,8 @@
#define BPTREE_DEF2(name, N, key_type, ...) \ #define BPTREE_DEF2(name, N, key_type, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
BPTREEI_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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, 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, _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, _itref_t) ))) \
M_END_PROTECTED_CODE M_END_PROTECTED_CODE
@@ -63,8 +63,8 @@
#define BPTREE_DEF(name, N, ...) \ #define BPTREE_DEF(name, N, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
BPTREEI_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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__, 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, _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, _itref_t) ))) \
M_END_PROTECTED_CODE M_END_PROTECTED_CODE
@@ -90,8 +90,8 @@
#define BPTREE_MULTI_DEF2(name, N, key_type, ...) \ #define BPTREE_MULTI_DEF2(name, N, key_type, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
BPTREEI_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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, 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, _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, _itref_t) ))) \
M_END_PROTECTED_CODE M_END_PROTECTED_CODE
@@ -118,8 +118,8 @@
#define BPTREE_MULTI_DEF(name, N, ...) \ #define BPTREE_MULTI_DEF(name, N, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
BPTREEI_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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__, 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, _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, _itref_t) ))) \
M_BEGIN_PROTECTED_CODE M_BEGIN_PROTECTED_CODE
m-dict.h
+10 -10
View File
@@ -39,8 +39,8 @@
#define DICT_DEF2(name, key_type, ...) \ #define DICT_DEF2(name, key_type, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
DICTI_DEF2_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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, 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, _type_t) ))) \ (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ))) \
M_END_PROTECTED_CODE M_END_PROTECTED_CODE
@@ -70,8 +70,8 @@
#define DICT_STOREHASH_DEF2(name, key_type, ...) \ #define DICT_STOREHASH_DEF2(name, key_type, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
DICTI_SHASH_DEF2_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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, 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, _type_t) ))) \ (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ))) \
M_END_PROTECTED_CODE M_END_PROTECTED_CODE
@@ -103,8 +103,8 @@
#define DICT_OA_DEF2(name, key_type, ...) \ #define DICT_OA_DEF2(name, key_type, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
DICTI_OA_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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, 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, _type_t) ))) \ (name, key_type, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ))) \
M_END_PROTECTED_CODE M_END_PROTECTED_CODE
@@ -132,8 +132,8 @@
#define DICT_SET_DEF(name, ...) \ #define DICT_SET_DEF(name, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
DICTI_SET_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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_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, _type_t)))) \ (name, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t)))) \
M_END_PROTECTED_CODE M_END_PROTECTED_CODE
@@ -158,8 +158,8 @@
#define DICT_OASET_DEF(name, ...) \ #define DICT_OASET_DEF(name, ...) \
M_BEGIN_PROTECTED_CODE \ M_BEGIN_PROTECTED_CODE \
DICTI_OASET_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__) \ 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_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, _type_t) ))) \ (name, __VA_ARGS__,M_C(name, _t), M_C(name, _it_t), M_C(name, _itref_t) ))) \
M_END_PROTECTED_CODE M_END_PROTECTED_CODE
tests/test-mbptree.c
+5 -5
View File
@@ -364,7 +364,7 @@ static void test5(void)
btree_it_t it, it2; btree_it_t it, it2;
int i = 0; int i = 0;
for(btree_it(it, b), btree_it_set(it2, it); !btree_end_p(it); btree_next(it)) { 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->key_ptr == i);
assert (*item->value_ptr == 1000*i); assert (*item->value_ptr == 1000*i);
i++; i++;
@@ -377,7 +377,7 @@ static void test5(void)
i = 500; i = 500;
for(btree_it_from(it, b, 500); !btree_it_until_p(it, 600); btree_next(it)) { 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->key_ptr == i);
assert (*item->value_ptr == 1000*i); assert (*item->value_ptr == 1000*i);
i++; i++;
@@ -387,7 +387,7 @@ static void test5(void)
btree_erase (b, 500); btree_erase (b, 500);
i = 501; i = 501;
for(btree_it_from(it, b, 500); !btree_it_until_p(it, 600); btree_next(it)) { 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->key_ptr == i);
assert (*item->value_ptr == 1000*i); assert (*item->value_ptr == 1000*i);
i++; i++;
@@ -526,7 +526,7 @@ test_multimap(void)
for(multimap_it_from(it, b, k); for(multimap_it_from(it, b, k);
multimap_it_while_p(it, k); multimap_it_while_p(it, k);
multimap_next(it)) { 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->key_ptr == k);
assert(*ref->value_ptr == j); assert(*ref->value_ptr == j);
j--; j--;
@@ -562,7 +562,7 @@ test_multiset(void)
for(multiset_it_from(it, b, k); for(multiset_it_from(it, b, k);
multiset_it_while_p(it, k); multiset_it_while_p(it, k);
multiset_next(it)) { multiset_next(it)) {
const multiset_type_t *ref = multiset_cref(it); const multiset_itref_t *ref = multiset_cref(it);
assert(*ref == k); assert(*ref == k);
j++; j++;
} }
tests/test-mdict.c
+2 -2
View File
@@ -443,7 +443,7 @@ static void test_it_oa(void)
dict_oa_int_it_t it; dict_oa_int_it_t it;
size_t s = 0; size_t s = 0;
for(dict_oa_int_it(it, d1); !dict_oa_int_end_p(it); dict_oa_int_next(it)) { 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->key >= 0 && pair->key < 200);
assert (pair->value == pair->key + 1); assert (pair->value == pair->key + 1);
s++; s++;
@@ -469,7 +469,7 @@ static void test_it_oa(void)
s = 0; s = 0;
for(dict_oa_int_it_last(it, d1); !dict_oa_int_end_p(it); dict_oa_int_previous(it)) { 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->key >= 0 && pair->key < 200);
assert (pair->value == pair->key + 1); assert (pair->value == pair->key + 1);
s++; s++;