rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

with 'fast tracks', there is no need to do raw accesses in 'ipairs'

This commit is contained in:
Roberto Ierusalimschy 2015-10-29 13:21:04 -02:00
parent 789e423b32
commit c874abac98
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lbaselib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lbaselib.c,v 1.310 2015/03/28 19:14:47 roberto Exp roberto $ ** $Id: lbaselib.c,v 1.311 2015/06/26 19:25:45 roberto Exp roberto $
** Basic library ** Basic library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -86,8 +86,8 @@ static int luaB_tonumber (lua_State *L) {
const char *s; const char *s;
lua_Integer n = 0; /* to avoid warnings */ lua_Integer n = 0; /* to avoid warnings */
lua_Integer base = luaL_checkinteger(L, 2); lua_Integer base = luaL_checkinteger(L, 2);
luaL_checktype(L, 1, LUA_TSTRING); /* before 'luaL_checklstring'! */ luaL_checktype(L, 1, LUA_TSTRING); /* no numbers as strings */
s = luaL_checklstring(L, 1, &l); s = lua_tolstring(L, 1, &l);
luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range"); luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
if (b_str2int(s, (int)base, &n) == s + l) { if (b_str2int(s, (int)base, &n) == s + l) {
lua_pushinteger(L, n); lua_pushinteger(L, n);
@ -241,18 +241,7 @@ static int luaB_pairs (lua_State *L) {
/* /*
** Traversal function for 'ipairs' for raw tables ** Traversal function for 'ipairs'
*/
static int ipairsaux_raw (lua_State *L) {
lua_Integer i = luaL_checkinteger(L, 2) + 1;
luaL_checktype(L, 1, LUA_TTABLE);
lua_pushinteger(L, i);
return (lua_rawgeti(L, 1, i) == LUA_TNIL) ? 1 : 2;
}
/*
** Traversal function for 'ipairs' for tables with metamethods
*/ */
static int ipairsaux (lua_State *L) { static int ipairsaux (lua_State *L) {
lua_Integer i = luaL_checkinteger(L, 2) + 1; lua_Integer i = luaL_checkinteger(L, 2) + 1;
@ -267,13 +256,11 @@ static int ipairsaux (lua_State *L) {
** that can affect the traversal. ** that can affect the traversal.
*/ */
static int luaB_ipairs (lua_State *L) { static int luaB_ipairs (lua_State *L) {
lua_CFunction iter = (luaL_getmetafield(L, 1, "__index") != LUA_TNIL)
? ipairsaux : ipairsaux_raw;
#if defined(LUA_COMPAT_IPAIRS) #if defined(LUA_COMPAT_IPAIRS)
return pairsmeta(L, "__ipairs", 1, iter); return pairsmeta(L, "__ipairs", 1, ipairsaux);
#else #else
luaL_checkany(L, 1); luaL_checkany(L, 1);
lua_pushcfunction(L, iter); /* iteration function */ lua_pushcfunction(L, ipairsaux); /* iteration function */
lua_pushvalue(L, 1); /* state */ lua_pushvalue(L, 1); /* state */
lua_pushinteger(L, 0); /* initial value */ lua_pushinteger(L, 0); /* initial value */
return 3; return 3;