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/lobject.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/lobject.js') diff --git a/src/lobject.js b/src/lobject.js index 119e20e..5cbf2c3 100644 --- a/src/lobject.js +++ b/src/lobject.js @@ -7,7 +7,9 @@ const defs = require('./defs.js'); const ljstype = require('./ljstype.js'); const ldebug = require('./ldebug.js'); const ldo = require('./ldo.js'); +const lstate = require('./lstate.js'); const lstring = require('./lstring.js'); +const ltable = require('./ltable.js'); const luaconf = require('./luaconf.js'); const lvm = require('./lvm.js'); const llimit = require('./llimit.js'); @@ -514,7 +516,19 @@ const luaO_pushvfstring = function(L, fmt, argp) { ldo.luaD_inctop(L); L.stack[L.top-1] = luaO_tostring(L, new TValue(CT.LUA_TNUMFLT, argp[a++])); break; - // case char['p']: + case char['p']: + let v = argp[a++]; + if (v instanceof lstate.lua_State || + v instanceof ltable.Table || + v instanceof Udata || + v instanceof LClosure || + v instanceof CClosure) { + pushstr(L, defs.to_luastring("0x"+v.id.toString(16))); + } else { + /* user provided object. no id available */ + pushstr(L, defs.to_luastring("")); + } + break; case char['U']: pushstr(L, defs.to_luastring(String.fromCodePoint(argp[a++]))); break; -- cgit v1.2.3-54-g00ecf