aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2015-02-02 18:58:36 +0100
committerAdrian Kummerlaender2015-02-02 18:58:36 +0100
commitd86aac04e5225e705af0dd7749fdc1c0454088a8 (patch)
tree9d17e88d71fc64d0f94bdb02f76555ad79e058df
parent2e167e9772f36f5e2239800e2e76e10bbb940e60 (diff)
downloadTypeAsValue-d86aac04e5225e705af0dd7749fdc1c0454088a8.tar
TypeAsValue-d86aac04e5225e705af0dd7749fdc1c0454088a8.tar.gz
TypeAsValue-d86aac04e5225e705af0dd7749fdc1c0454088a8.tar.bz2
TypeAsValue-d86aac04e5225e705af0dd7749fdc1c0454088a8.tar.lz
TypeAsValue-d86aac04e5225e705af0dd7749fdc1c0454088a8.tar.xz
TypeAsValue-d86aac04e5225e705af0dd7749fdc1c0454088a8.tar.zst
TypeAsValue-d86aac04e5225e705af0dd7749fdc1c0454088a8.zip
Implemented `Delete` in terms of `Remove`
* analogously to how `Contains` is implemented as a wrapper around `Any` * added appropriate test case and lessened restrictions on `Contains`'s comparator
-rw-r--r--src/list/operation/contains.h5
-rw-r--r--src/list/operation/delete.h25
-rw-r--r--test.cc25
3 files changed, 52 insertions, 3 deletions
diff --git a/src/list/operation/contains.h b/src/list/operation/contains.h
index 9e752ed..d3f95fa 100644
--- a/src/list/operation/contains.h
+++ b/src/list/operation/contains.h
@@ -1,6 +1,7 @@
#ifndef TYPEASVALUE_SRC_LIST_OPERATION_CONTAINS_H_
#define TYPEASVALUE_SRC_LIST_OPERATION_CONTAINS_H_
+#include "type.h"
#include "higher/query.h"
namespace tav {
@@ -12,9 +13,7 @@ template <
class Contains {
private:
template <typename Current>
- struct comparator {
- typedef std::is_same<Current, Element> type;
- };
+ using comparator = EqualValue<Current, Element>;
public:
typedef typename Any<comparator, List>::type type;
diff --git a/src/list/operation/delete.h b/src/list/operation/delete.h
new file mode 100644
index 0000000..ad0a4cf
--- /dev/null
+++ b/src/list/operation/delete.h
@@ -0,0 +1,25 @@
+#ifndef TYPEASVALUE_SRC_LIST_OPERATION_DELETE_H_
+#define TYPEASVALUE_SRC_LIST_OPERATION_DELETE_H_
+
+#include "type.h"
+#include "higher/filter.h"
+
+namespace tav {
+
+template <
+ typename Element,
+ typename List
+>
+class Delete {
+ private:
+ template <typename Current>
+ using comparator = EqualValue<Current, Element>;
+
+ public:
+ typedef typename Remove<comparator, List>::type type;
+
+};
+
+}
+
+#endif // TYPEASVALUE_SRC_LIST_OPERATION_DELETE_H_
diff --git a/test.cc b/test.cc
index fa082ea..da3193f 100644
--- a/test.cc
+++ b/test.cc
@@ -17,6 +17,7 @@
#include "list/generator/iota.h"
#include "list/generator/make_list.h"
#include "list/generator/higher/list_tabulate.h"
+#include "list/operation/delete.h"
#include "function/apply.h"
@@ -434,6 +435,30 @@ static_assert(
"(remove even? (list 1 2 3)) != (list 1 3)"
);
+// list delete
+
+static_assert(
+ std::is_same<
+ tav::List<tav::Int<1>, tav::Int<3>>::type,
+ tav::Delete<
+ tav::Int<2>,
+ tav::List<tav::Int<1>, tav::Int<2>, tav::Int<3>>::type
+ >::type
+ >::value,
+ "(delete 2 (list 1 2 3)) != (list 1 3)"
+);
+
+static_assert(
+ std::is_same<
+ tav::List<tav::Int<1>, tav::Int<2>, tav::Int<3>>::type,
+ tav::Delete<
+ tav::Int<4>,
+ tav::List<tav::Int<1>, tav::Int<2>, tav::Int<3>>::type
+ >::type
+ >::value,
+ "(delete 4 (list 1 2 3)) != (list 1 2 3)"
+);
+
// list partition
static_assert(