From 6291f3ce10aa8ebffa895f21c4ccb91b7349c66a Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Fri, 30 Jan 2015 19:31:30 +0100 Subject: Implemented `Remove` and `Partition` higher order list functions * `Remove` is a basic `Filter` alias that negates its predicate * `Partition` builds on both `Remove` and `Filter` to return both the elements satisfying a predicate and those which don't --- src/list/operation/higher/filter.h | 22 ++++++++++++++++++---- src/list/operation/higher/map.h | 1 - src/list/operation/higher/partition.h | 21 +++++++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 src/list/operation/higher/partition.h (limited to 'src/list') diff --git a/src/list/operation/higher/filter.h b/src/list/operation/higher/filter.h index 8788aed..d91735e 100644 --- a/src/list/operation/higher/filter.h +++ b/src/list/operation/higher/filter.h @@ -7,7 +7,7 @@ namespace tav { template < - template class Function, + template class Predicate, typename List > class Filter { @@ -16,16 +16,30 @@ class Filter { typename Current, typename Previous > - struct function_wrapper { + struct predicate_wrapper { typedef If< - Function::type::value, + Predicate::type::value, Cons, Previous > type; }; public: - typedef typename Fold::type type; + typedef typename Fold::type type; + +}; + +template < + template class Predicate, + typename List +> +class Remove { + private: + template + using predicate_negator = Not>; + + public: + typedef typename Filter::type type; }; diff --git a/src/list/operation/higher/map.h b/src/list/operation/higher/map.h index 1c577ca..a451b2a 100644 --- a/src/list/operation/higher/map.h +++ b/src/list/operation/higher/map.h @@ -2,7 +2,6 @@ #define TYPEASVALUE_SRC_LIST_OPERATION_HIGHER_MAP_H_ #include "fold.h" -#include "conditional/if.h" namespace tav { diff --git a/src/list/operation/higher/partition.h b/src/list/operation/higher/partition.h new file mode 100644 index 0000000..e42b971 --- /dev/null +++ b/src/list/operation/higher/partition.h @@ -0,0 +1,21 @@ +#ifndef TYPEASVALUE_SRC_LIST_OPERATION_HIGHER_PARTITION_H_ +#define TYPEASVALUE_SRC_LIST_OPERATION_HIGHER_PARTITION_H_ + +#include "filter.h" + +namespace tav { + +template < + template class Predicate, + typename List +> +struct Partition { + typedef Cons< + typename Filter::type, + typename Remove::type + > type; +}; + +} + +#endif // TYPEASVALUE_SRC_LIST_OPERATION_HIGHER_PARTITION_H_ -- cgit v1.2.3