Skip to content

Commit df8ceca

Browse files
lukevalentylukevalenty
committed
add runtime_conditional and flow unary operator+
1 parent 6367d04 commit df8ceca

18 files changed

+527
-243
lines changed

‎examples/flow_daily_routine/main.cpp‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,10 @@ struct self_care_component_t {
9595
// Extend flow services
9696
constexpr static auto config = cib::config(
9797

98-
cib::extend<morning_routine_t>(self_care_component_t::WAKE_UP >>
99-
self_care_component_t::EXERCISE >>
100-
self_care_component_t::TAKE_BATH),
98+
cib::extend<morning_routine_t>(+WAKE_UP >> +EXERCISE >> +TAKE_BATH),
10199

102-
cib::extend<evening_routine_t>(self_care_component_t::EXERCISE >>
103-
self_care_component_t::TAKE_BATH >>
104-
self_care_component_t::RELAX >>
105-
self_care_component_t::GO_TO_BED));
100+
cib::extend<evening_routine_t>(+EXERCISE >> +TAKE_BATH >> +RELAX >>
101+
+GO_TO_BED));
106102
};
107103

108104
struct food_component_t {
@@ -119,10 +115,10 @@ struct food_component_t {
119115
constexpr static auto config = cib::config(
120116

121117
cib::extend<morning_routine_t>(self_care_component_t::TAKE_BATH >>
122-
food_component_t::BREAKFAST),
118+
+BREAKFAST),
123119

124120
cib::extend<evening_routine_t>(self_care_component_t::RELAX >>
125-
food_component_t::DINNER >>
121+
+DINNER >>
126122
self_care_component_t::GO_TO_BED));
127123
};
128124

@@ -141,16 +137,13 @@ struct dress_up_component_t {
141137
constexpr static auto config = cib::config(
142138

143139
cib::extend<morning_routine_t>(
144-
self_care_component_t::WAKE_UP >>
145-
dress_up_component_t::GET_READY_FOR_EXERCISE >>
140+
self_care_component_t::WAKE_UP >> +GET_READY_FOR_EXERCISE >>
146141
self_care_component_t::EXERCISE >>
147-
self_care_component_t::TAKE_BATH >>
148-
dress_up_component_t::GET_READY_TO_WORK >>
142+
self_care_component_t::TAKE_BATH >> +GET_READY_TO_WORK >>
149143
food_component_t::BREAKFAST),
150144

151-
cib::extend<evening_routine_t>(
152-
dress_up_component_t::GET_READY_FOR_EXERCISE >>
153-
self_care_component_t::EXERCISE));
145+
cib::extend<evening_routine_t>(+GET_READY_FOR_EXERCISE >>
146+
self_care_component_t::EXERCISE));
154147
};
155148

156149
struct commute_component_t {
@@ -167,11 +160,10 @@ struct commute_component_t {
167160
constexpr static auto config = cib::config(
168161

169162
cib::extend<morning_routine_t>(food_component_t::BREAKFAST >>
170-
commute_component_t::GO_TO_OFFICE),
163+
+GO_TO_OFFICE),
171164

172165
cib::extend<evening_routine_t>(
173-
commute_component_t::RETURN_HOME >>
174-
dress_up_component_t::GET_READY_FOR_EXERCISE));
166+
+RETURN_HOME >> dress_up_component_t::GET_READY_FOR_EXERCISE));
175167
};
176168

177169
struct daily_routine_component_t {
@@ -206,7 +198,7 @@ struct daily_routine_component_t {
206198

207199
// we need to extend the MainLoop as cib::top implements
208200
// MainLoop service
209-
cib::extend<cib::MainLoop>(DAILY_ROUTINES));
201+
cib::extend<cib::MainLoop>(+DAILY_ROUTINES));
210202
};
211203

