MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lua API: Use CallWithCatchWrapper for a few more functions 

This produces more readable backtraces when native functions that aren't wrapped
using wrap_function() throw exceptions.
develop
lethosor 2017-07-01 17:39:39 -04:00
parent 6100074ba6
commit d628212254
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/LuaApi.cpp
Unescape Escape View File

@ -1372,6 +1372,7 @@ static void OpenModule(lua_State *state, const char *mname,
#define WRAPM(module, function) { #function, df::wrap_function(module::function,true) } #define WRAPM(module, function) { #function, df::wrap_function(module::function,true) }
#define WRAP(function) { #function, df::wrap_function(function,true) } #define WRAP(function) { #function, df::wrap_function(function,true) }
#define WRAPN(name, function) { #name, df::wrap_function(function,true) } #define WRAPN(name, function) { #name, df::wrap_function(function,true) }
#define CWRAP(name, function) { #name, &Lua::CallWithCatchWrapper<function> }
/***** DFHack module *****/ /***** DFHack module *****/
@ -2082,10 +2083,10 @@ static const luaL_Reg dfhack_buildings_funcs[] = {
{ "findAtTile", buildings_findAtTile }, { "findAtTile", buildings_findAtTile },
{ "findCivzonesAt", buildings_findCivzonesAt }, { "findCivzonesAt", buildings_findCivzonesAt },
{ "getCorrectSize", buildings_getCorrectSize }, { "getCorrectSize", buildings_getCorrectSize },
{ "setSize", &Lua::CallWithCatchWrapper<buildings_setSize> }, CWRAP(setSize, buildings_setSize),
{ "getStockpileContents", buildings_getStockpileContents }, CWRAP(getStockpileContents, buildings_getStockpileContents),
{ "findPenPitAt", buildings_findPenPitAt }, { "findPenPitAt", buildings_findPenPitAt },
{ "getCageOccupants", &Lua::CallWithCatchWrapper<buildings_getCageOccupants> }, CWRAP(getCageOccupants, buildings_getCageOccupants),
{ NULL, NULL } { NULL, NULL }
}; };
@ -2316,9 +2317,9 @@ static const luaL_Reg dfhack_screen_funcs[] = {
{ "paintString", screen_paintString }, { "paintString", screen_paintString },
{ "fillRect", screen_fillRect }, { "fillRect", screen_fillRect },
{ "findGraphicsTile", screen_findGraphicsTile }, { "findGraphicsTile", screen_findGraphicsTile },
{ "show", &Lua::CallWithCatchWrapper<screen_show> }, CWRAP(show, screen_show),
{ "dismiss", screen_dismiss }, CWRAP(dismiss, screen_dismiss),
{ "isDismissed", screen_isDismissed }, CWRAP(isDismissed, screen_isDismissed),
{ "_doSimulateInput", screen_doSimulateInput }, { "_doSimulateInput", screen_doSimulateInput },
{ "keyToChar", screen_keyToChar }, { "keyToChar", screen_keyToChar },
{ "charToKey", screen_charToKey }, { "charToKey", screen_charToKey },