Merge branch 'master' into RGP-master

* master: Update amalgamation file Test class assignment
finale-lua · Oct 22, 2023 · 85b526a · 85b526a
2 parents 174388c + 6ca89ec
commit 85b526a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/Distribution/LuaBridge/LuaBridge.h b/Distribution/LuaBridge/LuaBridge.h
@@ -1743,17 +1743,17 @@ class BadExpectedAccess<void> : public std::runtime_error
 };
 
 template <class E>
-class BadExpectedAccess : public BadExpectedAccess<void>
+class BadExpectedAccess : public std::runtime_error
 {
 public:
     explicit BadExpectedAccess(E error) noexcept(std::is_nothrow_constructible_v<E, E&&>)
-        : BadExpectedAccess<void>([](const E& error)
-        {
-            if constexpr (detail::has_member_message_v<E>)
-                return error.message();
-            else
-                return std::in_place;
-        }(error))
+        : std::runtime_error([](const E& error)
+            {
+                if constexpr (detail::has_member_message_v<E>)
+                    return error.message();
+                else
+                    return "Bad access to expected value";
+            }(error))
         , error_(std::move(error))
     {
     }

diff --git a/Source/LuaBridge/detail/Expected.h b/Source/LuaBridge/detail/Expected.h
@@ -1010,17 +1010,17 @@ class BadExpectedAccess<void> : public std::runtime_error
 };
 
 template <class E>
-class BadExpectedAccess : public BadExpectedAccess<void>
+class BadExpectedAccess : public std::runtime_error
 {
 public:
     explicit BadExpectedAccess(E error) noexcept(std::is_nothrow_constructible_v<E, E&&>)
-        : BadExpectedAccess<void>([](const E& error)
-        {
-            if constexpr (detail::has_member_message_v<E>)
-                return error.message();
-            else
-                return std::in_place;
-        }(error))
+        : std::runtime_error([](const E& error)
+            {
+                if constexpr (detail::has_member_message_v<E>)
+                    return error.message();
+                else
+                    return "Bad access to expected value";
+            }(error))
         , error_(std::move(error))
     {
     }

diff --git a/Tests/Source/ClassTests.cpp b/Tests/Source/ClassTests.cpp
@@ -171,6 +171,18 @@ class Bar
 
 } // namespace
 
+TEST_F(ClassTests, Assignment)
+{
+    using BaseClass = Class<int, EmptyBase>;
+
+    auto registeredClass = luabridge::getGlobalNamespace(L)
+        .beginClass<BaseClass>("BaseClass");
+
+    registeredClass.addConstructor<void(*)()>();
+
+    registeredClass.endClass();
+}
+
 TEST_F(ClassTests, IsInstance)
 {
     using BaseClass = Class<int, EmptyBase>;