Skip to content

Commit 4e83084

Browse files
polytypicpolytypic
committed
Naming
1 parent 9d04106 commit 4e83084

File tree

5 files changed

+58
-66
lines changed

5 files changed

+58
-66
lines changed

‎provides/include/lax_v1/arithmetic.hpp

+24-24
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@
66

77
#include <type_traits>
88

9-
template <class LhsExpr, class RhsExpr>
10-
struct lax_v1::add_m : value_t<std::common_type_t<value_type_of_t<LhsExpr>,
11-
value_type_of_t<RhsExpr>>,
12-
value_of_v<LhsExpr> + value_of_v<RhsExpr>> {};
13-
14-
template <class LhsExpr, class RhsExpr>
15-
struct lax_v1::div_m : value_t<std::common_type_t<value_type_of_t<LhsExpr>,
16-
value_type_of_t<RhsExpr>>,
17-
value_of_v<LhsExpr> / value_of_v<RhsExpr>> {};
18-
19-
template <class LhsExpr, class RhsExpr>
20-
struct lax_v1::mod_m : value_t<std::common_type_t<value_type_of_t<LhsExpr>,
21-
value_type_of_t<RhsExpr>>,
22-
value_of_v<LhsExpr> % value_of_v<RhsExpr>> {};
23-
24-
template <class LhsExpr, class RhsExpr>
25-
struct lax_v1::mul_m : value_t<std::common_type_t<value_type_of_t<LhsExpr>,
26-
value_type_of_t<RhsExpr>>,
27-
value_of_v<LhsExpr> * value_of_v<RhsExpr>> {};
28-
29-
template <class LhsExpr, class RhsExpr>
30-
struct lax_v1::sub_m : value_t<std::common_type_t<value_type_of_t<LhsExpr>,
31-
value_type_of_t<RhsExpr>>,
32-
value_of_v<LhsExpr> - value_of_v<RhsExpr>> {};
9+
template <class Lhs, class Rhs>
10+
struct lax_v1::add_m
11+
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
12+
value_of_v<Lhs> + value_of_v<Rhs>> {};
13+
14+
template <class Lhs, class Rhs>
15+
struct lax_v1::div_m
16+
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
17+
value_of_v<Lhs> / value_of_v<Rhs>> {};
18+
19+
template <class Lhs, class Rhs>
20+
struct lax_v1::mod_m
21+
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
22+
value_of_v<Lhs> % value_of_v<Rhs>> {};
23+
24+
template <class Lhs, class Rhs>
25+
struct lax_v1::mul_m
26+
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
27+
value_of_v<Lhs> * value_of_v<Rhs>> {};
28+
29+
template <class Lhs, class Rhs>
30+
struct lax_v1::sub_m
31+
: value_t<std::common_type_t<value_type_of_t<Lhs>, value_type_of_t<Rhs>>,
32+
value_of_v<Lhs> - value_of_v<Rhs>> {};
3333

3434
template <class Expr> struct lax_v1::neg_m : auto_t<-value_of_v<Expr>> {};

‎provides/include/lax_v1/comparison.hpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
#include "lax_v1/synopsis.hpp"
44
#include "lax_v1/value.hpp"
55

6-
template <class LhsExpr, class RhsExpr>
7-
struct lax_v1::eq_m : auto_t<(value_of_v<LhsExpr> == value_of_v<RhsExpr>)> {};
6+
template <class Lhs, class Rhs>
7+
struct lax_v1::eq_m : auto_t<(value_of_v<Lhs> == value_of_v<Rhs>)> {};
88

9-
template <class LhsExpr, class RhsExpr>
10-
struct lax_v1::gt_m : auto_t<(value_of_v<LhsExpr>> value_of_v<RhsExpr>)> {};
9+
template <class Lhs, class Rhs>
10+
struct lax_v1::gt_m : auto_t<(value_of_v<Lhs>> value_of_v<Rhs>)> {};
1111

12-
template <class LhsExpr, class RhsExpr>
13-
struct lax_v1::gte_m : auto_t<(value_of_v<LhsExpr> >= value_of_v<RhsExpr>)> {};
12+
template <class Lhs, class Rhs>
13+
struct lax_v1::gte_m : auto_t<(value_of_v<Lhs> >= value_of_v<Rhs>)> {};
1414

15-
template <class LhsExpr, class RhsExpr>
16-
struct lax_v1::lt_m : auto_t<(value_of_v<LhsExpr> < value_of_v<RhsExpr>)> {};
15+
template <class Lhs, class Rhs>
16+
struct lax_v1::lt_m : auto_t<(value_of_v<Lhs> < value_of_v<Rhs>)> {};
1717

18-
template <class LhsExpr, class RhsExpr>
19-
struct lax_v1::lte_m : auto_t<(value_of_v<LhsExpr> <= value_of_v<RhsExpr>)> {};
18+
template <class Lhs, class Rhs>
19+
struct lax_v1::lte_m : auto_t<(value_of_v<Lhs> <= value_of_v<Rhs>)> {};

