diff options
author | Adrian Kummerlaender | 2015-02-26 19:06:34 +0100 |
---|---|---|
committer | Adrian Kummerlaender | 2015-02-26 19:06:34 +0100 |
commit | 34530d8532e22afe0026b956ae395ddc666351b3 (patch) | |
tree | ea3f2f99c8fe60f3a70213c0f1fa294aabff0237 /src | |
parent | e26621df352272688834361e7d026338cefb1372 (diff) | |
download | TypeAsValue-34530d8532e22afe0026b956ae395ddc666351b3.tar TypeAsValue-34530d8532e22afe0026b956ae395ddc666351b3.tar.gz TypeAsValue-34530d8532e22afe0026b956ae395ddc666351b3.tar.bz2 TypeAsValue-34530d8532e22afe0026b956ae395ddc666351b3.tar.lz TypeAsValue-34530d8532e22afe0026b956ae395ddc666351b3.tar.xz TypeAsValue-34530d8532e22afe0026b956ae395ddc666351b3.tar.zst TypeAsValue-34530d8532e22afe0026b956ae395ddc666351b3.zip |
Enabled `Concatenate` to concatenate a variadic pack of lists
* analogously to arbitrary list count concatenation in Scheme's `append`
** implemented for `Concatenate` instead as it fits better with the structure between `Append` and `Concatenate`
Diffstat (limited to 'src')
-rw-r--r-- | src/conditional/cond.h | 12 | ||||
-rw-r--r-- | src/list/operation/concatenate.h | 13 | ||||
-rw-r--r-- | src/list/operation/higher/sort.h | 8 |
3 files changed, 20 insertions, 13 deletions
diff --git a/src/conditional/cond.h b/src/conditional/cond.h index ca5e46d..4def611 100644 --- a/src/conditional/cond.h +++ b/src/conditional/cond.h @@ -9,12 +9,14 @@ namespace tav { namespace detail { -template <typename Pair> -using cond_predicate = IsTrue<Car<Pair>>; - template <typename... Branches> -struct select_cond_branch { - using type = Eval<detail::find_variadic<detail::cond_predicate, Branches...>>; +class select_cond_branch { + private: + template <typename Pair> + using predicate = IsTrue<Car<Pair>>; + + public: + using type = Eval<detail::find_variadic<predicate, Branches...>>; static_assert( IsPair<type>::value, diff --git a/src/list/operation/concatenate.h b/src/list/operation/concatenate.h index a5cbaa6..cf680c1 100644 --- a/src/list/operation/concatenate.h +++ b/src/list/operation/concatenate.h @@ -2,16 +2,23 @@ #define TYPEASVALUE_SRC_LIST_OPERATION_CONCATENATE_H_ #include "append.h" -#include "higher/remove.h" #include "higher/fold.h" +#include "conditional/if.h" namespace tav { -template <typename ListOfLists> +template < + typename Head, + typename... Tail +> using Concatenate = Fold< Append, void, - ListOfLists + If< + Boolean<sizeof...(Tail) == 0>, + Head, + List<Head, Tail...> + > >; } diff --git a/src/list/operation/higher/sort.h b/src/list/operation/higher/sort.h index 925ab89..51317fa 100644 --- a/src/list/operation/higher/sort.h +++ b/src/list/operation/higher/sort.h @@ -29,11 +29,9 @@ class quick_sort { public: using type = Concatenate< - List< - Eval<quick_sort<Comparator, lhs>>, - List<pivot>, - Eval<quick_sort<Comparator, rhs>> - > + Eval<quick_sort<Comparator, lhs>>, + List<pivot>, + Eval<quick_sort<Comparator, rhs>> >; }; |