From 4907444db9d31f340f29f6ff7c9284ee06a03f5b Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Fri, 16 Mar 2018 12:33:34 -0300 Subject: [PATCH] 'fTransfer' -> 'ftransfer' / 'nTransfer' -> 'ntransfer' (keep the standard of names in lower case) --- ldblib.c | 6 +++--- ldebug.c | 8 ++++---- ldo.c | 16 ++++++++-------- lstate.h | 6 +++--- lua.h | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ldblib.c b/ldblib.c index cb542f67..a9776543 100644 --- a/ldblib.c +++ b/ldblib.c @@ -1,5 +1,5 @@ /* -** $Id: ldblib.c,v 1.153 2018/02/20 16:52:50 roberto Exp roberto $ +** $Id: ldblib.c,v 1.154 2018/03/05 14:15:04 roberto Exp roberto $ ** Interface from Lua to its debug API ** See Copyright Notice in lua.h */ @@ -186,8 +186,8 @@ static int db_getinfo (lua_State *L) { settabss(L, "namewhat", ar.namewhat); } if (strchr(options, 'r')) { - settabsi(L, "fTransfer", ar.fTransfer); - settabsi(L, "nTransfer", ar.nTransfer); + settabsi(L, "ftransfer", ar.ftransfer); + settabsi(L, "ntransfer", ar.ntransfer); } if (strchr(options, 't')) settabsb(L, "istailcall", ar.istailcall); diff --git a/ldebug.c b/ldebug.c index bede7e37..996e8cb1 100644 --- a/ldebug.c +++ b/ldebug.c @@ -1,5 +1,5 @@ /* -** $Id: ldebug.c,v 2.154 2018/02/09 15:16:06 roberto Exp roberto $ +** $Id: ldebug.c,v 2.155 2018/02/17 19:29:29 roberto Exp roberto $ ** Debug Interface ** See Copyright Notice in lua.h */ @@ -358,10 +358,10 @@ static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar, } case 'r': { if (ci == NULL || !(ci->callstatus & CIST_TRAN)) - ar->fTransfer = ar->nTransfer = 0; + ar->ftransfer = ar->ntransfer = 0; else { - ar->fTransfer = ci->u2.transferinfo.fTransfer; - ar->nTransfer = ci->u2.transferinfo.nTransfer; + ar->ftransfer = ci->u2.transferinfo.ftransfer; + ar->ntransfer = ci->u2.transferinfo.ntransfer; } } case 'L': diff --git a/ldo.c b/ldo.c index 20f36450..41b41756 100644 --- a/ldo.c +++ b/ldo.c @@ -1,5 +1,5 @@ /* -** $Id: ldo.c,v 2.198 2018/03/05 14:13:55 roberto Exp roberto $ +** $Id: ldo.c,v 2.199 2018/03/07 16:26:01 roberto Exp roberto $ ** Stack and Call structure of Lua ** See Copyright Notice in lua.h */ @@ -268,7 +268,7 @@ void luaD_inctop (lua_State *L) { ** function, can be changed asynchronously by signals.) */ void luaD_hook (lua_State *L, int event, int line, - int fTransfer, int nTransfer) { + int ftransfer, int ntransfer) { lua_Hook hook = L->hook; if (hook && L->allowhook) { /* make sure there is a hook */ int mask = CIST_HOOKED; @@ -279,10 +279,10 @@ void luaD_hook (lua_State *L, int event, int line, ar.event = event; ar.currentline = line; ar.i_ci = ci; - if (nTransfer != 0) { + if (ntransfer != 0) { mask |= CIST_TRAN; /* 'ci' has transfer information */ - ci->u2.transferinfo.fTransfer = fTransfer; - ci->u2.transferinfo.nTransfer = nTransfer; + ci->u2.transferinfo.ftransfer = ftransfer; + ci->u2.transferinfo.ntransfer = ntransfer; } luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ if (L->top + LUA_MINSTACK > ci->top) @@ -329,10 +329,10 @@ static void rethook (lua_State *L, CallInfo *ci, StkId firstres, int nres) { L->top = ci->top; /* correct top */ } if (L->hookmask & LUA_MASKRET) { /* is return hook on? */ - int fTransfer; + int ftransfer; ci->func += delta; /* if vararg, back to virtual 'func' */ - fTransfer = cast(unsigned short, firstres - ci->func); - luaD_hook(L, LUA_HOOKRET, -1, fTransfer, nres); /* call it */ + ftransfer = cast(unsigned short, firstres - ci->func); + luaD_hook(L, LUA_HOOKRET, -1, ftransfer, nres); /* call it */ ci->func -= delta; } if (isLua(ci->previous)) diff --git a/lstate.h b/lstate.h index 974249de..cd8b4db7 100644 --- a/lstate.h +++ b/lstate.h @@ -1,5 +1,5 @@ /* -** $Id: lstate.h,v 2.156 2018/02/17 19:29:29 roberto Exp roberto $ +** $Id: lstate.h,v 2.157 2018/02/25 12:43:52 roberto Exp roberto $ ** Global State ** See Copyright Notice in lua.h */ @@ -104,8 +104,8 @@ typedef struct CallInfo { int funcidx; /* called-function index */ int nyield; /* number of values yielded */ struct { /* info about transfered values (for call/return hooks) */ - unsigned short fTransfer; /* offset of first value transfered */ - unsigned short nTransfer; /* number of values transfered */ + unsigned short ftransfer; /* offset of first value transfered */ + unsigned short ntransfer; /* number of values transfered */ } transferinfo; } u2; short nresults; /* expected number of results from this function */ diff --git a/lua.h b/lua.h index 5183459f..31e20397 100644 --- a/lua.h +++ b/lua.h @@ -1,5 +1,5 @@ /* -** $Id: lua.h,v 1.343 2018/03/02 16:30:47 roberto Exp roberto $ +** $Id: lua.h,v 1.344 2018/03/05 14:15:32 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 @@ -461,8 +461,8 @@ struct lua_Debug { unsigned char nparams;/* (u) number of parameters */ char isvararg; /* (u) */ char istailcall; /* (t) */ - unsigned short fTransfer;/* (r) index of first value transfered */ - unsigned short nTransfer; /* (r) number of transfered values */ + unsigned short ftransfer; /* (r) index of first value transferred */ + unsigned short ntransfer; /* (r) number of transferred values */ char short_src[LUA_IDSIZE]; /* (S) */ /* private part */ struct CallInfo *i_ci; /* active function */