Add ALGO_EXTRACT

This commit is contained in:
Patrick Pelissier committed 2017-02-23 23:07:52 +01:00
1 parent 19599f790c
commit b8ade14540
2 files changed
+47 -2

No files matched your search

+28 -2
View File
@@ -39,7 +39,12 @@
#define ALGO_MAP(container, cont_oplist, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__) \
(ALGOI_MAP(container, cont_oplist, __VA_ARGS__), \
ALGOI_MAP_ARG(name, cont_oplist, __VA_ARGS__ ))
ALGOI_MAP_ARG(container, cont_oplist, __VA_ARGS__ ))
#define ALGO_EXTRACT(contD, contDop, contS, contSop, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__) \
(ALGOI_EXTRACT(contD, contDop, contS, contSop, __VA_ARGS__), \
ALGOI_EXTRACT_ARG(contD, contDop, contS, contSop, __VA_ARGS__ ))
/********************************** INTERNAL ************************************/
@@ -203,7 +208,6 @@
//TODO: const_iterator & CM_EACH missing...
//TODO: Algorithm missing
// nth_element, reduce, find_last, find_if, count_if, ...
//TODO: Copy from a container to another if condition.
#define ALGOI_MAP(container, cont_oplist, func) \
for M_EACH(item, l, cont_oplist) { \
@@ -215,4 +219,26 @@
func(__VA_ARGS__, *item); \
} \
#define ALGOI_EXTRACT(contDst, contDstOplist, \
contSrc, contSrcOplist, \
condFunc) do { \
M_GET_CLEAN contDstOplist (contDst); \
for M_EACH(item, contSrc, contSrcOplist) { \
if (condFunc (*item)) \
M_GET_PUSH contDstOplist (contDst, *item); \
} \
M_IF_METHOD(REVERSE, contDstOplist) (M_GET_REVERSE contDstOplist (contDstOplist);, ) \
} while (0)
#define ALGOI_EXTRACT_ARG(contDst, contDstOplist, \
contSrc, contSrcOplist, \
condFunc, ...) do { \
M_GET_CLEAN contDstOplist (contDst); \
for M_EACH(item, contSrc, contSrcOplist) { \
if (condFunc (__VA_ARGS__, *item)) \
M_GET_PUSH contDstOplist (contDst, *item); \
} \
M_IF_METHOD(REVERSE, contDstOplist) (M_GET_REVERSE contDstOplist (contDstOplist);, ) \
} while (0)
#endif
+19
View File
@@ -73,10 +73,29 @@ static void test_string(void)
list_string_clear(l);
}
static void test_extract(void)
{
list_int_t l;
list_int_init (l);
for(int i = -100; i < 100; i++)
list_int_push_back (l, i);
array_int_t a;
array_int_init(a);
#define cond(d) ((d) > 0)
ALGO_EXTRACT(a, ARRAY_OPLIST(int), l, LIST_OPLIST(int), cond);
assert(array_int_size(a) == 99);
#define cond2(c, d) ((d) > (c))
ALGO_EXTRACT(a, ARRAY_OPLIST(int), l, LIST_OPLIST(int), cond2, 10);
assert(array_int_size(a) == 89);
array_int_clear(a);
list_int_clear(l);
}
int main(void)
{
test_list();
test_array();
test_string();
test_extract();
exit(0);
}