mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2025-04-17 10:22:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

'table.copy' -> 'table.move' + optional parameter moved to the end +

Browse Source 
several functions operate on "virtual" tables too
This commit is contained in:
Roberto Ierusalimschy 2014-08-21 16:13:55 -03:00
parent 01549fb1ed
commit a1ab5ab396
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ltablib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ltablib.c,v 1.72 2014/07/25 18:46:00 roberto Exp roberto $ ** $Id: ltablib.c,v 1.73 2014/07/29 16:01:00 roberto Exp roberto $
** Library for Table Manipulation ** Library for Table Manipulation
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -51,18 +51,21 @@ static void seti (lua_State *L, int idx, lua_Integer n) {
** or non-raw according to the presence of corresponding metamethods. ** or non-raw according to the presence of corresponding metamethods.
*/ */
static void checktab (lua_State *L, int arg, TabA *ta) { static void checktab (lua_State *L, int arg, TabA *ta) {
luaL_checktype(L, arg, LUA_TTABLE); ta->geti = NULL; ta->seti = NULL;
if (!lua_getmetatable(L, arg)) { /* fast track */ if (lua_getmetatable(L, arg)) {
ta->geti = lua_rawgeti; /* with no metatable, all is raw */
ta->seti = lua_rawseti;
}
else {
lua_pushliteral(L, "__index"); /* 'index' metamethod */ lua_pushliteral(L, "__index"); /* 'index' metamethod */
ta->geti = (lua_rawget(L, -2) == LUA_TNIL) ? lua_rawgeti : geti; if (lua_rawget(L, -2) != LUA_TNIL)
ta->geti = geti;
lua_pushliteral(L, "__newindex"); /* 'newindex' metamethod */ lua_pushliteral(L, "__newindex"); /* 'newindex' metamethod */
ta->seti = (lua_rawget(L, -3) == LUA_TNIL) ? lua_rawseti : seti; if (lua_rawget(L, -3) != LUA_TNIL)
ta->seti = seti;
lua_pop(L, 3); /* pop metatable plus both metamethods */ lua_pop(L, 3); /* pop metatable plus both metamethods */
} }
if (ta->geti == NULL || ta->seti == NULL) {
luaL_checktype(L, arg, LUA_TTABLE); /* must be table for raw methods */
if (ta->geti == NULL) ta->geti = lua_rawgeti;
if (ta->seti == NULL) ta->seti = lua_rawseti;
}
} }
@ -132,24 +135,22 @@ static int tremove (lua_State *L) {
} }
static int tcopy (lua_State *L) { static int tmove (lua_State *L) {
TabA ta; TabA ta;
lua_Integer f = luaL_checkinteger(L, 2); lua_Integer f = luaL_checkinteger(L, 2);
lua_Integer e = luaL_checkinteger(L, 3); lua_Integer e = luaL_checkinteger(L, 3);
lua_Integer t; lua_Integer t = luaL_checkinteger(L, 4);
int tt = 4; /* destination table */ int tt = !lua_isnoneornil(L, 5) ? 5 : 1; /* destination table */
/* the following restriction avoids several problems with overflows */ /* the following restriction avoids several problems with overflows */
luaL_argcheck(L, f > 0, 2, "initial position must be positive"); luaL_argcheck(L, f > 0, 2, "initial position must be positive");
if (lua_istable(L, tt))
t = luaL_checkinteger(L, 5);
else {
tt = 1; /* destination table is equal to source */
t = luaL_checkinteger(L, 4);
}
if (e >= f) { /* otherwise, nothing to move */ if (e >= f) { /* otherwise, nothing to move */
lua_Integer n, i; lua_Integer n, i;
ta.geti = (!luaL_getmetafield(L, 1, "__index")) ? lua_rawgeti : geti; ta.geti = (!luaL_getmetafield(L, 1, "__index"))
ta.seti = (!luaL_getmetafield(L, tt, "__newindex")) ? lua_rawseti : seti; ? (luaL_checktype(L, 1, LUA_TTABLE), lua_rawgeti)
: geti;
ta.seti = (!luaL_getmetafield(L, tt, "__newindex"))
? (luaL_checktype(L, tt, LUA_TTABLE), lua_rawseti)
: seti;
n = e - f + 1; /* number of elements to move */ n = e - f + 1; /* number of elements to move */
if (t > f) { if (t > f) {
for (i = n - 1; i >= 0; i--) { for (i = n - 1; i >= 0; i--) {
@ -355,7 +356,7 @@ static const luaL_Reg tab_funcs[] = {
{"pack", pack}, {"pack", pack},
{"unpack", unpack}, {"unpack", unpack},
{"remove", tremove}, {"remove", tremove},
{"copy", tcopy}, {"move", tmove},
{"sort", sort}, {"sort", sort},
{NULL, NULL} {NULL, NULL}
}; };