Skip to content

Proposed mods to callWithHandler #179

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 4 commits into from
Closed

Proposed mods to callWithHandler #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d72ace0
refine callWithHandler
rpatters1 Mar 12, 2024
07e28a5
I figured out what was wrong when errorHandler was null.
rpatters1 Mar 12, 2024
6c26d46
updated with tests.
rpatters1 Mar 17, 2024
5f93250
cleaner code
rpatters1 Mar 17, 2024
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: 10 additions & 7 deletions Source/LuaBridge/detail/Invoke.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,14 @@ LuaResult callWithHandler(const LuaRef& object, F&& errorHandler, Args&&... args
lua_State* L = object.state();
const int stackTop = lua_gettop(L);

bool isNonNullHandler = isValidHandler;
if constexpr (isValidHandler)
detail::push_function(L, std::forward<F>(errorHandler), ""); // Stack: error handler (eh)
{
if constexpr (std::is_pointer_v<std::remove_reference_t<F>> || std::is_same_v<std::decay_t<F>, std::function<int(lua_State*)>>)
isNonNullHandler = errorHandler != nullptr;
if (isNonNullHandler)
detail::push_function(L, std::forward<F>(errorHandler), ""); // Stack: error handler (eh)
}

object.push(); // Stack: eh, ref

Expand All @@ -193,17 +199,14 @@ LuaResult callWithHandler(const LuaRef& object, F&& errorHandler, Args&&... args
}
}

const int code = lua_pcall(L, sizeof...(Args), LUA_MULTRET, isValidHandler ? (-static_cast<int>(sizeof...(Args)) - 2) : 0);
const int code = lua_pcall(L, sizeof...(Args), LUA_MULTRET, isNonNullHandler ? (-static_cast<int>(sizeof...(Args)) - 2) : 0);
if (code != LUABRIDGE_LUA_OK)
{
auto ec = makeErrorCode(ErrorCode::LuaFunctionCallFailed);

#if LUABRIDGE_HAS_EXCEPTIONS
if constexpr (! isValidHandler)
{
if (LuaException::areExceptionsEnabled(L))
LuaException::raise(L, ec);
}
if (LuaException::areExceptionsEnabled(L))
LuaException::raise(L, ec);
#endif

return LuaResult::errorFromStack(L, ec);
Expand Down
61 changes: 59 additions & 2 deletions Tests/Source/LuaRefTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "TestBase.h"

#include <sstream>
#include <functional>

struct LuaRefTests : TestBase
{
Expand Down Expand Up @@ -534,12 +535,68 @@ TEST_F(LuaRefTests, CallableWithHandler)
return 0;
};

auto result = f.callWithHandler(handler, "badly");
EXPECT_FALSE(result);
#if LUABRIDGE_HAS_EXCEPTIONS
EXPECT_ANY_THROW(f.callWithHandler(handler, "badly"));
#else
EXPECT_FALSE(f.callWithHandler(handler, "badly"));
#endif
EXPECT_TRUE(calledHandler);
EXPECT_TRUE(errorMessage.find("we failed badly") != std::string::npos);
}

TEST_F(LuaRefTests, CallableWithStdFunction)
{
runLua("function f(x) error('we failed ' .. x) end");
auto f = luabridge::getGlobal(L, "f");
EXPECT_TRUE(f.isCallable());

bool calledHandler = false;
std::string errorMessage;
auto handler = [&](lua_State*) -> int
{
calledHandler = true;

if (auto msg = lua_tostring(L, 1))
errorMessage = msg;

return 0;
};
std::function<int(lua_State*)> pHandler = handler;

#if LUABRIDGE_HAS_EXCEPTIONS
EXPECT_ANY_THROW(f.callWithHandler(pHandler, "badly"));
#else
EXPECT_FALSE(f.callWithHandler(pHandler, "badly"));
#endif
EXPECT_TRUE(calledHandler);
EXPECT_TRUE(errorMessage.find("we failed badly") != std::string::npos);

calledHandler = false;
errorMessage = "";
pHandler = nullptr;
#if LUABRIDGE_HAS_EXCEPTIONS
EXPECT_ANY_THROW(f.callWithHandler(pHandler, "badly"));
#else
EXPECT_FALSE(f.callWithHandler(pHandler, "badly"));
#endif
EXPECT_FALSE(calledHandler);
EXPECT_FALSE(errorMessage.find("we failed badly") != std::string::npos);
}

TEST_F(LuaRefTests, CallableWithNullCFunction)
{
runLua("function f(x) error('we failed ' .. x) end");
auto f = luabridge::getGlobal(L, "f");
EXPECT_TRUE(f.isCallable());

lua_CFunction pHandler = nullptr;
#if LUABRIDGE_HAS_EXCEPTIONS
EXPECT_ANY_THROW(f.callWithHandler(pHandler, "badly"));
#else
EXPECT_FALSE(f.callWithHandler(pHandler, "badly"));
#endif
}

TEST_F(LuaRefTests, Pop)
{
lua_pushstring(L, "hello");
Expand Down