From ae4e53e2e7234a167058199085921a9182e8522a Mon Sep 17 00:00:00 2001 From: Benoit Giannangeli Date: Fri, 24 Feb 2017 08:52:06 +0100 Subject: table.insert --- src/lauxlib.js | 4 ++-- src/ltablib.js | 30 ++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/lauxlib.js b/src/lauxlib.js index ba720af..3774309 100644 --- a/src/lauxlib.js +++ b/src/lauxlib.js @@ -53,7 +53,7 @@ const findfield = function(L, objidx, level) { */ const pushglobalfuncname = function(L, ar) { let top = lapi.lua_gettop(L); - lapi.lua_getinfo(L, 'f', ar); /* push function */ + ldebug.lua_getinfo(L, 'f', ar); /* push function */ lapi.lua_getfield(L, lua.LUA_REGISTRYINDEX, lua.LUA_LOADED_TABLE); if (findfield(L, top + 1, 2)) { let name = lapi.lua_tostring(L, -1); @@ -76,7 +76,7 @@ const panic = function(L) { const luaL_argerror = function(L, arg, extramsg) { let ar = new lua.lua_Debug(); - if (!lapi.lua_getstack(L, 0, ar)) /* no stack frame? */ + if (!ldebug.lua_getstack(L, 0, ar)) /* no stack frame? */ return luaL_error(L, 'bad argument #%d (%s)', arg, extramsg); ldebug.lua_getinfo(L, 'n', ar); diff --git a/src/ltablib.js b/src/ltablib.js index 86b57d7..8ea6f08 100644 --- a/src/ltablib.js +++ b/src/ltablib.js @@ -47,7 +47,7 @@ const checktab = function(L, arg, what) { const aux_getn = function(L, n, w) { checktab(L, n, w | TAB_L); - lauxlib.luaL_len(L, n); + return lauxlib.luaL_len(L, n); }; const addfield = function(L, b, i) { @@ -58,6 +58,31 @@ const addfield = function(L, b, i) { lauxlib.luaL_addvalue(b); }; +const tinsert = function(L) { + let e = aux_getn(L, 1, TAB_RW) + 1; /* first empty element */ + let pos; + switch (lapi.lua_gettop(L)) { + case 2: + pos = e; + break; + case 3: { + pos = lauxlib.luaL_checkinteger(L, 2); /* 2nd argument is the position */ + lauxlib.luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds"); + for (let i = e; i > pos; i--) { /* move up elements */ + lapi.lua_geti(L, 1, i - 1); + lapi.lua_seti(L, 1, i); /* t[i] = t[i - 1] */ + } + break; + } + default: { + return lauxlib.luaL_error(L, "wrong number of arguments to 'insert'"); + } + } + + lapi.lua_seti(L, 1, pos); /* t[pos] = v */ + return 0; +}; + const tconcat = function(L) { let last = aux_getn(L, 1, TAB_R); let sep = lauxlib.luaL_optlstring(L, 2, ""); @@ -106,8 +131,9 @@ const unpack = function(L) { const tab_funcs = { "concat": tconcat, + "insert": tinsert, "pack": pack, - "unpack": unpack, + "unpack": unpack }; const luaopen_table = function(L) { -- cgit v1.2.3-54-g00ecf