mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Clean up/improve some scriptapi error handling code
This commit is contained in:
parent
7423c4c11e
commit
766e885a1b
11 changed files with 120 additions and 94 deletions
|
@ -101,42 +101,6 @@ void script_error(lua_State *L, int pcall_result, const char *mod, const char *f
|
|||
throw LuaError(err_msg);
|
||||
}
|
||||
|
||||
// Push the list of callbacks (a lua table).
|
||||
// Then push nargs arguments.
|
||||
// Then call this function, which
|
||||
// - runs the callbacks
|
||||
// - replaces the table and arguments with the return value,
|
||||
// computed depending on mode
|
||||
void script_run_callbacks_f(lua_State *L, int nargs,
|
||||
RunCallbacksMode mode, const char *fxn)
|
||||
{
|
||||
FATAL_ERROR_IF(lua_gettop(L) < nargs + 1, "Not enough arguments");
|
||||
|
||||
// Insert error handler
|
||||
PUSH_ERROR_HANDLER(L);
|
||||
int error_handler = lua_gettop(L) - nargs - 1;
|
||||
lua_insert(L, error_handler);
|
||||
|
||||
// Insert run_callbacks between error handler and table
|
||||
lua_getglobal(L, "core");
|
||||
lua_getfield(L, -1, "run_callbacks");
|
||||
lua_remove(L, -2);
|
||||
lua_insert(L, error_handler + 1);
|
||||
|
||||
// Insert mode after table
|
||||
lua_pushnumber(L, (int) mode);
|
||||
lua_insert(L, error_handler + 3);
|
||||
|
||||
// Stack now looks like this:
|
||||
// ... <error handler> <run_callbacks> <table> <mode> <arg#1> <arg#2> ... <arg#n>
|
||||
|
||||
int result = lua_pcall(L, nargs + 2, 1, error_handler);
|
||||
if (result != 0)
|
||||
script_error(L, result, NULL, fxn);
|
||||
|
||||
lua_remove(L, error_handler);
|
||||
}
|
||||
|
||||
static void script_log_add_source(lua_State *L, std::string &message, int stack_depth)
|
||||
{
|
||||
lua_Debug ar;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue