From 92d5e3928cdc0173efec7aa1ba1ce64c927986eb Mon Sep 17 00:00:00 2001
From: kunitoki <kunitoki@gmail.com>
Date: Thu, 6 Apr 2023 01:57:19 +0200
Subject: [PATCH 1/2] Expected exception with message tests

---
 Source/LuaBridge/detail/Expected.h | 42 +++++++++++++++++++++++++++---
 Tests/Source/Tests.cpp             | 22 ++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/Source/LuaBridge/detail/Expected.h b/Source/LuaBridge/detail/Expected.h
index 36cab32e..9fc63075 100644
--- a/Source/LuaBridge/detail/Expected.h
+++ b/Source/LuaBridge/detail/Expected.h
@@ -8,6 +8,7 @@
 
 #include <type_traits>
 #include <memory>
+#include <string>
 #include <utility>
 
 #if LUABRIDGE_HAS_EXCEPTIONS
@@ -62,6 +63,19 @@ struct is_nothrow_swappable
     : std::is_nothrow_swappable_with<std::add_lvalue_reference_t<T>, std::add_lvalue_reference_t<T>>
 {
 };
+
+template <class T, class = void>
+struct has_member_message : std::false_type
+{
+};
+
+template <class T>
+struct has_member_message<T, std::void_t<decltype(std::declval<T>().message())>> : std::true_type
+{
+};
+
+template <class T>
+inline static constexpr bool has_member_message_v = has_member_message<T>::value;
 } // namespace detail
 
 template <class T, class E>
@@ -976,19 +990,41 @@ template <class E>
 class BadExpectedAccess;
 
 template <>
-class BadExpectedAccess<void> : public std::exception
+class BadExpectedAccess<void> : public std::runtime_error
 {
+    template <class T>
+    friend class BadExpectedAccess;
+
+    BadExpectedAccess(std::in_place_t) noexcept
+        : std::runtime_error("bad_expected_access")
+    {
+    }
+
 public:
-    explicit BadExpectedAccess() noexcept
+    BadExpectedAccess() noexcept
+        : BadExpectedAccess(std::in_place)
+    {
+    }
+
+    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))
+        : BadExpectedAccess<void>([](const E& error)
+        {
+            if constexpr (detail::has_member_message_v<E>)
+                return error.message();
+            else
+                return std::in_place;
+        }(error))
+        , error_(std::move(error))
     {
     }
 
diff --git a/Tests/Source/Tests.cpp b/Tests/Source/Tests.cpp
index a11479cc..546ca442 100644
--- a/Tests/Source/Tests.cpp
+++ b/Tests/Source/Tests.cpp
@@ -874,6 +874,28 @@ TEST_F(LuaBridgeTest, BooleanNoValue)
 }
 
 #if LUABRIDGE_HAS_EXCEPTIONS
+TEST_F(LuaBridgeTest, StackExceptionWithMessage)
+{
+    try {
+        auto result = luabridge::Stack<std::string>::get(L, 1);
+        result.value();
+        EXPECT_FALSE(true);
+    } catch (const std::exception& e) {
+        EXPECT_STREQ("The lua object can't be cast to desired type", e.what());
+    }
+}
+
+TEST_F(LuaBridgeTest, ExpectedExceptionWithoutMessage)
+{
+    try {
+        luabridge::Expected<std::string, int> result = luabridge::makeUnexpected(5);
+        result.value();
+        EXPECT_FALSE(true);
+    } catch (const std::exception& e) {
+        EXPECT_STREQ("bad_expected_access", e.what());
+    }
+}
+
 namespace {
 template <class... Args>
 std::string call_callback_get_exception(const luabridge::LuaRef& fn, Args&&... args)

From a095838330730e001cabbcc65c2e4ab4fd634fc3 Mon Sep 17 00:00:00 2001
From: kunitoki <kunitoki@gmail.com>
Date: Thu, 6 Apr 2023 08:31:54 +0200
Subject: [PATCH 2/2] Update Expected.h

---
 Source/LuaBridge/detail/Expected.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/LuaBridge/detail/Expected.h b/Source/LuaBridge/detail/Expected.h
index 9fc63075..246001dd 100644
--- a/Source/LuaBridge/detail/Expected.h
+++ b/Source/LuaBridge/detail/Expected.h
@@ -996,7 +996,7 @@ class BadExpectedAccess<void> : public std::runtime_error
     friend class BadExpectedAccess;
 
     BadExpectedAccess(std::in_place_t) noexcept
-        : std::runtime_error("bad_expected_access")
+        : std::runtime_error("Bad access to expected value")
     {
     }