Skip to content

Add message to BadExpectedAccess. #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Add message to BadExpectedAccess. #104

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b6f408
Add message to BadExpectedAccess.
rpatters1 Apr 4, 2023
250afb3
Revert "Add message to BadExpectedAccess."
rpatters1 Apr 4, 2023
d5810a9
pass message in on `BadExpectedAccess` constructor
rpatters1 Apr 4, 2023
d1f86ae
code formatting
rpatters1 Apr 4, 2023
85d119b
missed one
rpatters1 Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Source/LuaBridge/detail/Expected.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,19 +976,20 @@ template <class E>
class BadExpectedAccess;

template <>
class BadExpectedAccess<void> : public std::exception
class BadExpectedAccess<void> : public std::runtime_error
{
public:
explicit BadExpectedAccess() noexcept
explicit BadExpectedAccess(const std::string& message) noexcept
: std::runtime_error(message)
{
}
};
template <class E>
class BadExpectedAccess : public BadExpectedAccess<void>
{
public:
explicit BadExpectedAccess(E error) noexcept(std::is_nothrow_constructible_v<E, E&&>)
: error_(std::move(error))
explicit BadExpectedAccess(E error, const std::string& message) noexcept(std::is_nothrow_constructible_v<E, E&&>)
: BadExpectedAccess<void>(message), error_(std::move(error))
{
}

Expand Down Expand Up @@ -1265,7 +1266,7 @@ class Expected : public detail::ExpectedBase<T, E, std::is_copy_constructible_v<
{
#if LUABRIDGE_HAS_EXCEPTIONS
if (!hasValue())
throw BadExpectedAccess<E>(error());
throw BadExpectedAccess<E>(error(), error().message());
Copy link
Owner

@kunitoki kunitoki Apr 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E is a templated class and can be anything. Here you are assuming is has a "message" method. We should solve it differently, using a detector on the E::message method (or eventually a to_string(E)) free function on the type if defined, inside the BadExpectedAccess constructor.

#endif

return base_type::value();
Expand All @@ -1275,7 +1276,7 @@ class Expected : public detail::ExpectedBase<T, E, std::is_copy_constructible_v<
{
#if LUABRIDGE_HAS_EXCEPTIONS
if (!hasValue())
throw BadExpectedAccess<E>(error());
throw BadExpectedAccess<E>(error(), error().message());
#endif

return base_type::value();
Expand All @@ -1285,7 +1286,7 @@ class Expected : public detail::ExpectedBase<T, E, std::is_copy_constructible_v<
{
#if LUABRIDGE_HAS_EXCEPTIONS
if (!hasValue())
throw BadExpectedAccess<E>(error());
throw BadExpectedAccess<E>(error(), error().message());
#endif

return std::move(base_type::value());
Expand All @@ -1295,7 +1296,7 @@ class Expected : public detail::ExpectedBase<T, E, std::is_copy_constructible_v<
{
#if LUABRIDGE_HAS_EXCEPTIONS
if (!hasValue())
throw BadExpectedAccess<E>(error());
throw BadExpectedAccess<E>(error(), error().message());
#endif
return std::move(base_type::value());
}
Expand Down