diff options
| -rw-r--r-- | ldblib.c | 6 | ||||
| -rw-r--r-- | ldebug.c | 8 | ||||
| -rw-r--r-- | ldo.c | 16 | ||||
| -rw-r--r-- | lstate.h | 6 | ||||
| -rw-r--r-- | lua.h | 6 |
5 files changed, 21 insertions, 21 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ldblib.c,v 1.153 2018/02/20 16:52:50 roberto Exp roberto $ | 2 | ** $Id: ldblib.c,v 1.154 2018/03/05 14:15:04 roberto Exp roberto $ |
| 3 | ** Interface from Lua to its debug API | 3 | ** Interface from Lua to its debug API |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -186,8 +186,8 @@ static int db_getinfo (lua_State *L) { | |||
| 186 | settabss(L, "namewhat", ar.namewhat); | 186 | settabss(L, "namewhat", ar.namewhat); |
| 187 | } | 187 | } |
| 188 | if (strchr(options, 'r')) { | 188 | if (strchr(options, 'r')) { |
| 189 | settabsi(L, "fTransfer", ar.fTransfer); | 189 | settabsi(L, "ftransfer", ar.ftransfer); |
| 190 | settabsi(L, "nTransfer", ar.nTransfer); | 190 | settabsi(L, "ntransfer", ar.ntransfer); |
| 191 | } | 191 | } |
| 192 | if (strchr(options, 't')) | 192 | if (strchr(options, 't')) |
| 193 | settabsb(L, "istailcall", ar.istailcall); | 193 | settabsb(L, "istailcall", ar.istailcall); |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ldebug.c,v 2.154 2018/02/09 15:16:06 roberto Exp roberto $ | 2 | ** $Id: ldebug.c,v 2.155 2018/02/17 19:29:29 roberto Exp roberto $ |
| 3 | ** Debug Interface | 3 | ** Debug Interface |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -358,10 +358,10 @@ static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar, | |||
| 358 | } | 358 | } |
| 359 | case 'r': { | 359 | case 'r': { |
| 360 | if (ci == NULL || !(ci->callstatus & CIST_TRAN)) | 360 | if (ci == NULL || !(ci->callstatus & CIST_TRAN)) |
| 361 | ar->fTransfer = ar->nTransfer = 0; | 361 | ar->ftransfer = ar->ntransfer = 0; |
| 362 | else { | 362 | else { |
| 363 | ar->fTransfer = ci->u2.transferinfo.fTransfer; | 363 | ar->ftransfer = ci->u2.transferinfo.ftransfer; |
| 364 | ar->nTransfer = ci->u2.transferinfo.nTransfer; | 364 | ar->ntransfer = ci->u2.transferinfo.ntransfer; |
| 365 | } | 365 | } |
| 366 | } | 366 | } |
| 367 | case 'L': | 367 | case 'L': |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ldo.c,v 2.198 2018/03/05 14:13:55 roberto Exp roberto $ | 2 | ** $Id: ldo.c,v 2.199 2018/03/07 16:26:01 roberto Exp roberto $ |
| 3 | ** Stack and Call structure of Lua | 3 | ** Stack and Call structure of Lua |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -268,7 +268,7 @@ void luaD_inctop (lua_State *L) { | |||
| 268 | ** function, can be changed asynchronously by signals.) | 268 | ** function, can be changed asynchronously by signals.) |
| 269 | */ | 269 | */ |
| 270 | void luaD_hook (lua_State *L, int event, int line, | 270 | void luaD_hook (lua_State *L, int event, int line, |
| 271 | int fTransfer, int nTransfer) { | 271 | int ftransfer, int ntransfer) { |
| 272 | lua_Hook hook = L->hook; | 272 | lua_Hook hook = L->hook; |
| 273 | if (hook && L->allowhook) { /* make sure there is a hook */ | 273 | if (hook && L->allowhook) { /* make sure there is a hook */ |
| 274 | int mask = CIST_HOOKED; | 274 | int mask = CIST_HOOKED; |
| @@ -279,10 +279,10 @@ void luaD_hook (lua_State *L, int event, int line, | |||
| 279 | ar.event = event; | 279 | ar.event = event; |
| 280 | ar.currentline = line; | 280 | ar.currentline = line; |
| 281 | ar.i_ci = ci; | 281 | ar.i_ci = ci; |
| 282 | if (nTransfer != 0) { | 282 | if (ntransfer != 0) { |
| 283 | mask |= CIST_TRAN; /* 'ci' has transfer information */ | 283 | mask |= CIST_TRAN; /* 'ci' has transfer information */ |
| 284 | ci->u2.transferinfo.fTransfer = fTransfer; | 284 | ci->u2.transferinfo.ftransfer = ftransfer; |
| 285 | ci->u2.transferinfo.nTransfer = nTransfer; | 285 | ci->u2.transferinfo.ntransfer = ntransfer; |
| 286 | } | 286 | } |
| 287 | luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ | 287 | luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ |
| 288 | if (L->top + LUA_MINSTACK > ci->top) | 288 | if (L->top + LUA_MINSTACK > ci->top) |
| @@ -329,10 +329,10 @@ static void rethook (lua_State *L, CallInfo *ci, StkId firstres, int nres) { | |||
| 329 | L->top = ci->top; /* correct top */ | 329 | L->top = ci->top; /* correct top */ |
| 330 | } | 330 | } |
| 331 | if (L->hookmask & LUA_MASKRET) { /* is return hook on? */ | 331 | if (L->hookmask & LUA_MASKRET) { /* is return hook on? */ |
| 332 | int fTransfer; | 332 | int ftransfer; |
| 333 | ci->func += delta; /* if vararg, back to virtual 'func' */ | 333 | ci->func += delta; /* if vararg, back to virtual 'func' */ |
| 334 | fTransfer = cast(unsigned short, firstres - ci->func); | 334 | ftransfer = cast(unsigned short, firstres - ci->func); |
| 335 | luaD_hook(L, LUA_HOOKRET, -1, fTransfer, nres); /* call it */ | 335 | luaD_hook(L, LUA_HOOKRET, -1, ftransfer, nres); /* call it */ |
| 336 | ci->func -= delta; | 336 | ci->func -= delta; |
| 337 | } | 337 | } |
| 338 | if (isLua(ci->previous)) | 338 | if (isLua(ci->previous)) |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lstate.h,v 2.156 2018/02/17 19:29:29 roberto Exp roberto $ | 2 | ** $Id: lstate.h,v 2.157 2018/02/25 12:43:52 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 | */ |
| @@ -104,8 +104,8 @@ typedef struct CallInfo { | |||
| 104 | int funcidx; /* called-function index */ | 104 | int funcidx; /* called-function index */ |
| 105 | int nyield; /* number of values yielded */ | 105 | int nyield; /* number of values yielded */ |
| 106 | struct { /* info about transfered values (for call/return hooks) */ | 106 | struct { /* info about transfered values (for call/return hooks) */ |
| 107 | unsigned short fTransfer; /* offset of first value transfered */ | 107 | unsigned short ftransfer; /* offset of first value transfered */ |
| 108 | unsigned short nTransfer; /* number of values transfered */ | 108 | unsigned short ntransfer; /* number of values transfered */ |
| 109 | } transferinfo; | 109 | } transferinfo; |
| 110 | } u2; | 110 | } u2; |
| 111 | short nresults; /* expected number of results from this function */ | 111 | short nresults; /* expected number of results from this function */ |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lua.h,v 1.343 2018/03/02 16:30:47 roberto Exp roberto $ | 2 | ** $Id: lua.h,v 1.344 2018/03/05 14:15:32 roberto Exp roberto $ |
| 3 | ** Lua - A Scripting Language | 3 | ** Lua - A Scripting Language |
| 4 | ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) | 4 | ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) |
| 5 | ** See Copyright Notice at the end of this file | 5 | ** See Copyright Notice at the end of this file |
| @@ -461,8 +461,8 @@ struct lua_Debug { | |||
| 461 | unsigned char nparams;/* (u) number of parameters */ | 461 | unsigned char nparams;/* (u) number of parameters */ |
| 462 | char isvararg; /* (u) */ | 462 | char isvararg; /* (u) */ |
| 463 | char istailcall; /* (t) */ | 463 | char istailcall; /* (t) */ |
| 464 | unsigned short fTransfer;/* (r) index of first value transfered */ | 464 | unsigned short ftransfer; /* (r) index of first value transferred */ |
| 465 | unsigned short nTransfer; /* (r) number of transfered values */ | 465 | unsigned short ntransfer; /* (r) number of transferred values */ |
| 466 | char short_src[LUA_IDSIZE]; /* (S) */ | 466 | char short_src[LUA_IDSIZE]; /* (S) */ |
| 467 | /* private part */ | 467 | /* private part */ |
| 468 | struct CallInfo *i_ci; /* active function */ | 468 | struct CallInfo *i_ci; /* active function */ |