From d2c29700b140c6656bc9cc4c8870f9f340b98945 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Wed, 12 Apr 2017 19:23:08 +1000 Subject: Print returned values from cli --- tests/manual-tests/lua-cli.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tests/manual-tests') diff --git a/tests/manual-tests/lua-cli.js b/tests/manual-tests/lua-cli.js index 6938a8b..de64359 100755 --- a/tests/manual-tests/lua-cli.js +++ b/tests/manual-tests/lua-cli.js @@ -42,10 +42,20 @@ for (;;) { lauxlib.lua_writestringerror(`${lapi.lua_tojsstring(L, -1)}\n`); continue; } - if (lapi.lua_pcall(L, 0, 0, 0) !== lua.thread_status.LUA_OK) { + if (lapi.lua_pcall(L, 0, lua.LUA_MULTRET, 0) !== lua.thread_status.LUA_OK) { lauxlib.lua_writestringerror(`${lapi.lua_tojsstring(L, -1)}\n`); lapi.lua_settop(L, 0); continue; } + let n = lapi.lua_gettop(L); + if (n > 0) { /* any result to be printed? */ + lapi.lua_getglobal(L, lua.to_luastring("print")); + lapi.lua_insert(L, 1); + if (lapi.lua_pcall(L, n, 0, 0) != lua.thread_status.LUA_OK) { + lauxlib.lua_writestringerror(`error calling 'print' (${lapi.lua_tojsstring(L, -1)})\n`); + lapi.lua_settop(L, 0); + continue; + } + } lapi.lua_settop(L, 0); /* remove eventual returns */ } -- cgit v1.2.3-70-g09d2