aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-02-09 09:55:37 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-02-09 09:55:37 -0200
commitc8ff7de7f0be3abd4bb80682bda2bafc12503732 (patch)
tree6a10ca206f272deee43440835a8ff78d9b2c4046
parent3bae8e047c0f7afd550d8ae5c0c5c2557a4c780e (diff)
downloadlua-c8ff7de7f0be3abd4bb80682bda2bafc12503732.tar.gz
lua-c8ff7de7f0be3abd4bb80682bda2bafc12503732.tar.bz2
lua-c8ff7de7f0be3abd4bb80682bda2bafc12503732.zip
field 'oldtop' renamed to 'extra', as it can be used for other
purposes
-rw-r--r--lapi.c4
-rw-r--r--lstate.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/lapi.c b/lapi.c
index 8b229d7b..17014d47 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 2.111 2010/01/13 16:18:25 roberto Exp roberto $ 2** $Id: lapi.c,v 2.112 2010/01/21 16:49:21 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*/
@@ -857,7 +857,7 @@ LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc,
857 ci->u.c.k = k; /* save continuation */ 857 ci->u.c.k = k; /* save continuation */
858 ci->u.c.ctx = ctx; /* save context */ 858 ci->u.c.ctx = ctx; /* save context */
859 /* save information for error recovery */ 859 /* save information for error recovery */
860 ci->u.c.oldtop = savestack(L, c.func); 860 ci->u.c.extra = savestack(L, c.func);
861 ci->u.c.old_allowhook = L->allowhook; 861 ci->u.c.old_allowhook = L->allowhook;
862 ci->u.c.old_errfunc = L->errfunc; 862 ci->u.c.old_errfunc = L->errfunc;
863 L->errfunc = func; 863 L->errfunc = func;
diff --git a/lstate.h b/lstate.h
index b9a96b72..a6ea5546 100644
--- a/lstate.h
+++ b/lstate.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lstate.h,v 2.51 2009/12/11 13:39:34 roberto Exp roberto $ 2** $Id: lstate.h,v 2.52 2009/12/22 15:32:50 roberto Exp roberto $
3** Global State 3** Global State
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -85,7 +85,7 @@ typedef struct CallInfo {
85 int ctx; /* context info. in case of yields */ 85 int ctx; /* context info. in case of yields */
86 lua_CFunction k; /* continuation in case of yields */ 86 lua_CFunction k; /* continuation in case of yields */
87 ptrdiff_t old_errfunc; 87 ptrdiff_t old_errfunc;
88 ptrdiff_t oldtop; 88 ptrdiff_t extra;
89 lu_byte old_allowhook; 89 lu_byte old_allowhook;
90 lu_byte status; 90 lu_byte status;
91 } c; 91 } c;