JDBtracker/libostd
1
0
Fork 0
forked from OctaForge/libostd
Code Issues Pull requests Releases Wiki Activity

instantiate yielder at point of func call

Browse source
This commit is contained in:
q66 2017-03-17 01:14:56 +01:00
parent f8b7275d5f
commit 043e38601f
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ostd/coroutine.hh
View file

@ -145,10 +145,11 @@ namespace detail {
return std::forward<R>(coro_rtype<R>::get(p_result)); return std::forward<R>(coro_rtype<R>::get(p_result));
} }
void call_helper(Y &&yielder) { template<typename C>
std::apply([this, yielder = std::move(yielder)](auto ...args) { void call_helper(C &coro) {
std::apply([this, &coro](auto ...args) {
coro_rtype<R>::store(p_result, std::forward<R>(p_func( coro_rtype<R>::store(p_result, std::forward<R>(p_func(
std::move(yielder), std::forward<A>(*args)... Y{coro}, std::forward<A>(*args)...
))); )));
}, p_args); }, p_args);
} }
@ -180,9 +181,10 @@ namespace detail {
return std::forward<R>(coro_rtype<R>::get(p_result)); return std::forward<R>(coro_rtype<R>::get(p_result));
} }
void call_helper(Y &&yielder) { template<typename C>
void call_helper(C &coro) {
coro_rtype<R>::store( coro_rtype<R>::store(
p_result, std::forward<R>(p_func(std::move(yielder))) p_result, std::forward<R>(p_func(Y{coro}))
); );
} }
@ -210,9 +212,10 @@ namespace detail {
void get_result() {} void get_result() {}
void call_helper(Y &&yielder) { template<typename C>
std::apply([this, yielder = std::move(yielder)](auto ...args) { void call_helper(C &coro) {
p_func(std::move(yielder), std::forward<A>(*args)...); std::apply([this, &coro](auto ...args) {
p_func(Y{coro}, std::forward<A>(*args)...);
}, p_args); }, p_args);
} }
@ -237,8 +240,9 @@ namespace detail {
void get_result() {} void get_result() {}
void call_helper(Y &&yielder) { template<typename C>
p_func(std::move(yielder)); void call_helper(C &coro) {
p_func(Y{coro});
} }
void swap(coro_stor &other) { void swap(coro_stor &other) {
@ -387,7 +391,7 @@ public:
private: private:
void resume_call() { void resume_call() {
p_stor.call_helper(yield_type{*this}); p_stor.call_helper(*this);
} }
detail::coro_stor<yield_type, R, A...> p_stor; detail::coro_stor<yield_type, R, A...> p_stor;