mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2025-04-25 23:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

'luaL_tolstring' uses metatable's "__name" when available

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2016-12-04 18:09:45 -02:00
parent 7b1fba69b7
commit beec5af201
1 changed files with 14 additions and 5 deletions

19
lauxlib.c

@ -1,5 +1,5 @@
/* /*
** $Id: lauxlib.c,v 1.285 2015/12/14 11:59:27 roberto Exp roberto $ ** $Id: lauxlib.c,v 1.286 2016/01/08 15:33:09 roberto Exp roberto $
** Auxiliary functions for building Lua libraries ** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -809,7 +809,11 @@ LUALIB_API lua_Integer luaL_len (lua_State *L, int idx) {
LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) { LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
if (!luaL_callmeta(L, idx, "__tostring")) { /* no metafield? */ if (luaL_callmeta(L, idx, "__tostring")) { /* metafield? */
if (!lua_isstring(L, -1))
luaL_error(L, "'__tostring' must return a string");
}
else {
switch (lua_type(L, idx)) { switch (lua_type(L, idx)) {
case LUA_TNUMBER: { case LUA_TNUMBER: {
if (lua_isinteger(L, idx)) if (lua_isinteger(L, idx))
@ -827,10 +831,15 @@ LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
case LUA_TNIL: case LUA_TNIL:
lua_pushliteral(L, "nil"); lua_pushliteral(L, "nil");
break; break;
default: default: {
lua_pushfstring(L, "%s: %p", luaL_typename(L, idx), int tt = luaL_getmetafield(L, idx, "__name"); /* try name */
lua_topointer(L, idx)); const char *kind = (tt == LUA_TSTRING) ? lua_tostring(L, -1) :
luaL_typename(L, idx);
lua_pushfstring(L, "%s: %p", kind, lua_topointer(L, idx));
if (tt != LUA_TNIL)
lua_remove(L, -2); /* remove '__name' */
break; break;
}
} }
} }
return lua_tolstring(L, -1, len); return lua_tolstring(L, -1, len);