d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

liblua: Clean up io/loader C module registration

Browse Source 
Utilize registration APIs Lua provides to make module definition a little
cleaner.

Discussed with:	imp
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Conrad Meyer 2018-02-17 22:17:21 +00:00
parent 314d034088
commit f276951a4d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=329473
2 changed files with 25 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
stand/liblua/lutils.c
View File

@ -210,59 +210,34 @@ lua_readfile(lua_State *L)
return 2;
}
void
lregister(lua_State *L, const char *tableName, const char *funcName, int (*funcPointer)(lua_State *))
{
lua_getglobal(L, tableName);
if (!lua_istable(L, -1)) {
lua_pop(L, 1);
lua_newtable(L);
lua_setglobal(L, tableName);
lua_getglobal(L, tableName);
}
#define REG_SIMPLE(n) { #n, lua_ ## n }
static const struct luaL_Reg loaderlib[] = {
REG_SIMPLE(delay),
REG_SIMPLE(getenv),
REG_SIMPLE(perform),
REG_SIMPLE(printc),
REG_SIMPLE(setenv),
REG_SIMPLE(time),
REG_SIMPLE(unsetenv),
{ NULL, NULL },
};
lua_pushcfunction(L, funcPointer);
lua_setfield(L, -2, funcName);
lua_pop(L, 1);
}
typedef struct utils_func
{
int (*func)(lua_State *);
const char *table;
const char *name;
} utils_func;
static utils_func reg_funcs[] = {
{lua_delay, "loader", "delay"},
{lua_getenv, "loader", "getenv"},
{lua_perform, "loader", "perform"},
{lua_printc, "loader", "printc"},
{lua_setenv, "loader", "setenv"},
{lua_time, "loader", "time"},
{lua_unsetenv, "loader", "unsetenv"},
{lua_closefile, "io", "close"},
{lua_getchar, "io", "getchar"},
{lua_gets, "io", "gets"},
{lua_ischar, "io", "ischar"},
{lua_openfile, "io", "open"},
{lua_readfile, "io", "read"},
{NULL, NULL, NULL},
};
static const struct luaL_Reg iolib[] = {
{ "close", lua_closefile },
REG_SIMPLE(getchar),
REG_SIMPLE(gets),
REG_SIMPLE(ischar),
{ "open", lua_openfile },
{ "read", lua_readfile },
{ NULL, NULL },
};
#undef REG_SIMPLE
void
register_utils(lua_State *L)
{
utils_func *f = reg_funcs;
while (f->func != NULL && f->name != NULL) {
if (f->table != NULL)
lregister(L, f->table, f->name, f->func);
else
lua_register(L, f->name, f->func);
++f;
}
luaL_newlib(L, loaderlib);
lua_setglobal(L, "loader");
luaL_newlib(L, iolib);
lua_setglobal(L, "io");
}

1
stand/liblua/lutils.h
View File

@ -28,5 +28,4 @@
#include <lua.h>
void lregister(lua_State *, const char *, const char *, int (*fptr)(lua_State *));
void register_utils(lua_State *);