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

better error checking for 'table.insert' and 'table.remove'

This commit is contained in:
Roberto Ierusalimschy 2013-02-06 16:29:03 -02:00
parent 1ce57628b2
commit f4e762f688
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ltablib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ltablib.c,v 1.62 2011/09/30 12:45:45 roberto Exp roberto $ ** $Id: ltablib.c,v 1.63 2011/11/28 17:26:30 roberto Exp roberto $
** Library for Table Manipulation ** Library for Table Manipulation
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -16,8 +16,8 @@
#include "lualib.h" #include "lualib.h"
#define aux_getn(L,n) \ #define aux_getn(L,n) (luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n))
(luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n))
#if defined(LUA_COMPAT_MAXN) #if defined(LUA_COMPAT_MAXN)
@ -49,7 +49,7 @@ static int tinsert (lua_State *L) {
case 3: { case 3: {
int i; int i;
pos = luaL_checkint(L, 2); /* 2nd argument is the position */ pos = luaL_checkint(L, 2); /* 2nd argument is the position */
if (pos > e) e = pos; /* `grow' array if necessary */ luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
for (i = e; i > pos; i--) { /* move up elements */ for (i = e; i > pos; i--) { /* move up elements */
lua_rawgeti(L, 1, i-1); lua_rawgeti(L, 1, i-1);
lua_rawseti(L, 1, i); /* t[i] = t[i-1] */ lua_rawseti(L, 1, i); /* t[i] = t[i-1] */
@ -66,17 +66,19 @@ static int tinsert (lua_State *L) {
static int tremove (lua_State *L) { static int tremove (lua_State *L) {
int e = aux_getn(L, 1); int size = aux_getn(L, 1);
int pos = luaL_optint(L, 2, e); int pos = luaL_optint(L, 2, size);
if (!(1 <= pos && pos <= e)) /* position is outside bounds? */ if (pos != size) /* validate 'pos' if given */
return 0; /* nothing to remove */ luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
else if (size == 0) /* empty table? */
return 0; /* return nothing (nil) */
lua_rawgeti(L, 1, pos); /* result = t[pos] */ lua_rawgeti(L, 1, pos); /* result = t[pos] */
for ( ;pos<e; pos++) { for ( ; pos < size; pos++) {
lua_rawgeti(L, 1, pos+1); lua_rawgeti(L, 1, pos+1);
lua_rawseti(L, 1, pos); /* t[pos] = t[pos+1] */ lua_rawseti(L, 1, pos); /* t[pos] = t[pos+1] */
} }
lua_pushnil(L); lua_pushnil(L);
lua_rawseti(L, 1, e); /* t[e] = nil */ lua_rawseti(L, 1, pos); /* t[pos] = nil */
return 1; return 1;
} }