212204
struct person_routine_proj {

‎include/cib/config.hpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <cib/detail/config_item.hpp>
88
#include <cib/detail/exports.hpp>
99
#include <cib/detail/extend.hpp>
10+
#include <cib/detail/runtime_conditional.hpp>
1011

1112
#include <stdx/compiler.hpp>
1213

@@ -22,6 +23,7 @@ namespace cib {
2223
* @see cib::extend
2324
* @see cib::exports
2425
* @see cib::conditional
26+
* @see cib::runtime_conditional
2527
*/
2628
template <typename... Configs>
2729
[[nodiscard]] CONSTEVAL auto config(Configs const &...configs) {
@@ -72,4 +74,11 @@ template <typename Predicate, typename... Configs>
7274
Configs const &...configs) {
7375
return detail::conditional<Predicate, Configs...>{configs...};
7476
}
77+
78+
template <typename Predicate, typename... Configs>
79+
requires std::is_default_constructible_v<Predicate>
80+
[[nodiscard]] CONSTEVAL auto runtime_conditional(Predicate const &,
81+
Configs const &...configs) {
82+
return detail::runtime_conditional<Predicate, Configs...>{configs...};
83+
}
7584
} // namespace cib

‎include/cib/detail/runtime_conditional.hpp‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#pragma once
2+
3+
#include <cib/detail/config_details.hpp>
4+
#include <cib/detail/config_item.hpp>
5+
#include <cib/detail/extend.hpp>
6+
7+
#include <stdx/compiler.hpp>
8+
#include <stdx/tuple.hpp>
9+
#include <stdx/tuple_algorithms.hpp>
10+
11+
namespace cib::detail {
12+
template <typename Pred, typename... Configs>
13+
requires std::is_default_constructible_v<Pred>
14+
struct runtime_conditional : config_item {
15+
detail::config<Configs...> body;
16+
17+
CONSTEVAL explicit runtime_conditional(Configs const &...configs)
18+
: body{configs...} {}
19+
20+
[[nodiscard]] constexpr auto extends_tuple() const {
21+
return stdx::transform(
22+
[]<typename E>(E e) {
23+
auto args_tuple = stdx::transform(
24+
[]<typename Arg>(Arg) {
25+
return make_runtime_conditional(Pred{}, Arg{});
26+
},
27+
e.args_tuple);
28+
29+
return stdx::apply(
30+
[]<typename... Args>(Args...) {
31+
return extend<typename E::service_type, Args...>{
32+
Args{}...};
33+
},
34+
args_tuple);
35+
},
36+
body.extends_tuple());
37+
}
38+
39+
[[nodiscard]] constexpr auto exports_tuple() const {
40+
return body.exports_tuple();
41+
}
42+
};
43+
} // namespace cib::detail

‎include/flow/detail/par.hpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ template <node Lhs, node Rhs> struct par {
2424
return stdx::tuple_cat(get_nodes(p.lhs), get_nodes(p.rhs));
2525
}
2626

27+
friend constexpr auto tag_invoke(get_all_mentioned_nodes_t, par const &p) {
28+
return stdx::tuple_cat(get_all_mentioned_nodes(p.lhs),
29+
get_all_mentioned_nodes(p.rhs));
30+
}
31+
2732
friend constexpr auto tag_invoke(get_edges_t, par const &p) {
2833
return stdx::tuple_cat(get_edges(p.lhs), get_edges(p.rhs));
2934
}
@@ -36,3 +41,9 @@ template <flow::dsl::node Lhs, flow::dsl::node Rhs>
3641
[[nodiscard]] constexpr auto operator&&(Lhs const &lhs, Rhs const &rhs) {
3742
return flow::dsl::par{lhs, rhs};
3843
}
44+
45+
template <typename P, flow::dsl::node Lhs, flow::dsl::node Rhs>
46+
constexpr auto make_runtime_conditional(P, flow::dsl::par<Lhs, Rhs>) {
47+
return flow::dsl::par{make_runtime_conditional(P{}, Lhs{}),
48+
make_runtime_conditional(P{}, Rhs{})};
49+
}

‎include/flow/detail/seq.hpp‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <stdx/tuple_algorithms.hpp>
66

77
namespace flow::dsl {
8-
template <node Lhs, node Rhs> struct seq {
8+
template <node Lhs, node Rhs, typename... Ps> struct seq {
99
Lhs lhs;
1010
Rhs rhs;
1111

@@ -24,6 +24,11 @@ template <node Lhs, node Rhs> struct seq {
2424
return stdx::tuple_cat(get_nodes(s.lhs), get_nodes(s.rhs));
2525
}
2626

27+
friend constexpr auto tag_invoke(get_all_mentioned_nodes_t, seq const &s) {
28+
return stdx::tuple_cat(get_all_mentioned_nodes(s.lhs),
29+
get_all_mentioned_nodes(s.rhs));
30+
}
31+
2732
friend constexpr auto tag_invoke(get_edges_t, seq const &s) {
2833
auto is = get_initials(s.rhs);
2934
auto fs = get_finals(s.lhs);
@@ -33,16 +38,28 @@ template <node Lhs, node Rhs> struct seq {
3338
transform(
3439
[]<typename P>(P const &) {
3540
return edge<stdx::tuple_element_t<0, P>,
36-
stdx::tuple_element_t<1, P>>{};
41+
stdx::tuple_element_t<1, P>, Ps...>{};
3742
},
3843
cartesian_product_copy(fs, is)));
3944
}
4045
};
4146

4247
template <node Lhs, node Rhs> seq(Lhs, Rhs) -> seq<Lhs, Rhs>;
48+
4349
} // namespace flow::dsl
4450

4551
template <flow::dsl::node Lhs, flow::dsl::node Rhs>
4652
[[nodiscard]] constexpr auto operator>>(Lhs const &lhs, Rhs const &rhs) {
4753
return flow::dsl::seq{lhs, rhs};
4854
}
55+
56+
template <typename P, flow::dsl::node Lhs, flow::dsl::node Rhs, typename... Ps>
57+
constexpr auto make_runtime_conditional(P, flow::dsl::seq<Lhs, Rhs, Ps...>) {
58+
auto lhs = make_runtime_conditional(P{}, Lhs{});
59+
auto rhs = make_runtime_conditional(P{}, Rhs{});
60+
61+
using lhs_t = decltype(lhs);
62+
using rhs_t = decltype(rhs);
63+
64+
return flow::dsl::seq<lhs_t, rhs_t, P, Ps...>{lhs, rhs};
65+
}

‎include/flow/detail/walk.hpp‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace flow::dsl {
1010
template <typename T>
1111
concept node = requires { typename stdx::remove_cvref_t<T>::is_node; };
1212

13-
template <typename Source, typename Dest> struct edge {
13+
template <typename Source, typename Dest, typename... Ps> struct edge {
1414
using source_t = Source;
1515
using dest_t = Dest;
1616
};
@@ -47,7 +47,11 @@ constexpr inline class get_finals_t {
4747

4848
constexpr inline class get_nodes_t {
4949
template <node N> friend constexpr auto tag_invoke(get_nodes_t, N &&n) {
50-
return stdx::make_tuple(std::forward<N>(n));
50+
if constexpr (std::remove_cvref_t<N>::is_reference) {
51+
return stdx::tuple{};
52+
} else {
53+
return stdx::make_tuple(std::forward<N>(n));
54+
}
5155
}
5256

5357
public:
@@ -60,6 +64,22 @@ constexpr inline class get_nodes_t {
6064
}
6165
} get_nodes{};
6266

67+
constexpr inline class get_all_mentioned_nodes_t {
68+
template <node N>
69+
friend constexpr auto tag_invoke(get_all_mentioned_nodes_t, N &&n) {
70+
return stdx::make_tuple(std::forward<N>(n));
71+
}
72+
73+
public:
74+
template <typename... Ts>
75+
constexpr auto operator()(Ts &&...ts) const
76+
noexcept(noexcept(tag_invoke(std::declval<get_all_mentioned_nodes_t>(),
77+
std::forward<Ts>(ts)...)))
78+
-> decltype(tag_invoke(*this, std::forward<Ts>(ts)...)) {
79+
return tag_invoke(*this, std::forward<Ts>(ts)...);
80+
}
81+
} get_all_mentioned_nodes{};
82+
6383
constexpr inline class get_edges_t {
6484
friend constexpr auto tag_invoke(get_edges_t, node auto const &) {
6585
return stdx::tuple{};

0 commit comments

Comments
 (0)