More checks

Author: kunitoki

Source/LuaBridge/detail/Invoke.h

@@ -20,6 +20,17 @@ namespace luabridge {
 //=================================================================================================
 namespace detail {
 
+template <class F>
+bool is_handler_valid(const F& f)
+{
+    if constexpr (std::is_pointer_v<remove_cvref_t<F>>)
+        return f != nullptr;
+    else if constexpr (std::is_constructible_v<bool, remove_cvref_t<F>>)
+        return static_cast<bool>(f);
+    else
+        return true;
+}
+
 template <class T>
 struct IsTuple : std::false_type
 {
@@ -105,11 +116,7 @@ TypeResult<R> callWithHandler(const Ref& object, F&& errorHandler, Args&&... arg
     bool hasHandler = false;
     if constexpr (isValidHandler)
     {
-        if constexpr (std::is_constructible_v<bool, detail::remove_cvref_t<F>>)
-            hasHandler = static_cast<bool>(errorHandler);
-        else
-            hasHandler = true;
-
+        hasHandler = detail::is_handler_valid(errorHandler);
         if (hasHandler)
             detail::push_function(L, std::forward<F>(errorHandler), "");
     }
@@ -129,7 +136,7 @@ TypeResult<R> callWithHandler(const Ref& object, F&& errorHandler, Args&&... arg
         auto ec = makeErrorCode(ErrorCode::LuaFunctionCallFailed);
 
 #if LUABRIDGE_HAS_EXCEPTIONS
-        if (! hasHandler)
+        if constexpr (! isValidHandler)
         {
             if (LuaException::areExceptionsEnabled(L))
                 LuaException::raise(L, ec);

Tests/Source/LuaRefTests.cpp

@@ -590,6 +590,10 @@ TEST_F(LuaRefTests, CallableWithNullifiedStdFunction)
 
     std::function<int(lua_State*)> pHandler = nullptr;
     EXPECT_FALSE(f.callWithHandler(pHandler, "badly"));
+
+#if LUABRIDGE_HAS_EXCEPTIONS
+    EXPECT_ANY_THROW(f.callWithHandler(pHandler, "badly").throw_on_error());
+#endif
 }
 
 TEST_F(LuaRefTests, CallableWithCFunction)
@@ -609,11 +613,10 @@ TEST_F(LuaRefTests, CallableWithNullCFunction)
     EXPECT_TRUE(f.isCallable());
 
     lua_CFunction pHandler = nullptr;
+    EXPECT_FALSE(f.callWithHandler(pHandler, "badly"));
 
 #if LUABRIDGE_HAS_EXCEPTIONS
-    EXPECT_ANY_THROW(f.callWithHandler(pHandler, "badly"));
-#else
-    EXPECT_FALSE(f.callWithHandler(pHandler, "badly"));
+    EXPECT_ANY_THROW(f.callWithHandler(pHandler, "badly").throw_on_error());
 #endif
 }