commit 7f1a2ad69976cc6891c104d2b669771820b8959a
parent a1ab5ab396df521eff70f304e571c16b809037d1
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Thu, 21 Aug 2014 17:07:31 -0300
new functions 'lua_geti/lua_seti' (non raw)
Diffstat:
4 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/lapi.c b/lapi.c
@@ -1,5 +1,5 @@
/*
-** $Id: lapi.c,v 2.232 2014/07/30 14:00:14 roberto Exp roberto $
+** $Id: lapi.c,v 2.233 2014/08/01 17:33:08 roberto Exp roberto $
** Lua API
** See Copyright Notice in lua.h
*/
@@ -611,6 +611,18 @@ LUA_API int lua_getfield (lua_State *L, int idx, const char *k) {
}
+LUA_API int lua_geti (lua_State *L, int idx, lua_Integer n) {
+ StkId t;
+ lua_lock(L);
+ t = index2addr(L, idx);
+ setivalue(L->top, n);
+ api_incr_top(L);
+ luaV_gettable(L, t, L->top - 1, L->top - 1);
+ lua_unlock(L);
+ return ttnov(L->top - 1);
+}
+
+
LUA_API int lua_rawget (lua_State *L, int idx) {
StkId t;
lua_lock(L);
@@ -743,6 +755,18 @@ LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
}
+LUA_API void lua_seti (lua_State *L, int idx, lua_Integer n) {
+ StkId t;
+ lua_lock(L);
+ api_checknelems(L, 1);
+ t = index2addr(L, idx);
+ setivalue(L->top++, n);
+ luaV_settable(L, t, L->top - 1, L->top - 2);
+ L->top -= 2; /* pop value and key */
+ lua_unlock(L);
+}
+
+
LUA_API void lua_rawset (lua_State *L, int idx) {
StkId o;
Table *t;
diff --git a/lbaselib.c b/lbaselib.c
@@ -1,5 +1,5 @@
/*
-** $Id: lbaselib.c,v 1.294 2014/08/01 17:22:57 roberto Exp roberto $
+** $Id: lbaselib.c,v 1.295 2014/08/01 17:33:08 roberto Exp roberto $
** Basic library
** See Copyright Notice in lua.h
*/
@@ -266,8 +266,7 @@ static int ipairsaux (lua_State *L) {
}
else {
lua_pushinteger(L, i);
- lua_pushinteger(L, i); /* key for indexing table */
- lua_gettable(L, 1);
+ lua_geti(L, 1, i);
return 2;
}
}
diff --git a/ltablib.c b/ltablib.c
@@ -1,5 +1,5 @@
/*
-** $Id: ltablib.c,v 1.73 2014/07/29 16:01:00 roberto Exp roberto $
+** $Id: ltablib.c,v 1.74 2014/08/21 19:13:55 roberto Exp roberto $
** Library for Table Manipulation
** See Copyright Notice in lua.h
*/
@@ -28,25 +28,6 @@ typedef struct {
/*
-** equivalent to 'lua_rawgeti', but not raw
-*/
-static int geti (lua_State *L, int idx, lua_Integer n) {
- lua_pushinteger(L, n);
- return lua_gettable(L, idx); /* assume 'idx' is not negative */
-}
-
-
-/*
-** equivalent to 'lua_rawseti', but not raw
-*/
-static void seti (lua_State *L, int idx, lua_Integer n) {
- lua_pushinteger(L, n);
- lua_rotate(L, -2, 1); /* exchange key and value */
- lua_settable(L, idx); /* assume 'idx' is not negative */
-}
-
-
-/*
** Check that 'arg' has a table and set access functions in 'ta' to raw
** or non-raw according to the presence of corresponding metamethods.
*/
@@ -55,10 +36,10 @@ static void checktab (lua_State *L, int arg, TabA *ta) {
if (lua_getmetatable(L, arg)) {
lua_pushliteral(L, "__index"); /* 'index' metamethod */
if (lua_rawget(L, -2) != LUA_TNIL)
- ta->geti = geti;
+ ta->geti = lua_geti;
lua_pushliteral(L, "__newindex"); /* 'newindex' metamethod */
if (lua_rawget(L, -3) != LUA_TNIL)
- ta->seti = seti;
+ ta->seti = lua_seti;
lua_pop(L, 3); /* pop metatable plus both metamethods */
}
if (ta->geti == NULL || ta->seti == NULL) {
@@ -147,10 +128,10 @@ static int tmove (lua_State *L) {
lua_Integer n, i;
ta.geti = (!luaL_getmetafield(L, 1, "__index"))
? (luaL_checktype(L, 1, LUA_TTABLE), lua_rawgeti)
- : geti;
+ : lua_geti;
ta.seti = (!luaL_getmetafield(L, tt, "__newindex"))
? (luaL_checktype(L, tt, LUA_TTABLE), lua_rawseti)
- : seti;
+ : lua_seti;
n = e - f + 1; /* number of elements to move */
if (t > f) {
for (i = n - 1; i >= 0; i--) {
diff --git a/lua.h b/lua.h
@@ -1,5 +1,5 @@
/*
-** $Id: lua.h,v 1.312 2014/07/31 13:44:30 roberto Exp roberto $
+** $Id: lua.h,v 1.313 2014/08/01 17:33:08 roberto Exp roberto $
** Lua - A Scripting Language
** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
** See Copyright Notice at the end of this file
@@ -239,6 +239,7 @@ LUA_API int (lua_pushthread) (lua_State *L);
LUA_API int (lua_getglobal) (lua_State *L, const char *var);
LUA_API int (lua_gettable) (lua_State *L, int idx);
LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
+LUA_API int (lua_geti) (lua_State *L, int idx, lua_Integer n);
LUA_API int (lua_rawget) (lua_State *L, int idx);
LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
@@ -255,6 +256,7 @@ LUA_API int (lua_getuservalue) (lua_State *L, int idx);
LUA_API void (lua_setglobal) (lua_State *L, const char *var);
LUA_API void (lua_settable) (lua_State *L, int idx);
LUA_API void (lua_setfield) (lua_State *L, int idx, const char *k);
+LUA_API void (lua_seti) (lua_State *L, int idx, lua_Integer n);
LUA_API void (lua_rawset) (lua_State *L, int idx);
LUA_API void (lua_rawseti) (lua_State *L, int idx, lua_Integer n);
LUA_API void (lua_rawsetp) (lua_State *L, int idx, const void *p);
