Skip to content

Commit 8fd2b3d

Browse files
polytypicpolytypic
committed
Functional basics
1 parent 3fca8aa commit 8fd2b3d

21 files changed

Lines changed: 755 additions & 188 deletions

‎NOTES.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
Legend:
2+
3+
- `_m` meta function template or class
4+
- `_c` constant/constructor
5+
- `_p` primitive (internal)
6+
- `_t` type alias
7+
- `_v` value
8+
19
Apparently VC++ 2017 is not quite ready for
210

311
```c++
4-
template <auto v> struct value_t {
5-
using eval = value_t;
12+
template <auto v> struct value_c {
13+
using eval = value_c;
614
using type = decltype(v);
715
static constexpr auto value = v;
816
};

‎internals/testing/arithmetic_test.cpp‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
11
#include "lax_v1/arithmetic.hpp"
2-
#include "lax_v1/force.hpp"
32

43
#include "config.hpp"
54

65
#include <type_traits>
76

8-
static_assert(
9-
std::is_same_v<
10-
lax::force_t<lax::add_m<lax::value_t<short, 1>, lax::value_t<long, 2>>>,
11-
lax::value_t<long, 3>>);
7+
static_assert(std::is_same_v<lax::force_c<lax::adds_m<lax::value_c<short, 1>,
8+
lax::value_c<long, 2>>>,
9+
lax::value_c<long, 3>>);
1210

1311
static_assert(
14-
std::is_same_v<
15-
lax::force_t<lax::mod_m<lax::value_t<int, 2>, lax::value_t<int, 2>>>,
16-
lax::value_t<int, 0>>);
12+
std::is_same_v<lax::force_c<lax::mod_m<lax::auto_c<2>, lax::auto_c<2>>>,
13+
lax::auto_c<0>>);
1714

18-
static_assert(
19-
std::is_same_v<
20-
lax::force_t<lax::mul_m<lax::value_t<int, 1>, lax::value_t<short, 2>>>,
21-
lax::value_t<int, 2>>);
15+
static_assert(std::is_same_v<
16+
lax::force_c<lax::muls_m<lax::auto_c<1>, lax::value_c<short, 2>>>,
17+
lax::auto_c<2>>);
2218

2319
static_assert(
2420
std::is_same_v<
25-
lax::force_t<lax::div_m<lax::value_t<short, 6>, lax::value_t<char, 2>>>,
26-
lax::value_t<int, 3>>);
21+
lax::force_c<lax::div_m<lax::value_c<short, 6>, lax::value_c<char, 2>>>,
22+
lax::auto_c<3>>);
2723

28-
static_assert(
29-
std::is_same_v<
30-
lax::force_t<lax::sub_m<lax::value_t<int, 3>, lax::value_t<char, 2>>>,
31-
lax::value_t<int, 1>>);
24+
static_assert(std::is_same_v<
25+
lax::force_c<lax::sub_m<lax::auto_c<3>, lax::value_c<char, 2>>>,
26+
lax::auto_c<1>>);
3227

33-
static_assert(std::is_same_v<lax::force_t<lax::neg_m<lax::value_t<short, 3>>>,
34-
lax::value_t<int, -3>>);
28+
static_assert(std::is_same_v<lax::force_c<lax::neg_m<lax::value_c<short, 3>>>,
29+
lax::auto_c<-3>>);

‎internals/testing/comparison_test.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include "config.hpp"
44

5-
static_assert(
6-
lax::value_of_v<lax::gt_m<lax::value_t<int, 2>, lax::value_t<int, 1>>>);
5+
static_assert(lax::gt_m<lax::auto_c<2>, lax::auto_c<1>>::value);
76

8-
static_assert(
9-
!lax::value_of_v<lax::eq_m<lax::value_t<int, 2>, lax::value_t<int, 1>>>);
7+
static_assert(!lax::eq_m<lax::auto_c<2>, lax::auto_c<1>>::value);

‎internals/testing/compile_only_test.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
#include "lax_v1/lax.hpp"
2+
13
int main() { return 0; }

‎internals/testing/core_test.cpp‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#include "lax_v1/arithmetic.hpp"
2+
#include "lax_v1/core.hpp"
3+
#include "lax_v1/functional.hpp"
4+
#include "lax_v1/type_traits.hpp"
5+
6+
#include "config.hpp"
7+
8+
struct X;
9+
struct Y;
10+
struct Z;
11+
12+
static_assert(
13+
std::is_same_v<
14+
lax::force_deep_c<
15+
lax::seq_c<lax::add_m<>,
16+
lax::add_m<lax::add_m<lax::auto_c<1>, lax::auto_c<2>>>,
17+
lax::remove_pointer_m<lax::type_c<void *>>,
18+
lax::seq_c<lax::add_m<lax::auto_c<1>, lax::auto_c<2>>>,
19+
lax::fn_c<lax::seq_c<X, Y, Z>, lax::adds_m<X, Y, Z>>>>,
20+
lax::seq_c<
21+
lax::from_primitive_c<lax::add_p, 2>,
22+
lax::closure_c<lax::from_primitive_c<lax::add_p, 2>,
23+
lax::add_m<lax::auto_c<1>, lax::auto_c<2>>>,
24+
lax::type_c<void>,
25+
lax::seq_c<lax::auto_c<3>>,
26+
lax::function_c<
27+
X,
28+
lax::function_c<Y,
29+
lax::function_c<Z, lax::adds_m<X, Y, Z>>>>>>);

‎internals/testing/functional_test.cpp‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#include "lax_v1/arithmetic.hpp"
2+
#include "lax_v1/comparison.hpp"
3+
#include "lax_v1/functional.hpp"
4+
#include "lax_v1/type_traits.hpp"
5+
6+
#include "config.hpp"
7+
8+
static_assert(lax::apply_m<lax::compose_m<lax::neg_m<>, lax::neg_m<>>,
9+
lax::auto_c<2>>::value == 2);
10+
11+
static_assert(lax::apply_m<lax::composes_m<lax::add_m<lax::auto_c<1>>,
12+
lax::neg_m<>,
13+
lax::add_m<lax::auto_c<-1>>>,
14+
lax::auto_c<1>>::value == 1);
15+
16+
static_assert(lax::apply_m<lax::pipes_m<lax::add_m<lax::auto_c<1>>,
17+
lax::neg_m<>,
18+
lax::add_m<lax::auto_c<-1>>>,
19+
lax::auto_c<1>>::value == -3);
20+
21+
static_assert(lax::thru_m<lax::auto_c<1>,
22+
lax::add_m<lax::auto_c<1>>,
23+
lax::neg_m<>,
24+
lax::add_m<lax::auto_c<-1>>,
25+
lax::eq_m<lax::auto_c<-3>>>::value == true);
26+
27+
struct V;
28+
29+
static_assert(lax::apply_m<lax::function_c<V, lax::add_m<V, lax::neg_m<V>>>,
30+
lax::auto_c<1>>::value == 0);
31+
32+
static_assert(lax::thru_m<lax::type_c<short * [1]>,
33+
lax::remove_all_extents_m<>,
34+
lax::remove_pointer_m<>,
35+
lax::alignment_of_m<>>::value == alignof(short));
36+
37+
static_assert(lax::thru_m<lax::auto_c<0>,
38+
lax::div_m<lax::auto_c<0>>,
39+
lax::constant_m<lax::auto_c<101>>>::value == 101);
40+
41+
template <class T>
42+
using adhoc_t = lax::as_type_trait_t<
43+
lax::pipe_m<lax::remove_all_extents_m<>, lax::remove_pointer_m<>>,
44+
T>;
45+
46+
static_assert(std::is_same_v<adhoc_t<int * [2][2]>, int>);
47+
48+
template <class T>
49+
inline constexpr auto adhoc_v = lax::as_value_trait_v<
50+
lax::pipe_m<lax::remove_all_extents_m<>, lax::alignment_of_m<>>,
51+
T>;
52+
53+
static_assert(adhoc_v<int * [2][2]> == alignof(int *));
54+
55+
struct F;
56+
57+
using factorial_m = lax::fix_m<lax::fn_c<
58+
lax::seq_c<F, V>,
59+
lax::if_m<lax::eq_m<lax::auto_c<0>, V>,
60+
lax::auto_c<1>,
61+
lax::mul_m<V, lax::apply_m<F, lax::sub_m<V, lax::auto_c<1>>>>>>>;
62+
63+
static_assert(lax::apply_m<factorial_m, lax::auto_c<5>>::value == 120);

‎internals/testing/logical_test.cpp‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
22

33
#include "config.hpp"
44

5-
static_assert(
6-
lax::value_of_v<
7-
lax::if_m<lax::and_m<>, lax::value_t<int, 1>, lax::value_t<int, 2>>> ==
8-
1);
5+
static_assert(lax::if_m<lax::ands_m<>, lax::auto_c<1>, lax::auto_c<2>>::value ==
6+
1);
7+
8+
static_assert(lax::if_m<lax::ors_m<>, lax::auto_c<1>, lax::auto_c<2>>::value ==
9+
2);
10+
11+
static_assert(!lax::and_m<lax::false_c,
12+
lax::div_m<lax::auto_c<1>, lax::auto_c<0>>>::value);
913

1014
static_assert(
11-
lax::value_of_v<
12-
lax::if_m<lax::or_m<>, lax::value_t<int, 1>, lax::value_t<int, 2>>> ==
13-
2);
15+
lax::or_m<lax::true_c, lax::div_m<lax::auto_c<1>, lax::auto_c<0>>>::value);
16+
17+
static_assert(lax::not_m<lax::false_c>::value);
1418

15-
static_assert(lax::value_of_v<lax::not_m<lax::false_t>>);
19+
static_assert(lax::switch_m<lax::case_c<lax::false_c, lax::auto_c<2>>,
20+
lax::case_c<lax::true_c, lax::auto_c<1>>,
21+
lax::default_c<lax::auto_c<3>>>::value == 1);

‎internals/testing/type_traits_test.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@
44

55
#include "config.hpp"
66

7-
static_assert(lax::value_of_v<lax::is_array_m<lax::type_t<int[2]>>>);
7+
static_assert(lax::is_array_m<lax::type_c<int[2]>>::value);
88

99
template <class Value>
1010
struct is_stored_plain_m
1111
: lax::or_m<
1212
lax::and_m<
1313
lax::is_pointer_m<Value>,
14-
lax::lte_m<lax::value_t<size_t, 2>,
14+
lax::lte_m<lax::auto_c<2>,
1515
lax::alignment_of_m<lax::remove_pointer_m<Value>>>>,
1616
lax::and_m<lax::is_array_m<Value>,
1717
is_stored_plain_m<lax::remove_all_extents_m<Value>>>> {};
1818

1919
template <class Value>
2020
static inline constexpr bool is_stored_plain_v =
21-
lax::value_of_v<is_stored_plain_m<lax::type_t<Value>>>;
21+
is_stored_plain_m<lax::type_c<Value>>::value;
2222

2323
static_assert(!is_stored_plain_v<char>);
2424
static_assert(!is_stored_plain_v<char *>);
2525
static_assert(is_stored_plain_v<int *>);
2626
static_assert(is_stored_plain_v<int * [2]>);
27+
28+
static_assert(!lax::is_same_m<lax::type_c<void>, lax::type_c<int>>::value);

‎internals/testing/value_test.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
#include "lax_v1/value.hpp"
1+
#include "lax_v1/core.hpp"
22

33
#include "config.hpp"
44

55
#include <type_traits>
66

7-
static_assert(std::is_same_v<lax::value_t<bool, true>::value_type, bool>);
7+
static_assert(std::is_same_v<lax::auto_c<true>::value_type, bool>);
88

9-
static_assert(std::is_same_v<lax::value_t<char, 'x'>::value_type, char>);
10-
static_assert(std::is_same_v<lax::value_t<short, 101>::value_type, short>);
11-
static_assert(std::is_same_v<lax::value_t<int, 101>::value_type, int>);
9+
static_assert(std::is_same_v<lax::auto_c<'x'>::value_type, char>);
10+
static_assert(std::is_same_v<lax::value_c<short, 101>::value_type, short>);
11+
static_assert(std::is_same_v<lax::auto_c<101>::value_type, int>);
1212
static_assert(
13-
std::is_same_v<lax::value_t<unsigned, 101u>::value_type, unsigned>);
14-
static_assert(std::is_same_v<lax::value_t<long, 101l>::value_type, long>);
15-
static_assert(std::is_same_v<lax::value_t<unsigned long, 101ul>::value_type,
13+
std::is_same_v<lax::value_c<unsigned, 101u>::value_type, unsigned>);
14+
static_assert(std::is_same_v<lax::value_c<long, 101l>::value_type, long>);
15+
static_assert(std::is_same_v<lax::value_c<unsigned long, 101ul>::value_type,
1616
unsigned long>);
1717
static_assert(
18-
std::is_same_v<lax::value_t<unsigned long long, 101ull>::value_type,
18+
std::is_same_v<lax::value_c<unsigned long long, 101ull>::value_type,
1919
unsigned long long>);

‎provides/include/lax_v1/arithmetic.hpp‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,29 @@
11
#pragma once
22

3-
#include "lax_v1/value.hpp"
3+
#include "lax_v1/core.hpp"
44

55
#include <type_traits>
66

7-
template <class Lhs, class Rhs>
8-
struct lax_v1::add_m
9-
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
10-
value_of_v<Lhs> + value_of_v<Rhs>> {};
11-
12-
template <class Lhs, class Rhs>
13-
struct lax_v1::div_m
14-
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
15-
value_of_v<Lhs> / value_of_v<Rhs>> {};
16-
17-
template <class Lhs, class Rhs>
18-
struct lax_v1::mod_m
19-
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
20-
value_of_v<Lhs> % value_of_v<Rhs>> {};
21-
22-
template <class Lhs, class Rhs>
23-
struct lax_v1::mul_m
24-
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
25-
value_of_v<Lhs> * value_of_v<Rhs>> {};
26-
27-
template <class Lhs, class Rhs>
28-
struct lax_v1::sub_m
29-
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
30-
value_of_v<Lhs> - value_of_v<Rhs>> {};
31-
32-
template <class Expr> struct lax_v1::neg_m : auto_t<-value_of_v<Expr>> {};
7+
#define LAX(name, op) \
8+
namespace lax_v1 { \
9+
template <class Lhs, class Rhs> \
10+
using name##_p = value_c< \
11+
std::common_type_t<typename Lhs::value_type, typename Rhs::value_type>, \
12+
Lhs::value op Rhs::value>; \
13+
} \
14+
template <class... Exprs> \
15+
struct lax_v1::name##_m : primitive_c<name##_p, 2, Exprs...> {};
16+
17+
LAX(add, +)
18+
LAX(div, /)
19+
LAX(mod, %)
20+
LAX(mul, *)
21+
LAX(sub, -)
22+
#undef LAX
23+
24+
namespace lax_v1 {
25+
template <class Expr> using neg_p = auto_c<-Expr::value>;
26+
} // namespace lax_v1
27+
28+
template <class... Exprs>
29+
struct lax_v1::neg_m : primitive_c<neg_p, 1, Exprs...> {};

0 commit comments

Comments
 (0)