feat: add expected<>::vrt()

yulon · Jul 29, 2023 · 994a19d · 994a19d
1 parent 767ad3b
commit 994a19d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/include/rua/error.hpp b/include/rua/error.hpp
@@ -277,15 +277,15 @@ class expected : public enable_value_operators<expected<T>, T> {
 		return nullptr;
 	}
 
-	variant<T, error_i> &data() & {
+	variant<T, error_i> &vrt() & {
 		return $v;
 	}
 
-	variant<T, error_i> &&data() && {
+	variant<T, error_i> &&vrt() && {
 		return std::move($v);
 	}
 
-	const variant<T, error_i> &data() const & {
+	const variant<T, error_i> &vrt() const & {
 		return $v;
 	}
 
@@ -357,12 +357,26 @@ class expected<void> {
 		return has_value();
 	}
 
-	RUA_CONSTEXPR_14 void value() const {}
+	void value() const {
+#ifdef RUA_HAS_EXCEPTIONS
+		if (!has_value()) {
+			throw error();
+		}
+#endif
+	}
 
 	error_i error() const {
 		return $err;
 	}
 
+	variant<void, error_i> vrt() && {
+		return std::move($err);
+	}
+
+	variant<void, error_i> vrt() const & {
+		return $err;
+	}
+
 	void reset() {
 		$err.reset();
 	}

diff --git a/include/rua/sync/future.hpp b/include/rua/sync/future.hpp
@@ -88,7 +88,7 @@ class future : private enable_await_operators {
 		typename = enable_if_t<
 			(std::is_void<T>::value && std::is_void<U>::value) ||
 			std::is_convertible<U, T>::value>>
-	future(expected<U> exp) : $v(std::move(exp).data()) {}
+	future(expected<U> exp) : $v(std::move(exp).vrt()) {}
 
 	template <
 		typename Promise,