Skip to content

libubox: add support for newer Lua versions #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neheb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libubox: add support for newer Lua versions #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions lua/uloop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#include <stdlib.h>
#include <unistd.h>

#define LUA_COMPAT_5_3 // for lua_strlen

#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
Expand Down Expand Up @@ -53,6 +55,24 @@ struct lua_uloop_signal {

static lua_State *state;

#if !defined LUA_VERSION_NUM || LUA_VERSION_NUM==501
/*
** Adapted from Lua 5.2.0
*/
static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
luaL_checkstack(L, nup+1, "too many upvalues");
for (; l->name != NULL; l++) { /* fill the table with given functions */
int i;
lua_pushstring(L, l->name);
for (i = 0; i < nup; i++) /* copy upvalues to the top */
lua_pushvalue(L, -(nup+1));
lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
lua_settable(L, -(nup + 3));
}
lua_pop(L, nup); /* remove upvalues */
}
#endif

static void *
ul_create_userdata(lua_State *L, size_t size, const luaL_Reg *reg, lua_CFunction gc)
{
Expand All @@ -67,7 +87,7 @@ ul_create_userdata(lua_State *L, size_t size, const luaL_Reg *reg, lua_CFunction
lua_pushvalue(L, -1);
lua_setmetatable(L, -3);
lua_pushvalue(L, -2);
luaI_openlib(L, NULL, reg, 1);
luaL_setfuncs(L, reg, 1);
lua_pushvalue(L, -2);

return ret;
Expand Down Expand Up @@ -597,7 +617,7 @@ static int ul_end(lua_State *L)
return 1;
}

static luaL_reg uloop_func[] = {
static luaL_Reg uloop_func[] = {
{"init", ul_init},
{"run", ul_run},
{"timer", ul_timer},
Expand All @@ -623,7 +643,7 @@ int luaopen_uloop(lua_State *L)
lua_createtable(L, 1, 0);
lua_setglobal(L, "__uloop_fds");

luaL_openlib(L, "uloop", uloop_func, 0);
luaL_setfuncs(L, uloop_func, 0);
lua_pushstring(L, "_VERSION");
lua_pushstring(L, "1.0");
lua_rawset(L, -3);
Expand Down