mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

lua: change error behavior

Browse Source 
Return the error Lua-style, instead of raising it as Lua error. This is
better, because raising errors is reserved for more "fatal" conditions.
Pretending they're exceptions and trying to do exception-style error
handling will just lead to pain in this language.
This commit is contained in:
wm4 2014-02-11 00:10:25 +01:00
parent 7a53dd5f2f
commit 444f79d86f
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
player/lua.c
View File

@ -94,14 +94,17 @@ static void report_error(lua_State *L)
}
// Check client API error code:
// if err >= 0, return 0.
// if err < 0, raise the error as Lua error.
// if err >= 0, push "true" to the stack, and return 1
// if err < 0, push nil and then the error string to the stack, and return 2
static int check_error(lua_State *L, int err)
{
if (err >= 0)
return 0;
luaL_error(L, "mpv API error: %s", mpv_error_string(err));
abort();
if (err >= 0) {
lua_pushboolean(L, 1);
return 1;
}
lua_pushnil(L);
lua_pushstring(L, mpv_error_string(err));
return 2;
}
static int run_event_loop(lua_State *L)
@ -491,16 +494,11 @@ static int script_get_property(lua_State *L)
talloc_free(result);
return 1;
}
// out of convenience, property access errors are not hard errors
if (err != MPV_ERROR_PROPERTY_NOT_FOUND &&
err != MPV_ERROR_PROPERTY_ERROR &&
err != MPV_ERROR_PROPERTY_UNAVAILABLE)
check_error(L, err);
if (type == MPV_FORMAT_OSD_STRING) {
lua_pushstring(L, "");
return 1;
lua_pushstring(L, mpv_error_string(err));
}
return 0;
return check_error(L, err);
}
static int script_set_osd_ass(lua_State *L)