Skip to content

Commit f30e0a7

Browse files
author
Tae Hyoun Park
committed
Implicit vector conversion for lazy actions
1 parent 74eb66c commit f30e0a7

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14)
22

33
project(queryosity)
44

5-
option(QUERYOSITY_INSTALL "Install target" OFF)
5+
option(QUERYOSITY_INSTALL "Install target" ON)
66
option(QUERYOSITY_DOCS "Documentation" OFF)
77
option(QUERYOSITY_EXTENSIONS "Extensions" OFF)
88
option(QUERYOSITY_TESTS "Tests" OFF)

include/queryosity/lazy.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class lazy : public dataflow::node,
5252
virtual ~lazy() = default;
5353

5454
virtual std::vector<Action *> const &get_slots() const final override;
55+
operator std::vector<Action *>() const;
5556

5657
virtual void set_variation(const std::string &var_name,
5758
lazy var) final override;
@@ -256,6 +257,11 @@ std::vector<Action *> const &queryosity::lazy<Action>::get_slots() const {
256257
return this->m_slots;
257258
}
258259

260+
template <typename Action>
261+
queryosity::lazy<Action>::operator std::vector<Action *>() const {
262+
return this->get_slots();
263+
}
264+
259265
template <typename Action>
260266
void queryosity::lazy<Action>::set_variation(const std::string &, lazy) {
261267
// should never be called

include/queryosity/todo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class todo : public dataflow::node,
125125
queryosity::has_no_variation_v<Nodes...>,
126126
bool> = false>
127127
auto _evaluate(Nodes const &...columns) const
128-
-> lazy<column::valued<column::value_t<column::evaluated_t<V>>>> {
128+
-> lazy<column::evaluated_t<V>> {
129129
return this->m_df->_evaluate(*this, columns...);
130130
}
131131

@@ -134,10 +134,10 @@ class todo : public dataflow::node,
134134
queryosity::has_variation_v<Nodes...>,
135135
bool> = false>
136136
auto _evaluate(Nodes const &...columns) const
137-
-> varied<lazy<column::valued<column::value_t<column::evaluated_t<V>>>>> {
137+
-> varied<lazy<column::evaluated_t<V>>> {
138138

139139
using varied_type =
140-
varied<lazy<column::valued<column::value_t<column::evaluated_t<V>>>>>;
140+
varied<lazy<column::evaluated_t<V>>>;
141141

142142
auto nom = this->m_df->_evaluate(*this, columns.nominal()...);
143143
auto syst = varied_type(std::move(nom));

0 commit comments

Comments
 (0)