From 48c602a07369eedd37fb074547fc642c87df2680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Thu, 17 Sep 2020 14:52:50 +0200 Subject: vis-lua: use utility function to translate mark names --- vis-lua.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'vis-lua.c') diff --git a/vis-lua.c b/vis-lua.c index 0e5a7ec..4d62af3 100644 --- a/vis-lua.c +++ b/vis-lua.c @@ -683,22 +683,20 @@ static int files_iter(lua_State *L) { */ static int mark_names_iter(lua_State *L); static int mark_names(lua_State *L) { + Vis *vis = obj_ref_check(L, 1, "vis"); + lua_pushlightuserdata(L, vis); enum VisMark *handle = lua_newuserdata(L, sizeof *handle); *handle = 0; - lua_pushcclosure(L, mark_names_iter, 1); + lua_pushcclosure(L, mark_names_iter, 2); return 1; } static int mark_names_iter(lua_State *L) { - char mark = '\0'; - enum VisMark *handle = lua_touserdata(L, lua_upvalueindex(1)); - if (*handle < LENGTH(vis_marks)) - mark = vis_marks[*handle].name; - else if (VIS_MARK_a <= *handle && *handle <= VIS_MARK_z) - mark = 'a' + *handle - VIS_MARK_a; + Vis *vis = lua_touserdata(L, lua_upvalueindex(1)); + enum VisMark *handle = lua_touserdata(L, lua_upvalueindex(2)); + char mark = vis_mark_to(vis, *handle); if (mark) { - char name[2] = { mark, '\0' }; - lua_pushstring(L, name); + lua_pushlstring(L, &mark, 1); (*handle)++; return 1; } -- cgit v1.2.3