From 4eea48935f2e0ea1267d314f2900af2a1a4b8b02 Mon Sep 17 00:00:00 2001 From: Benoit Giannangeli Date: Fri, 17 Feb 2017 07:56:12 +0100 Subject: lua_pop --- README.md | 2 +- src/lapi.js | 3 ++- tests/C/Makefile | 3 ++- tests/C/lua_pop.c | 24 ++++++++++++++++++++++++ tests/lapi.js | 30 ++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 tests/C/lua_pop.c diff --git a/README.md b/README.md index 5d52e2e..fb727b4 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ - [x] lua_toboolean - [x] lua_pushjsclosure (lua_pushcclosure) - [x] lua_pushjsfunction (lua_pushcfunction) + - [x] lua_pop - [ ] lua_absindex - [ ] lua_arith - [ ] lua_call @@ -92,7 +93,6 @@ - [ ] lua_numbertointeger - [ ] lua_pcall - [ ] lua_pcallk - - [ ] lua_pop - [ ] lua_pushfstring - [ ] lua_pushglobaltable - [ ] lua_pushlightuserdata diff --git a/src/lapi.js b/src/lapi.js index 2bef5a5..0e3c3bd 100644 --- a/src/lapi.js +++ b/src/lapi.js @@ -333,4 +333,5 @@ module.exports.lua_toboolean = lua_toboolean; module.exports.lua_tolstring = lua_tolstring; module.exports.lua_tostring = lua_tostring; module.exports.lua_callk = lua_callk; -module.exports.lua_call = lua_call; \ No newline at end of file +module.exports.lua_call = lua_call; +module.exports.lua_pop = lua_pop; \ No newline at end of file diff --git a/tests/C/Makefile b/tests/C/Makefile index 6d21b19..52475ec 100644 --- a/tests/C/Makefile +++ b/tests/C/Makefile @@ -12,4 +12,5 @@ all: $(CC) $(CFLAGS) $(LIBS) lua_pushvalue.c -o lua_pushvalue.out $(CC) $(CFLAGS) $(LIBS) lua_pushcclosure-light.c -o lua_pushcclosure-light.out $(CC) $(CFLAGS) $(LIBS) lua_call.c -o lua_call.out - $(CC) $(CFLAGS) $(LIBS) lua_call-jsclosure.c -o lua_call-jsclosure.out \ No newline at end of file + $(CC) $(CFLAGS) $(LIBS) lua_call-jsclosure.c -o lua_call-jsclosure.out + $(CC) $(CFLAGS) $(LIBS) lua_pop.c -o lua_pop.out \ No newline at end of file diff --git a/tests/C/lua_pop.c b/tests/C/lua_pop.c new file mode 100644 index 0000000..06b8ef1 --- /dev/null +++ b/tests/C/lua_pop.c @@ -0,0 +1,24 @@ +#include +#include +#include +#include +#include + +int main(void) { + + lua_State *L = luaL_newstate(); + + luaL_openlibs(L); + + lua_pushstring(L, "hello"); + lua_pushstring(L, "world"); + + lua_pop(L, 1); + + printf("L->top(%d): %s\n", lua_gettop(L), lua_tostring(L, -1)); + + lua_close(L); + + return 0; + +} \ No newline at end of file diff --git a/tests/lapi.js b/tests/lapi.js index de7a401..fa1fb59 100644 --- a/tests/lapi.js +++ b/tests/lapi.js @@ -348,4 +348,34 @@ test('lua_call (calling a JS closure)', function (t) { "upvalue hello !", "top is correct" ); +}); + + +test('lua_pop', function (t) { + let L; + + t.plan(3); + + t.doesNotThrow(function () { + + L = lauxlib.luaL_newstate(); + + lapi.lua_pushstring(L, "hello"); + lapi.lua_pushstring(L, "world"); + + lapi.lua_pop(L, 1); + + }, "JS Lua program ran without error"); + + t.strictEqual( + lapi.lua_gettop(L), + 1, + "top is correct" + ); + + t.strictEqual( + lapi.lua_tostring(L, -1), + "hello", + "Correct element(s) on the stack" + ); }); \ No newline at end of file -- cgit v1.2.3-70-g09d2