aboutsummaryrefslogtreecommitdiff
path: root/src/lua.h
diff options
context:
space:
mode:
authorMike Pall <mike>2012-09-20 17:36:15 +0200
committerMike Pall <mike>2012-09-20 17:36:15 +0200
commit8352335c745eb7053cdc39d949b036f90724a0fb (patch)
treebc2fc36e71bbda6b573ba104ffccfaa113246837 /src/lua.h
parenta9baead59f0521b289ba39e4d56ca92b0359e31e (diff)
downloadluajit-8352335c745eb7053cdc39d949b036f90724a0fb.tar.gz
luajit-8352335c745eb7053cdc39d949b036f90724a0fb.tar.bz2
luajit-8352335c745eb7053cdc39d949b036f90724a0fb.zip
From Lua 5.2: Add debug.upvalueid() and debug.upvaluejoin().
Ditto for lua_upvalueid() and lua_upvaluejoin().
Diffstat (limited to 'src/lua.h')
-rw-r--r--src/lua.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lua.h b/src/lua.h
index 0e98b374..9e9357a8 100644
--- a/src/lua.h
+++ b/src/lua.h
@@ -336,12 +336,15 @@ LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
336LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n); 336LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
337LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n); 337LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n);
338LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n); 338LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n);
339
340LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count); 339LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count);
341LUA_API lua_Hook lua_gethook (lua_State *L); 340LUA_API lua_Hook lua_gethook (lua_State *L);
342LUA_API int lua_gethookmask (lua_State *L); 341LUA_API int lua_gethookmask (lua_State *L);
343LUA_API int lua_gethookcount (lua_State *L); 342LUA_API int lua_gethookcount (lua_State *L);
344 343
344/* From Lua 5.2. */
345LUA_API void *lua_upvalueid (lua_State *L, int idx, int n);
346LUA_API void lua_upvaluejoin (lua_State *L, int idx1, int n1, int idx2, int n2);
347
345 348
346struct lua_Debug { 349struct lua_Debug {
347 int event; 350 int event;