‎provides/include/lax_v1/lazify.hpp

+4-8
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
#include "lax_v1/type.hpp"
55
#include "lax_v1/value.hpp"
66

7-
template <template <class... Parameters> class Function, class... Arguments>
8-
struct lax_v1::lazify_t : type_t<type_of_t<Function<type_of_t<Arguments>...>>> {
9-
};
7+
template <template <class... Formals> class Trait, class... Actuals>
8+
struct lax_v1::lazify_t : type_t<type_of_t<Trait<type_of_t<Actuals>...>>> {};
109

11-
template <class Type,
12-
template <class... Parameters>
13-
class Function,
14-
class... Arguments>
10+
template <class Type, template <class... Formals> class Trait, class... Actuals>
1511
struct lax_v1::lazify_v
16-
: value_t<Type, value_of_v<Function<type_of_t<Arguments>...>>> {};
12+
: value_t<Type, value_of_v<Trait<type_of_t<Actuals>...>>> {};

‎provides/include/lax_v1/logical.hpp

+8-9
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
#include "lax_v1/synopsis.hpp"
55
#include "lax_v1/value.hpp"
66

7-
template <class ElseExpr> struct lax_v1::if_m<ElseExpr> : force_t<ElseExpr> {};
8-
template <class CondExpr, class ThenExpr, class... ElseExprs>
9-
struct lax_v1::if_m<CondExpr, ThenExpr, ElseExprs...>
10-
: if_m<force_t<CondExpr>, ThenExpr, ElseExprs...> {};
11-
template <class ThenExpr, class... ElseExprs>
12-
struct lax_v1::if_m<lax_v1::true_t, ThenExpr, ElseExprs...> : ThenExpr {};
13-
template <class ThenExpr, class... ElseExprs>
14-
struct lax_v1::if_m<lax_v1::false_t, ThenExpr, ElseExprs...>
15-
: if_m<ElseExprs...> {};
7+
template <class Else> struct lax_v1::if_m<Else> : force_t<Else> {};
8+
template <class Cond, class Then, class... Elses>
9+
struct lax_v1::if_m<Cond, Then, Elses...>
10+
: if_m<force_t<Cond>, Then, Elses...> {};
11+
template <class Then, class... Elses>
12+
struct lax_v1::if_m<lax_v1::true_t, Then, Elses...> : Then {};
13+
template <class Then, class... Elses>
14+
struct lax_v1::if_m<lax_v1::false_t, Then, Elses...> : if_m<Elses...> {};
1615

1716
template <> struct lax_v1::and_m<> : true_t {};
1817
template <class Expr, class... Exprs>

‎provides/include/lax_v1/synopsis.hpp

+12-15
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ using false_t = auto_t<false>;
2424

2525
// arithmetic.hpp ==============================================================
2626

27-
template <class LhsExpr, class RhsExpr> struct add_m;
28-
template <class LhsExpr, class RhsExpr> struct div_m;
29-
template <class LhsExpr, class RhsExpr> struct mod_m;
30-
template <class LhsExpr, class RhsExpr> struct mul_m;
31-
template <class LhsExpr, class RhsExpr> struct sub_m;
27+
template <class Lhs, class Rhs> struct add_m;
28+
template <class Lhs, class Rhs> struct div_m;
29+
template <class Lhs, class Rhs> struct mod_m;
30+
template <class Lhs, class Rhs> struct mul_m;
31+
template <class Lhs, class Rhs> struct sub_m;
3232

3333
template <class Expr> struct neg_m;
3434

3535
// comparison.hpp ==============================================================
3636

37-
template <class LhsExpr, class RhsExpr> struct eq_m;
38-
template <class LhsExpr, class RhsExpr> struct gt_m;
39-
template <class LhsExpr, class RhsExpr> struct gte_m;
40-
template <class LhsExpr, class RhsExpr> struct lt_m;
41-
template <class LhsExpr, class RhsExpr> struct lte_m;
37+
template <class Lhs, class Rhs> struct eq_m;
38+
template <class Lhs, class Rhs> struct gt_m;
39+
template <class Lhs, class Rhs> struct gte_m;
40+
template <class Lhs, class Rhs> struct lt_m;
41+
template <class Lhs, class Rhs> struct lte_m;
4242

4343
// logical.hpp =================================================================
4444

@@ -55,13 +55,10 @@ template <class Expr> using force_t = typename Expr::eval;
5555

5656
// lazify.hpp ==================================================================
5757

58-
template <template <class... Parameters> class Function, class... Arguments>
58+
template <template <class... Formals> class Trait, class... Actuals>
5959
struct lazify_t;
6060

61-
template <class Type,
62-
template <class... Parameters>
63-
class Function,
64-
class... Arguments>
61+
template <class Type, template <class... Formals> class Trait, class... Actuals>
6562
struct lazify_v;
6663

6764
// type_traits.hpp =============================================================

0 commit comments

Comments
 (0)