From 1b48f9b50a2e4edefdffd5d33efab929296a395c Mon Sep 17 00:00:00 2001 From: daurnimator Date: Wed, 24 May 2017 14:46:19 +1000 Subject: Implement %p specifier in luaO_pushvfstring Move hacks out of luaL_tolstring --- src/lauxlib.js | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src/lauxlib.js') diff --git a/src/lauxlib.js b/src/lauxlib.js index 3959817..b14379c 100644 --- a/src/lauxlib.js +++ b/src/lauxlib.js @@ -490,29 +490,7 @@ const luaL_tolstring = function(L, idx) { default: let tt = luaL_getmetafield(L, idx, lua.to_luastring("__name", true)); let kind = tt === lua.LUA_TSTRING ? lua.lua_tostring(L, -1) : luaL_typename(L, idx); - let p = lua.lua_topointer(L, idx); - let id; - switch (t) { - case lua.LUA_TLIGHTUSERDATA: - /* user provided object. no id available */ - id = ""; - break; - case lua.LUA_TFUNCTION: - /* light C functions are returned from lua_topointer directly */ - if (typeof p == "function") { - id = ""; - break; - } - /* fall through */ - case lua.LUA_TTABLE: - case lua.LUA_TTHREAD: - case lua.LUA_TUSERDATA: - id = `0x${p.id.toString(16)}`; - break; - default: - throw Error("unhandled type: "+t); - } - lua.lua_pushstring(L, lua.to_luastring(`${lua.to_jsstring(kind)}: ${id}`)); + lua.lua_pushfstring(L, lua.to_luastring("%s: %p"), kind, lua.lua_topointer(L, idx)); if (tt !== lua.LUA_TNIL) lua.lua_remove(L, -2); break; -- cgit v1.2.3-54-g00ecf