commit 86312e1a7d128be944a29bea7421eff58efb83be
parent df1dc3f1f54a75174cea7298d5c40bc7b99e60ea
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Mon, 7 Dec 2009 13:49:23 -0200
lua_objlen calls __len metamethod on tables (if present)
Diffstat:
M | lapi.c | | | 19 | +++++++++++++------ |
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/lapi.c b/lapi.c
@@ -1,5 +1,5 @@
/*
-** $Id: lapi.c,v 2.100 2009/11/09 19:10:48 roberto Exp roberto $
+** $Id: lapi.c,v 2.101 2009/11/27 15:37:59 roberto Exp roberto $
** Lua API
** See Copyright Notice in lua.h
*/
@@ -365,11 +365,18 @@ LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
LUA_API size_t lua_objlen (lua_State *L, int idx) {
StkId o = index2addr(L, idx);
- switch (ttype(o)) {
- case LUA_TSTRING: return tsvalue(o)->len;
- case LUA_TUSERDATA: return uvalue(o)->len;
- case LUA_TTABLE: return luaH_getn(hvalue(o));
- default: return 0;
+ if (ttisuserdata(o)) return uvalue(o)->len;
+ else {
+ size_t res;
+ TValue temp;
+ lua_lock(L);
+ res = luaV_len(L, o, &temp);
+ if (res == cast(size_t, -1)) {
+ const TValue *t = &temp;
+ res = tonumber(t, &temp) ? nvalue(t) : 0;
+ }
+ lua_unlock(L);
+ return res;
}
}