summaryrefslogtreecommitdiff
path: root/src/lbaselib.js
diff options
context:
space:
mode:
authorBenoit Giannangeli <benoit.giannangeli@boursorama.fr>2017-02-20 14:57:49 +0100
committerBenoit Giannangeli <giann008@gmail.com>2017-02-20 21:37:27 +0100
commit7d58c3b7314e4a63591fa375546cfc76a042e644 (patch)
treec51d390ee3830f924b2fb1e289b9461c8310d625 /src/lbaselib.js
parent5860ec2bde3b220eff01b3bd1462e60905ef2fe9 (diff)
downloadfengari-7d58c3b7314e4a63591fa375546cfc76a042e644.tar.gz
fengari-7d58c3b7314e4a63591fa375546cfc76a042e644.tar.bz2
fengari-7d58c3b7314e4a63591fa375546cfc76a042e644.zip
ldebug, lua_error, error
Diffstat (limited to 'src/lbaselib.js')
-rw-r--r--src/lbaselib.js33
1 files changed, 23 insertions, 10 deletions
diff --git a/src/lbaselib.js b/src/lbaselib.js
index db6e61d..16c63bf 100644
--- a/src/lbaselib.js
+++ b/src/lbaselib.js
@@ -17,7 +17,7 @@ const luaB_print = function(L) {
lapi.lua_pushvalue(L, -1); /* function to be called */
lapi.lua_pushvalue(L, i); /* value to print */
lapi.lua_call(L, 1, 1);
- let s = lapi.lua_tolstring(L, -1, null);
+ let s = lapi.lua_tolstring(L, -1);
if (s === null)
throw new Error("'tostring' must return a string to 'print");
if (i > 1) s = `\t${s}`;
@@ -31,7 +31,7 @@ const luaB_print = function(L) {
const luaB_tostring = function(L) {
lauxlib.luaL_checkany(L, 1);
- lauxlib.luaL_tolstring(L, 1, null);
+ lauxlib.luaL_tolstring(L, 1);
return 1;
};
@@ -88,15 +88,28 @@ const luaB_type = function(L) {
return 1;
};
+const luaB_error = function(L) {
+ let level = lauxlib.luaL_optinteger(L, 2, 1);
+ lapi.lua_settop(L, 1);
+ if (lapi.lua_type(L, 1) === CT.LUA_TSTRING && level > 0) {
+ lauxlib.luaL_where(L, level); /* add extra information */
+ lapi.lua_pushvalue(L, 1);
+ lapi.lua_concat(L, 2);
+ }
+ return lapi.lua_error(L);
+};
+
const base_funcs = {
- "print": luaB_print,
- "tostring": luaB_tostring,
- "getmetatable": luaB_getmetatable,
- "setmetatable": luaB_setmetatable,
- "rawequal": luaB_rawequal,
- "rawset": luaB_rawset,
- "rawget": luaB_rawget,
- "type": luaB_type
+ "collectgarbage": function () {},
+ "print": luaB_print,
+ "tostring": luaB_tostring,
+ "getmetatable": luaB_getmetatable,
+ "setmetatable": luaB_setmetatable,
+ "rawequal": luaB_rawequal,
+ "rawset": luaB_rawset,
+ "rawget": luaB_rawget,
+ "type": luaB_type,
+ "error": luaB_error
};
const luaopen_base = function(L) {