coffee/continuable
1
0
Fork 0
mirror of https://github.com/Naios/continuable.git synced 2026-02-11 12:49:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

More work on error handling

Browse Source
This commit is contained in:
Denis Blank 2017-10-01 00:49:43 +02:00
parent 64c03b818d
commit b9a367ba03
2 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
include/continuable/detail/base.hpp
View File

@ -334,22 +334,24 @@ struct error_callback<hints::signature_hint_tag<Args...>, Callback, Executor,
/// The operator which is called when an error occurred /// The operator which is called when an error occurred
void operator()(types::dispatch_error_tag /*tag*/, types::error_type error) { void operator()(types::dispatch_error_tag /*tag*/, types::error_type error) {
auto invoker = [] {}; /*
*TODO
*auto invoker = [] {};
// Forward the error to the error handler // Forward the error to the error handler
packed_dispatch(std::move(executor_), std::move(invoker), packed_dispatch(std::move(executor_), std::move(invoker),
std::move(callback_), std::move(next_callback_), std::move(callback_), std::move(next_callback_),
std::move(error)); std::move(error));*/
} }
/// Resolves the continuation with the given values /// Resolves the continuation with the given values
void set_value(Args... args) { void set_value(Args... args) {
std::move(next_callback_)(std::move(args)...); // std::move(next_callback_)(std::move(args)...);
} }
/// Resolves the continuation with the given error variable. /// Resolves the continuation with the given error variable.
void set_exception(types::error_type error) { void set_exception(types::error_type error) {
std::move(next_callback_)(types::dispatch_error_tag{}, std::move(error)); // std::move(next_callback_)(types::dispatch_error_tag{}, std::move(error));
} }
}; };
@ -357,11 +359,11 @@ struct error_callback<hints::signature_hint_tag<Args...>, Callback, Executor,
/// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64095 /// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64095
struct empty_callback { struct empty_callback {
template <typename... Args> template <typename... Args>
void operator()(Args... /*error*/) const { void operator()(Args... /*args*/) {
} }
template <typename... Args> template <typename... Args>
void set_value(Args... /*error*/) { void set_value(Args... /*args*/) {
} }
void set_exception(types::error_type /*error*/) { void set_exception(types::error_type /*error*/) {
@ -461,29 +463,18 @@ auto chain_error_handler(Continuation&& continuation, Callback&& callback,
continuation = std::forward<Continuation>(continuation), continuation = std::forward<Continuation>(continuation),
callback = std::forward<Callback>(callback), callback = std::forward<Callback>(callback),
executor = std::forward<Executor>(executor) executor = std::forward<Executor>(executor)
](auto&& /*next_callback*/) mutable { ](auto&& next_callback) mutable {
// Invokes a continuation with a given callback.
// Passes the next callback to the resulting continuable or
// invokes the next callback directly if possible.
//
// For example given:
// - Continuation: continuation<[](auto&& callback) { callback("hi");
// }>
// - Callback: [](std::string) { }
// - NextCallback: []() { }
/*using Hint = decltype(hint_of(traits::identity_of(continuation)));
callbacks::result_callback<Hint,
std::decay_t<decltype(partial_callable)>,
std::decay_t<decltype(executor)>,
std::decay_t<decltype(next_callback)>>
proxy{std::move(partial_callable), std::move(executor),
std::forward<decltype(next_callback)>(next_callback)};*/
// Invoke the continuation with a proxy callback. using Hint = decltype(hint_of(traits::identity_of(continuation)));
// The proxy callback is responsible for passing callbacks::error_callback<Hint, // ...
// the result to the callback as well as decorating it. std::decay_t<decltype(callback)>,
/*attorney::invoke_continuation(std::forward<Continuation>(continuation), std::decay_t<decltype(executor)>,
std::move(proxy));*/ std::decay_t<decltype(next_callback)>>
proxy{std::move(callback), std::move(executor),
std::forward<decltype(next_callback)>(next_callback)};
attorney::invoke_continuation(std::move(continuation),
std::move(proxy));
}, },
hint, ownership_); hint, ownership_);
} }

8
test/playground/test-playground.cpp
View File

@ -46,17 +46,17 @@ int main(int, char**) {
.then([](std::string /*response*/) { .then([](std::string /*response*/) {
// ... // ...
}) })
.catching([](std::exception_ptr /*e*/) { /*.catching([](std::exception_ptr) {
// ... // ...
}); })*/;
http_request2("github.com") http_request2("github.com")
.then([](std::string /*response*/) { .then([](std::string /*response*/) {
// ... // ...
}) })
.catching([](std::exception_ptr /*e*/) { /*.catching([](std::exception_ptr) {
// ... // ...
}); })*/;
return 0; return 0;
} }