Miroirs/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2024-09-28 15:20:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

new functions lua_rawsetp/lua_rawgetp

Browse source
This commit is contained in:
Roberto Ierusalimschy 2011-10-24 12:54:05 -02:00
parent 6819c2a98a
commit af00a0772c
3 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lapi.c
View file

@ -1,5 +1,5 @@
/*
** $Id: lapi.c,v 2.152 2011/09/26 20:17:27 roberto Exp roberto $
** $Id: lapi.c,v 2.153 2011/09/30 12:43:17 roberto Exp roberto $
** Lua API
** See Copyright Notice in lua.h
*/
@ -629,11 +629,24 @@ LUA_API void lua_rawget (lua_State *L, int idx) {
LUA_API void lua_rawgeti (lua_State *L, int idx, int n) {
StkId o;
StkId t;
lua_lock(L);
o = index2addr(L, idx);
api_check(L, ttistable(o), "table expected");
setobj2s(L, L->top, luaH_getint(hvalue(o), n));
t = index2addr(L, idx);
api_check(L, ttistable(t), "table expected");
setobj2s(L, L->top, luaH_getint(hvalue(t), n));
api_incr_top(L);
lua_unlock(L);
}
LUA_API void lua_rawgetp (lua_State *L, int idx, const void *p) {
StkId t;
TValue k;
lua_lock(L);
t = index2addr(L, idx);
api_check(L, ttistable(t), "table expected");
setpvalue(&k, cast(void *, p));
setobj2s(L, L->top, luaH_get(hvalue(t), &k));
api_incr_top(L);
lua_unlock(L);
}
@ -741,13 +754,28 @@ LUA_API void lua_rawset (lua_State *L, int idx) {
LUA_API void lua_rawseti (lua_State *L, int idx, int n) {
StkId o;
StkId t;
lua_lock(L);
api_checknelems(L, 1);
o = index2addr(L, idx);
api_check(L, ttistable(o), "table expected");
luaH_setint(L, hvalue(o), n, L->top - 1);
luaC_barrierback(L, gcvalue(o), L->top-1);
t = index2addr(L, idx);
api_check(L, ttistable(t), "table expected");
luaH_setint(L, hvalue(t), n, L->top - 1);
luaC_barrierback(L, gcvalue(t), L->top-1);
L->top--;
lua_unlock(L);
}
LUA_API void lua_rawsetp (lua_State *L, int idx, const void *p) {
StkId t;
TValue k;
lua_lock(L);
api_checknelems(L, 1);
t = index2addr(L, idx);
api_check(L, ttistable(t), "table expected");
setpvalue(&k, cast(void *, p));
setobj2t(L, luaH_set(L, hvalue(t), &k), L->top - 1);
luaC_barrierback(L, gcvalue(t), L->top - 1);
L->top--;
lua_unlock(L);
}

11
ldblib.c
View file

@ -1,5 +1,5 @@
/*
** $Id: ldblib.c,v 1.129 2011/01/26 16:30:02 roberto Exp roberto $
** $Id: ldblib.c,v 1.130 2011/04/08 19:17:36 roberto Exp roberto $
** Interface from Lua to its debug API
** See Copyright Notice in lua.h
*/
@ -260,8 +260,7 @@ static void hookf (lua_State *L, lua_Debug *ar) {
static const char *const hooknames[] =
{"call", "return", "line", "count", "tail call"};
gethooktable(L);
lua_pushlightuserdata(L, L);
lua_rawget(L, -2);
lua_rawgetp(L, -1, L);
if (lua_isfunction(L, -1)) {
lua_pushstring(L, hooknames[(int)ar->event]);
if (ar->currentline >= 0)
@ -308,9 +307,8 @@ static int db_sethook (lua_State *L) {
func = hookf; mask = makemask(smask, count);
}
gethooktable(L);
lua_pushlightuserdata(L, L1);
lua_pushvalue(L, arg+1);
lua_rawset(L, -3); /* set new hook */
lua_rawsetp(L, -2, L1); /* set new hook */
lua_pop(L, 1); /* remove hook table */
lua_sethook(L1, func, mask, count); /* set hooks */
return 0;
@ -327,8 +325,7 @@ static int db_gethook (lua_State *L) {
lua_pushliteral(L, "external hook");
else {
gethooktable(L);
lua_pushlightuserdata(L, L1);
lua_rawget(L, -2); /* get hook */
lua_rawgetp(L, -1, L1); /* get hook */
lua_remove(L, -2); /* remove hook table */
}
lua_pushstring(L, unmakemask(mask, buff));

4
lua.h
View file

@ -1,5 +1,5 @@
/*
** $Id: lua.h,v 1.278 2011/07/02 16:00:15 roberto Exp roberto $
** $Id: lua.h,v 1.279 2011/08/23 17:24:34 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
@ -219,6 +219,7 @@ LUA_API void (lua_gettable) (lua_State *L, int idx);
LUA_API void (lua_getfield) (lua_State *L, int idx, const char *k);
LUA_API void (lua_rawget) (lua_State *L, int idx);
LUA_API void (lua_rawgeti) (lua_State *L, int idx, int n);
LUA_API void (lua_rawgetp) (lua_State *L, int idx, const void *p);
LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec);
LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
LUA_API int (lua_getmetatable) (lua_State *L, int objindex);
@ -232,6 +233,7 @@ 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_rawset) (lua_State *L, int idx);
LUA_API void (lua_rawseti) (lua_State *L, int idx, int n);
LUA_API void (lua_rawsetp) (lua_State *L, int idx, const void *p);
LUA_API int (lua_setmetatable) (lua_State *L, int objindex);
LUA_API void (lua_setuservalue) (lua_State *L, int idx);