diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-06-10 15:51:21 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-06-10 15:51:21 -0300 |
| commit | 542b6cfc02d57e66db7afc23a1d8350ae189e3c6 (patch) | |
| tree | a4069c34fcb91b0fd6662b63a8c6b56862d23d3a /lapi.c | |
| parent | 6f6fd96e3bd2cc1f61291717aee9d89ea0180cd4 (diff) | |
| download | lua-542b6cfc02d57e66db7afc23a1d8350ae189e3c6.tar.gz lua-542b6cfc02d57e66db7afc23a1d8350ae189e3c6.tar.bz2 lua-542b6cfc02d57e66db7afc23a1d8350ae189e3c6.zip | |
no need for field 'status' in structure 'CallInfo' (after removal
of 'lua_getctx') + field 'old_allowhook' can be packed into a single
bit
Diffstat (limited to 'lapi.c')
| -rw-r--r-- | lapi.c | 5 |
1 files changed, 3 insertions, 2 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lapi.c,v 2.214 2014/05/15 20:28:39 roberto Exp roberto $ | 2 | ** $Id: lapi.c,v 2.215 2014/06/10 17:41:38 roberto Exp roberto $ |
| 3 | ** Lua API | 3 | ** Lua API |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -968,9 +968,10 @@ LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc, | |||
| 968 | ci->u.c.ctx = ctx; /* save context */ | 968 | ci->u.c.ctx = ctx; /* save context */ |
| 969 | /* save information for error recovery */ | 969 | /* save information for error recovery */ |
| 970 | ci->extra = savestack(L, c.func); | 970 | ci->extra = savestack(L, c.func); |
| 971 | ci->u.c.old_allowhook = L->allowhook; | ||
| 972 | ci->u.c.old_errfunc = L->errfunc; | 971 | ci->u.c.old_errfunc = L->errfunc; |
| 973 | L->errfunc = func; | 972 | L->errfunc = func; |
| 973 | if (L->allowhook) | ||
| 974 | ci->callstatus |= CIST_OAH; /* save original value of 'allowhook' */ | ||
| 974 | /* mark that function may do error recovery */ | 975 | /* mark that function may do error recovery */ |
| 975 | ci->callstatus |= CIST_YPCALL; | 976 | ci->callstatus |= CIST_YPCALL; |
| 976 | luaD_call(L, c.func, nresults, 1); /* do the call */ | 977 | luaD_call(L, c.func, nresults, 1); /* do the call */ |
