tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid duplicate is_error() check in TRY_STATUS/TRY_RESULT.

Browse Source
This commit is contained in:
levlam 2023-03-21 13:30:42 +03:00
parent 7055176e89
commit 28362c1879
2 changed files with 87 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tdutils/td/utils/Status.cpp
View File

@ -59,6 +59,10 @@ string winerror_to_string(int code) {
Status Status::move_as_error_prefix(Slice prefix) const {
CHECK(is_error());
return move_as_error_prefix_unsafe(prefix);
}
Status Status::move_as_error_prefix_unsafe(Slice prefix) const {
Info info = get_info();
switch (info.error_type) {
case ErrorType::General:
@ -73,6 +77,10 @@ Status Status::move_as_error_prefix(Slice prefix) const {
Status Status::move_as_error_suffix(Slice suffix) const {
CHECK(is_error());
return move_as_error_suffix_unsafe(suffix);
}
Status Status::move_as_error_suffix_unsafe(Slice suffix) const {
Info info = get_info();
switch (info.error_type) {
case ErrorType::General:

129
tdutils/td/utils/Status.h
View File

@ -20,38 +20,36 @@
#include <type_traits>
#include <utility>
#define TRY_STATUS(status) \
{ \
auto try_status = (status); \
if (try_status.is_error()) { \
return try_status.move_as_error(); \
} \
#define TRY_STATUS(status) \
{ \
auto try_status = (status); \
if (try_status.is_error()) { \
return try_status.move_as_error_unsafe(); \
} \
}
#define TRY_STATUS_PREFIX(status, prefix) \
{ \
auto try_status = (status); \
if (try_status.is_error()) { \
return try_status.move_as_error_prefix(prefix); \
} \
#define TRY_STATUS_PREFIX(status, prefix) \
{ \
auto try_status = (status); \
if (try_status.is_error()) { \
return try_status.move_as_error_prefix_unsafe(prefix); \
} \
}
#define TRY_STATUS_PROMISE(promise_name, status) \
{ \
auto try_status = (status); \
if (try_status.is_error()) { \
promise_name.set_error(try_status.move_as_error()); \
return; \
} \
#define TRY_STATUS_PROMISE(promise_name, status) \
{ \
auto try_status = (status); \
if (try_status.is_error()) { \
return promise_name.set_error(try_status.move_as_error_unsafe()); \
} \
}
#define TRY_STATUS_PROMISE_PREFIX(promise_name, status, prefix) \
{ \
auto try_status = (status); \
if (try_status.is_error()) { \
promise_name.set_error(try_status.move_as_error_prefix(prefix)); \
return; \
} \
#define TRY_STATUS_PROMISE_PREFIX(promise_name, status, prefix) \
{ \
auto try_status = (status); \
if (try_status.is_error()) { \
return promise_name.set_error(try_status.move_as_error_prefix_unsafe(prefix)); \
} \
}
#define TRY_RESULT(name, result) TRY_RESULT_IMPL(TD_CONCAT(TD_CONCAT(r_, name), __LINE__), auto name, result)
@ -79,39 +77,37 @@
#define TRY_RESULT_IMPL(r_name, name, result) \
auto r_name = (result); \
if (r_name.is_error()) { \
return r_name.move_as_error(); \
return r_name.move_as_error_unsafe(); \
} \
name = r_name.move_as_ok();
name = r_name.move_as_ok_unsafe();
#define TRY_RESULT_PREFIX_IMPL(r_name, name, result, prefix) \
auto r_name = (result); \
if (r_name.is_error()) { \
return r_name.move_as_error_prefix(prefix); \
return r_name.move_as_error_prefix_unsafe(prefix); \
} \
name = r_name.move_as_ok();
name = r_name.move_as_ok_unsafe();
#define TRY_RESULT_PROMISE_IMPL(promise_name, r_name, name, result) \
auto r_name = (result); \
if (r_name.is_error()) { \
promise_name.set_error(r_name.move_as_error()); \
return; \
return promise_name.set_error(r_name.move_as_error_unsafe()); \
} \
name = r_name.move_as_ok();
name = r_name.move_as_ok_unsafe();
#define TRY_RESULT_PROMISE_PREFIX_IMPL(promise_name, r_name, name, result, prefix) \
auto r_name = (result); \
if (r_name.is_error()) { \
promise_name.set_error(r_name.move_as_error_prefix(prefix)); \
return; \
return promise_name.set_error(r_name.move_as_error_prefix_unsafe(prefix)); \
} \
name = r_name.move_as_ok();
name = r_name.move_as_ok_unsafe();
#define LOG_STATUS(status) \
{ \
auto log_status = (status); \
if (log_status.is_error()) { \
LOG(ERROR) << log_status.move_as_error(); \
} \
#define LOG_STATUS(status) \
{ \
auto log_status = (status); \
if (log_status.is_error()) { \
LOG(ERROR) << log_status.move_as_error_unsafe(); \
} \
}
#ifndef TD_STATUS_NO_ENSURE
@ -318,16 +314,26 @@ class Status {
return std::move(*this);
}
Status move_as_error_unsafe() TD_WARN_UNUSED_RESULT {
return std::move(*this);
}
Status move_as_ok() = delete;
Status move_as_ok_unsafe() = delete;
Status move_as_error_prefix(const Status &status) const TD_WARN_UNUSED_RESULT {
return status.move_as_error_suffix(message());
}
Status move_as_error_prefix(Slice prefix) const TD_WARN_UNUSED_RESULT;
Status move_as_error_prefix_unsafe(Slice prefix) const TD_WARN_UNUSED_RESULT;
Status move_as_error_suffix(Slice suffix) const TD_WARN_UNUSED_RESULT;
Status move_as_error_suffix_unsafe(Slice suffix) const TD_WARN_UNUSED_RESULT;
private:
struct Info {
bool static_flag : 1;
@ -499,24 +505,44 @@ class Result {
};
return std::move(status_);
}
Status move_as_error_prefix(Slice prefix) TD_WARN_UNUSED_RESULT {
Status move_as_error_unsafe() TD_WARN_UNUSED_RESULT {
SCOPE_EXIT {
status_ = Status::Error<-5>();
};
return status_.move_as_error_prefix(prefix);
return std::move(status_);
}
Status move_as_error_prefix(const Status &prefix) TD_WARN_UNUSED_RESULT {
Status move_as_error_prefix(Slice prefix) TD_WARN_UNUSED_RESULT {
SCOPE_EXIT {
status_ = Status::Error<-6>();
};
return status_.move_as_error_prefix(prefix);
}
Status move_as_error_suffix(Slice suffix) TD_WARN_UNUSED_RESULT {
Status move_as_error_prefix_unsafe(Slice prefix) TD_WARN_UNUSED_RESULT {
SCOPE_EXIT {
status_ = Status::Error<-7>();
};
return status_.move_as_error_prefix_unsafe(prefix);
}
Status move_as_error_prefix(const Status &prefix) TD_WARN_UNUSED_RESULT {
SCOPE_EXIT {
status_ = Status::Error<-8>();
};
return status_.move_as_error_prefix(prefix);
}
Status move_as_error_suffix(Slice suffix) TD_WARN_UNUSED_RESULT {
SCOPE_EXIT {
status_ = Status::Error<-9>();
};
return status_.move_as_error_suffix(suffix);
}
Status move_as_error_suffix_unsafe(Slice suffix) TD_WARN_UNUSED_RESULT {
SCOPE_EXIT {
status_ = Status::Error<-10>();
};
return status_.move_as_error_suffix_unsafe(suffix);
}
const T &ok() const {
LOG_CHECK(status_.is_ok()) << status_;
return value_;
@ -533,6 +559,9 @@ class Result {
LOG_CHECK(status_.is_ok()) << status_;
return std::move(value_);
}
T move_as_ok_unsafe() {
return std::move(value_);
}
Result<T> clone() const TD_WARN_UNUSED_RESULT {
if (is_ok()) {
@ -547,17 +576,17 @@ class Result {
template <class F>
Result<decltype(std::declval<F>()(std::declval<T>()))> move_map(F &&f) {
if (is_error()) {
return move_as_error();
return move_as_error_unsafe();
}
return f(move_as_ok());
return f(move_as_ok_unsafe());
}
template <class F>
decltype(std::declval<F>()(std::declval<T>())) move_fmap(F &&f) {
if (is_error()) {
return move_as_error();
return move_as_error_unsafe();
}
return f(move_as_ok());
return f(move_as_ok_unsafe());
}
private: