From 8432906bf9be6f16aafdb23aaed34f1247404329 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 23 Jan 2015 20:32:48 +0100
Subject: Implemented `ListTabulate` in terms of `Iota` and `Map` * added
 `Square` function to math operations header to facilitate a simple test case
 * added appropriate test case

---
 src/list/generator/higher/list_tabulate.h | 20 ++++++++++++++++++
 src/list/generator/iota.h                 | 34 +++++++++++++++++++++++++++++++
 src/list/iota.h                           | 34 -------------------------------
 src/operation/math.h                      |  3 +++
 test.cc                                   | 16 ++++++++++++++-
 5 files changed, 72 insertions(+), 35 deletions(-)
 create mode 100644 src/list/generator/higher/list_tabulate.h
 create mode 100644 src/list/generator/iota.h
 delete mode 100644 src/list/iota.h

diff --git a/src/list/generator/higher/list_tabulate.h b/src/list/generator/higher/list_tabulate.h
new file mode 100644
index 0000000..9eee599
--- /dev/null
+++ b/src/list/generator/higher/list_tabulate.h
@@ -0,0 +1,20 @@
+#ifndef TYPEASVALUE_SRC_LIST_GENERATOR_HIGHER_LIST_TABULATE_H_
+#define TYPEASVALUE_SRC_LIST_GENERATOR_HIGHER_LIST_TABULATE_H_
+
+#include "list/generator/iota.h"
+#include "list/operation/higher/misc.h"
+
+namespace tav {
+
+template <
+	typename                 Count,
+	template<typename> class Initializer
+>
+using ListTabulate = Map<
+	Initializer,
+	typename Iota<Count, Size<0>, Size<1>>::type
+>;
+
+}
+
+#endif  // TYPEASVALUE_SRC_LIST_GENERATOR_HIGHER_LIST_TABULATE_H_
diff --git a/src/list/generator/iota.h b/src/list/generator/iota.h
new file mode 100644
index 0000000..54f0f40
--- /dev/null
+++ b/src/list/generator/iota.h
@@ -0,0 +1,34 @@
+#ifndef TYPEASVALUE_SRC_LIST_GENERATOR_IOTA_H_
+#define TYPEASVALUE_SRC_LIST_GENERATOR_IOTA_H_
+
+#include "operation/math.h"
+
+namespace tav {
+
+template <
+	typename Count,
+	typename Initial,
+	typename Step
+>
+struct Iota {
+	typedef Cons<
+		Initial,
+		typename Iota<
+			Substract<Count, Size<1>>,
+			Add<Initial, Step>,
+			Step
+		>::type
+	> type;
+};
+
+template <
+	typename Initial,
+	typename Step
+>
+struct Iota<Size<1>, Initial, Step> {
+	typedef Cons<Initial, void> type;
+};
+
+}
+
+#endif  // TYPEASVALUE_SRC_LIST_GENERATOR_IOTA_H_
diff --git a/src/list/iota.h b/src/list/iota.h
deleted file mode 100644
index 9a8d22d..0000000
--- a/src/list/iota.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef TYPEASVALUE_SRC_LIST_IOTA_H_
-#define TYPEASVALUE_SRC_LIST_IOTA_H_
-
-#include "operation/math.h"
-
-namespace tav {
-
-template <
-	typename Count,
-	typename Initial,
-	typename Step
->
-struct Iota {
-	typedef Cons<
-		Initial,
-		typename Iota<
-			Substract<Count, Size<1>>,
-			Add<Initial, Step>,
-			Step
-		>::type
-	> type;
-};
-
-template <
-	typename Initial,
-	typename Step
->
-struct Iota<Size<1>, Initial, Step> {
-	typedef Cons<Initial, void> type;
-};
-
-}
-
-#endif  // TYPEASVALUE_SRC_LIST_IOTA_H_
diff --git a/src/operation/math.h b/src/operation/math.h
index b06eb35..0ede3f5 100644
--- a/src/operation/math.h
+++ b/src/operation/math.h
@@ -41,6 +41,9 @@ using Divide = typename std::integral_constant<
 	X::value / Y::value
 >::type;
 
+template <typename Base>
+using Square = Multiply<Base, Base>;
+
 template <typename X>
 using Even = Boolean<(X::value % 2 == 0)>;
 
diff --git a/test.cc b/test.cc
index 173aa19..368cce5 100644
--- a/test.cc
+++ b/test.cc
@@ -5,12 +5,13 @@
 
 #include "list/cons.h"
 #include "list/list.h"
-#include "list/iota.h"
 #include "list/operation/reverse.h"
 #include "list/operation/contains.h"
 #include "list/operation/higher/fold.h"
 #include "list/operation/higher/misc.h"
 #include "list/operation/higher/query.h"
+#include "list/generator/iota.h"
+#include "list/generator/higher/list_tabulate.h"
 
 int main(int, char **) { }
 
@@ -546,3 +547,16 @@ static_assert(
 	>::value,
 	"(iota 5 5 -1) != (list 5 4 3 2 1)"
 );
+
+// list tabulate
+
+static_assert(
+	std::is_same<
+		tav::List<tav::Size<0>, tav::Size<1>, tav::Size<4>, tav::Size<9>>::type,
+		tav::ListTabulate<
+			tav::Size<4>,
+			tav::Square
+		>::type
+	>::value,
+	"(list-tabulate 4 square) != (list 0 1 4 9)"
+);
-- 
cgit v1.2.3