From 0087f459bac1ce6290ed6bf8f77d7150bb87899a Mon Sep 17 00:00:00 2001 From: Shmuel Zeigerman Date: Tue, 5 Aug 2014 22:35:13 +0300 Subject: Minor refactoring. --- src/algo.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/algo.h b/src/algo.h index 7c9d443..14a25ea 100644 --- a/src/algo.h +++ b/src/algo.h @@ -135,20 +135,14 @@ static void check_subject (lua_State *L, int pos, TArgExec *argE) argE->text = lua_touserdata (L, -1); lua_pop (L, 1); #if LUA_VERSION_NUM == 501 - if (stype == LUA_TSTRING) - argE->textlen = lua_objlen (L, pos); - else { - if (!luaL_getmetafield (L, pos, "__len") || lua_type (L, -1) != LUA_TFUNCTION) - luaL_argerror (L, pos, "the subject has no valid __len metamethod"); - lua_pushvalue (L, pos); - lua_call (L, 1, 1); - type = lua_type (L, -1); - if (type != LUA_TNUMBER) - luaL_error (L, "subject's length is %s (expected number)", - lua_typename (L, type)); - argE->textlen = lua_tointeger (L, -1); - lua_pop (L, 1); - } + if (!luaL_callmeta (L, pos, "__len")) + luaL_argerror (L, pos, "the subject has no valid __len metamethod"); + type = lua_type (L, -1); + if (type != LUA_TNUMBER) + luaL_error (L, "subject's length is %s (expected number)", + lua_typename (L, type)); + argE->textlen = lua_tointeger (L, -1); + lua_pop (L, 1); #else argE->textlen = luaL_len (L, pos); #endif -- cgit v1.2.1