LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 04:06:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced the EXCEPT_GUARD macro for converting love exceptions into Lua errors with the new luax_catchexcept function, which takes lambda function arguments.

Browse Source
This commit is contained in:
Alex Szpakowski
2014-06-03 19:27:00 -03:00
parent 724bdbd296
commit dfa319e01a
45 changed files with 315 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/sdl/wrap_JoystickModule.cpp
+3 -3
View File
@@ -107,7 +107,7 @@ int w_setGamepadMapping(lua_State *L)
}
bool success = false;
EXCEPT_GUARD(success = instance->setGamepadMapping(guid, gpinput, jinput);)
luax_catchexcept(L, [&](){ success = instance->setGamepadMapping(guid, gpinput, jinput); });
luax_pushboolean(L, success);
return 1;
@@ -140,7 +140,7 @@ int w_getGamepadMapping(lua_State *L)
Joystick::JoystickInput jinput;
jinput.type = Joystick::INPUT_TYPE_MAX_ENUM;
EXCEPT_GUARD(jinput = instance->getGamepadMapping(guid, gpinput);)
luax_catchexcept(L, [&](){ jinput = instance->getGamepadMapping(guid, gpinput); });
if (jinput.type == Joystick::INPUT_TYPE_MAX_ENUM)
return 0;
@@ -196,7 +196,7 @@ extern "C" int luaopen_love_joystick(lua_State *L)
{
if (instance == nullptr)
{
EXCEPT_GUARD(instance = new JoystickModule();)
luax_catchexcept(L, [&](){ instance = new JoystickModule(); });
}
else
instance->retain();