From 01029e59e8eda0a160291c3c92f9db5b1cac54d3 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Fri, 16 Jan 2015 22:08:09 +0100 Subject: Implemented basic `Cons` value type and `List` constructor * `Cons` is a straigth forward type _pair_ containing `car` and `cdr` typedefs ** they may be accessed using `Car` and `Cdr` helper template aliases ** there is no enforcement of _Cons_ structure and type equality whatsoever *** i.e. similar to Scheme and different from how it is implemented in _ConstList_ * `List` is a recursive variadic helper template for constructing `Cons` value types ** simplifies _Cons_ construction and may be expanded to offer type deduction and built upon to enforce type equality * added appropriate test cases --- src/list/cons.h | 23 +++++++++++++++++++++++ src/list/list.h | 26 ++++++++++++++++++++++++++ test.cc | 24 ++++++++++++++++++++---- 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 src/list/cons.h create mode 100644 src/list/list.h diff --git a/src/list/cons.h b/src/list/cons.h new file mode 100644 index 0000000..b858c4c --- /dev/null +++ b/src/list/cons.h @@ -0,0 +1,23 @@ +#ifndef TYPEASVALUE_SRC_LIST_CONS_H_ +#define TYPEASVALUE_SRC_LIST_CONS_H_ + +namespace tav { + +template < + typename CAR, + typename CDR +> +struct Cons { + typedef CAR car; + typedef CDR cdr; +}; + +template +using Car = typename Cons::car; + +template +using Cdr = typename Cons::cdr; + +} + +#endif // TYPEASVALUE_SRC_LIST_CONS_H_ diff --git a/src/list/list.h b/src/list/list.h new file mode 100644 index 0000000..47d0d2f --- /dev/null +++ b/src/list/list.h @@ -0,0 +1,26 @@ +#ifndef TYPEASVALUE_SRC_LIST_LIST_H_ +#define TYPEASVALUE_SRC_LIST_LIST_H_ + +#include "cons.h" + +namespace tav { + +template < + typename Head, + typename... Tail +> +struct List { + typedef Cons< + Head, + typename List::type + > type; +}; + +template +struct List { + typedef Cons type; +}; + +} + +#endif // TYPEASVALUE_SRC_LIST_LIST_H_ diff --git a/test.cc b/test.cc index 4e97b7a..e2b7186 100644 --- a/test.cc +++ b/test.cc @@ -3,6 +3,8 @@ #include "type.h" #include "operation/math.h" #include "conditional/if.h" +#include "list/cons.h" +#include "list/list.h" class TypeAsValueTest : public ::testing::Test { }; @@ -11,10 +13,10 @@ TEST_F(TypeAsValueTest, Value) { } TEST_F(TypeAsValueTest, BasicMath) { - EXPECT_EQ(3, ( tav::add, tav::Int<2>>::value )); - EXPECT_EQ(4, ( tav::substract, tav::Int<6>>::value )); - EXPECT_EQ(42, ( tav::multiply, tav::Int<21>>::value )); - EXPECT_EQ(5, ( tav::divide, tav::Int<2>>::value )); + EXPECT_EQ(3, ( tav::Add, tav::Int<2>>::value )); + EXPECT_EQ(4, ( tav::Substract, tav::Int<6>>::value )); + EXPECT_EQ(42, ( tav::Multiply, tav::Int<21>>::value )); + EXPECT_EQ(5, ( tav::Divide, tav::Int<2>>::value )); } TEST_F(TypeAsValueTest, Conditional) { @@ -22,6 +24,20 @@ TEST_F(TypeAsValueTest, Conditional) { EXPECT_EQ(2, ( tav::If, tav::Int<2>>::value )); } +TEST_F(TypeAsValueTest, Cons) { + EXPECT_EQ(1, ( tav::Car, void>>::value )); + EXPECT_EQ(1, ( tav::Car, tav::Int<2>>>::value )); + EXPECT_EQ(2, ( tav::Cdr, tav::Int<2>>>::value )); + EXPECT_EQ(2, ( tav::Car, tav::Cons, tav::Int<3>>>>>::value )); +} + +TEST_F(TypeAsValueTest, List) { + EXPECT_EQ(1, ( tav::Car>::type>::value )); + EXPECT_EQ(1, ( tav::Car, tav::Int<2>>::type>::value )); + EXPECT_EQ(2, ( tav::Car, tav::Int<2>>::type>>::value )); + EXPECT_EQ(2, ( tav::Car, tav::Int<2>, tav::Int<3>>::type>>::value )); +} + int main(int argc, char **argv) { testing::InitGoogleTest(&argc, argv); -- cgit v1.2.3