changing {} style to match majority of previous style

This commit is contained in:
Philippe Teuwen 2019-03-10 11:20:22 +01:00
commit 961d929f4d
320 changed files with 5502 additions and 10485 deletions

View file

@ -40,8 +40,7 @@
** search for 'objidx' in table at index -1.
** return 1 + string at top if find a good name.
*/
static int findfield(lua_State *L, int objidx, int level)
{
static int findfield(lua_State *L, int objidx, int level) {
if (level == 0 || !lua_istable(L, -1))
return 0; /* not found */
lua_pushnil(L); /* start 'next' loop */
@ -64,8 +63,7 @@ static int findfield(lua_State *L, int objidx, int level)
}
static int pushglobalfuncname(lua_State *L, lua_Debug *ar)
{
static int pushglobalfuncname(lua_State *L, lua_Debug *ar) {
int top = lua_gettop(L);
lua_getinfo(L, "f", ar); /* push function */
lua_pushglobaltable(L);
@ -80,8 +78,7 @@ static int pushglobalfuncname(lua_State *L, lua_Debug *ar)
}
static void pushfuncname(lua_State *L, lua_Debug *ar)
{
static void pushfuncname(lua_State *L, lua_Debug *ar) {
if (*ar->namewhat != '\0') /* is there a name? */
lua_pushfstring(L, "function " LUA_QS, ar->name);
else if (*ar->what == 'm') /* main? */
@ -97,8 +94,7 @@ static void pushfuncname(lua_State *L, lua_Debug *ar)
}
static int countlevels(lua_State *L)
{
static int countlevels(lua_State *L) {
lua_Debug ar;
int li = 1, le = 1;
/* find an upper bound */
@ -114,8 +110,7 @@ static int countlevels(lua_State *L)
LUALIB_API void luaL_traceback(lua_State *L, lua_State *L1,
const char *msg, int level)
{
const char *msg, int level) {
lua_Debug ar;
int top = lua_gettop(L);
int numlevels = countlevels(L1);
@ -150,8 +145,7 @@ LUALIB_API void luaL_traceback(lua_State *L, lua_State *L1,
** =======================================================
*/
LUALIB_API int luaL_argerror(lua_State *L, int narg, const char *extramsg)
{
LUALIB_API int luaL_argerror(lua_State *L, int narg, const char *extramsg) {
lua_Debug ar;
if (!lua_getstack(L, 0, &ar)) /* no stack frame? */
return luaL_error(L, "bad argument #%d (%s)", narg, extramsg);
@ -169,22 +163,19 @@ LUALIB_API int luaL_argerror(lua_State *L, int narg, const char *extramsg)
}
static int typeerror(lua_State *L, int narg, const char *tname)
{
static int typeerror(lua_State *L, int narg, const char *tname) {
const char *msg = lua_pushfstring(L, "%s expected, got %s",
tname, luaL_typename(L, narg));
return luaL_argerror(L, narg, msg);
}
static void tag_error(lua_State *L, int narg, int tag)
{
static void tag_error(lua_State *L, int narg, int tag) {
typeerror(L, narg, lua_typename(L, tag));
}
LUALIB_API void luaL_where(lua_State *L, int level)
{
LUALIB_API void luaL_where(lua_State *L, int level) {
lua_Debug ar;
if (lua_getstack(L, level, &ar)) { /* check function at level */
lua_getinfo(L, "Sl", &ar); /* get info about it */
@ -197,8 +188,7 @@ LUALIB_API void luaL_where(lua_State *L, int level)
}
LUALIB_API int luaL_error(lua_State *L, const char *fmt, ...)
{
LUALIB_API int luaL_error(lua_State *L, const char *fmt, ...) {
va_list argp;
va_start(argp, fmt);
luaL_where(L, 1);
@ -209,8 +199,7 @@ LUALIB_API int luaL_error(lua_State *L, const char *fmt, ...)
}
LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname)
{
LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname) {
int en = errno; /* calls to Lua API may change this value */
if (stat) {
lua_pushboolean(L, 1);
@ -249,8 +238,7 @@ LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname)
#endif /* } */
LUALIB_API int luaL_execresult(lua_State *L, int stat)
{
LUALIB_API int luaL_execresult(lua_State *L, int stat) {
const char *what = "exit"; /* type of termination */
if (stat == -1) /* error? */
return luaL_fileresult(L, 0, NULL);
@ -275,8 +263,7 @@ LUALIB_API int luaL_execresult(lua_State *L, int stat)
** =======================================================
*/
LUALIB_API int luaL_newmetatable(lua_State *L, const char *tname)
{
LUALIB_API int luaL_newmetatable(lua_State *L, const char *tname) {
luaL_getmetatable(L, tname); /* try to get metatable */
if (!lua_isnil(L, -1)) /* name already in use? */
return 0; /* leave previous value on top, but return 0 */
@ -288,15 +275,13 @@ LUALIB_API int luaL_newmetatable(lua_State *L, const char *tname)
}
LUALIB_API void luaL_setmetatable(lua_State *L, const char *tname)
{
LUALIB_API void luaL_setmetatable(lua_State *L, const char *tname) {
luaL_getmetatable(L, tname);
lua_setmetatable(L, -2);
}
LUALIB_API void *luaL_testudata(lua_State *L, int ud, const char *tname)
{
LUALIB_API void *luaL_testudata(lua_State *L, int ud, const char *tname) {
void *p = lua_touserdata(L, ud);
if (p != NULL) { /* value is a userdata? */
if (lua_getmetatable(L, ud)) { /* does it have a metatable? */
@ -311,8 +296,7 @@ LUALIB_API void *luaL_testudata(lua_State *L, int ud, const char *tname)
}
LUALIB_API void *luaL_checkudata(lua_State *L, int ud, const char *tname)
{
LUALIB_API void *luaL_checkudata(lua_State *L, int ud, const char *tname) {
void *p = luaL_testudata(L, ud, tname);
if (p == NULL) typeerror(L, ud, tname);
return p;
@ -328,8 +312,7 @@ LUALIB_API void *luaL_checkudata(lua_State *L, int ud, const char *tname)
*/
LUALIB_API int luaL_checkoption(lua_State *L, int narg, const char *def,
const char *const lst[])
{
const char *const lst[]) {
const char *name = (def) ? luaL_optstring(L, narg, def) :
luaL_checkstring(L, narg);
int i;
@ -341,8 +324,7 @@ LUALIB_API int luaL_checkoption(lua_State *L, int narg, const char *def,
}
LUALIB_API void luaL_checkstack(lua_State *L, int space, const char *msg)
{
LUALIB_API void luaL_checkstack(lua_State *L, int space, const char *msg) {
/* keep some extra space to run error routines, if needed */
const int extra = LUA_MINSTACK;
if (!lua_checkstack(L, space + extra)) {
@ -354,22 +336,19 @@ LUALIB_API void luaL_checkstack(lua_State *L, int space, const char *msg)
}
LUALIB_API void luaL_checktype(lua_State *L, int narg, int t)
{
LUALIB_API void luaL_checktype(lua_State *L, int narg, int t) {
if (lua_type(L, narg) != t)
tag_error(L, narg, t);
}
LUALIB_API void luaL_checkany(lua_State *L, int narg)
{
LUALIB_API void luaL_checkany(lua_State *L, int narg) {
if (lua_type(L, narg) == LUA_TNONE)
luaL_argerror(L, narg, "value expected");
}
LUALIB_API const char *luaL_checklstring(lua_State *L, int narg, size_t *len)
{
LUALIB_API const char *luaL_checklstring(lua_State *L, int narg, size_t *len) {
const char *s = lua_tolstring(L, narg, len);
if (!s) tag_error(L, narg, LUA_TSTRING);
return s;
@ -377,8 +356,7 @@ LUALIB_API const char *luaL_checklstring(lua_State *L, int narg, size_t *len)
LUALIB_API const char *luaL_optlstring(lua_State *L, int narg,
const char *def, size_t *len)
{
const char *def, size_t *len) {
if (lua_isnoneornil(L, narg)) {
if (len)
*len = (def ? strlen(def) : 0);
@ -387,8 +365,7 @@ LUALIB_API const char *luaL_optlstring(lua_State *L, int narg,
}
LUALIB_API lua_Number luaL_checknumber(lua_State *L, int narg)
{
LUALIB_API lua_Number luaL_checknumber(lua_State *L, int narg) {
int isnum;
lua_Number d = lua_tonumberx(L, narg, &isnum);
if (!isnum)
@ -397,14 +374,12 @@ LUALIB_API lua_Number luaL_checknumber(lua_State *L, int narg)
}
LUALIB_API lua_Number luaL_optnumber(lua_State *L, int narg, lua_Number def)
{
LUALIB_API lua_Number luaL_optnumber(lua_State *L, int narg, lua_Number def) {
return luaL_opt(L, luaL_checknumber, narg, def);
}
LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int narg)
{
LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int narg) {
int isnum;
lua_Integer d = lua_tointegerx(L, narg, &isnum);
if (!isnum)
@ -413,8 +388,7 @@ LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int narg)
}
LUALIB_API lua_Unsigned luaL_checkunsigned(lua_State *L, int narg)
{
LUALIB_API lua_Unsigned luaL_checkunsigned(lua_State *L, int narg) {
int isnum;
lua_Unsigned d = lua_tounsignedx(L, narg, &isnum);
if (!isnum)
@ -424,15 +398,13 @@ LUALIB_API lua_Unsigned luaL_checkunsigned(lua_State *L, int narg)
LUALIB_API lua_Integer luaL_optinteger(lua_State *L, int narg,
lua_Integer def)
{
lua_Integer def) {
return luaL_opt(L, luaL_checkinteger, narg, def);
}
LUALIB_API lua_Unsigned luaL_optunsigned(lua_State *L, int narg,
lua_Unsigned def)
{
lua_Unsigned def) {
return luaL_opt(L, luaL_checkunsigned, narg, def);
}
@ -455,8 +427,7 @@ LUALIB_API lua_Unsigned luaL_optunsigned(lua_State *L, int narg,
/*
** returns a pointer to a free area with at least 'sz' bytes
*/
LUALIB_API char *luaL_prepbuffsize(luaL_Buffer *B, size_t sz)
{
LUALIB_API char *luaL_prepbuffsize(luaL_Buffer *B, size_t sz) {
lua_State *L = B->L;
if (B->size - B->n < sz) { /* not enough space? */
char *newbuff;
@ -478,22 +449,19 @@ LUALIB_API char *luaL_prepbuffsize(luaL_Buffer *B, size_t sz)
}
LUALIB_API void luaL_addlstring(luaL_Buffer *B, const char *s, size_t l)
{
LUALIB_API void luaL_addlstring(luaL_Buffer *B, const char *s, size_t l) {
char *b = luaL_prepbuffsize(B, l);
memcpy(b, s, l * sizeof(char));
luaL_addsize(B, l);
}
LUALIB_API void luaL_addstring(luaL_Buffer *B, const char *s)
{
LUALIB_API void luaL_addstring(luaL_Buffer *B, const char *s) {
luaL_addlstring(B, s, strlen(s));
}
LUALIB_API void luaL_pushresult(luaL_Buffer *B)
{
LUALIB_API void luaL_pushresult(luaL_Buffer *B) {
lua_State *L = B->L;
lua_pushlstring(L, B->b, B->n);
if (buffonstack(B))
@ -501,15 +469,13 @@ LUALIB_API void luaL_pushresult(luaL_Buffer *B)
}
LUALIB_API void luaL_pushresultsize(luaL_Buffer *B, size_t sz)
{
LUALIB_API void luaL_pushresultsize(luaL_Buffer *B, size_t sz) {
luaL_addsize(B, sz);
luaL_pushresult(B);
}
LUALIB_API void luaL_addvalue(luaL_Buffer *B)
{
LUALIB_API void luaL_addvalue(luaL_Buffer *B) {
lua_State *L = B->L;
size_t l;
const char *s = lua_tolstring(L, -1, &l);
@ -520,8 +486,7 @@ LUALIB_API void luaL_addvalue(luaL_Buffer *B)
}
LUALIB_API void luaL_buffinit(lua_State *L, luaL_Buffer *B)
{
LUALIB_API void luaL_buffinit(lua_State *L, luaL_Buffer *B) {
B->L = L;
B->b = B->initb;
B->n = 0;
@ -529,8 +494,7 @@ LUALIB_API void luaL_buffinit(lua_State *L, luaL_Buffer *B)
}
LUALIB_API char *luaL_buffinitsize(lua_State *L, luaL_Buffer *B, size_t sz)
{
LUALIB_API char *luaL_buffinitsize(lua_State *L, luaL_Buffer *B, size_t sz) {
luaL_buffinit(L, B);
return luaL_prepbuffsize(B, sz);
}
@ -548,8 +512,7 @@ LUALIB_API char *luaL_buffinitsize(lua_State *L, luaL_Buffer *B, size_t sz)
#define freelist 0
LUALIB_API int luaL_ref(lua_State *L, int t)
{
LUALIB_API int luaL_ref(lua_State *L, int t) {
int ref;
if (lua_isnil(L, -1)) {
lua_pop(L, 1); /* remove from stack */
@ -569,8 +532,7 @@ LUALIB_API int luaL_ref(lua_State *L, int t)
}
LUALIB_API void luaL_unref(lua_State *L, int t, int ref)
{
LUALIB_API void luaL_unref(lua_State *L, int t, int ref) {
if (ref >= 0) {
t = lua_absindex(L, t);
lua_rawgeti(L, t, freelist);
@ -596,8 +558,7 @@ typedef struct LoadF {
} LoadF;
static const char *getF(lua_State *L, void *ud, size_t *size)
{
static const char *getF(lua_State *L, void *ud, size_t *size) {
LoadF *lf = (LoadF *)ud;
(void)L; /* not used */
if (lf->n > 0) { /* are there pre-read characters to be read? */
@ -614,8 +575,7 @@ static const char *getF(lua_State *L, void *ud, size_t *size)
}
static int errfile(lua_State *L, const char *what, int fnameindex)
{
static int errfile(lua_State *L, const char *what, int fnameindex) {
const char *serr = strerror(errno);
const char *filename = lua_tostring(L, fnameindex) + 1;
lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
@ -624,8 +584,7 @@ static int errfile(lua_State *L, const char *what, int fnameindex)
}
static int skipBOM(LoadF *lf)
{
static int skipBOM(LoadF *lf) {
const char *p = "\xEF\xBB\xBF"; /* Utf8 BOM mark */
int c;
lf->n = 0;
@ -646,8 +605,7 @@ static int skipBOM(LoadF *lf)
** first "valid" character of the file (after the optional BOM and
** a first-line comment).
*/
static int skipcomment(LoadF *lf, int *cp)
{
static int skipcomment(LoadF *lf, int *cp) {
int c = *cp = skipBOM(lf);
if (c == '#') { /* first line is a comment (Unix exec. file)? */
do { /* skip first line */
@ -660,8 +618,7 @@ static int skipcomment(LoadF *lf, int *cp)
LUALIB_API int luaL_loadfilex(lua_State *L, const char *filename,
const char *mode)
{
const char *mode) {
LoadF lf;
int status, readstatus;
int c;
@ -701,8 +658,7 @@ typedef struct LoadS {
} LoadS;
static const char *getS(lua_State *L, void *ud, size_t *size)
{
static const char *getS(lua_State *L, void *ud, size_t *size) {
LoadS *ls = (LoadS *)ud;
(void)L; /* not used */
if (ls->size == 0) return NULL;
@ -713,8 +669,7 @@ static const char *getS(lua_State *L, void *ud, size_t *size)
LUALIB_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t size,
const char *name, const char *mode)
{
const char *name, const char *mode) {
LoadS ls;
ls.s = buff;
ls.size = size;
@ -722,8 +677,7 @@ LUALIB_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t size,
}
LUALIB_API int luaL_loadstring(lua_State *L, const char *s)
{
LUALIB_API int luaL_loadstring(lua_State *L, const char *s) {
return luaL_loadbuffer(L, s, strlen(s), s);
}
@ -731,8 +685,7 @@ LUALIB_API int luaL_loadstring(lua_State *L, const char *s)
LUALIB_API int luaL_getmetafield(lua_State *L, int obj, const char *event)
{
LUALIB_API int luaL_getmetafield(lua_State *L, int obj, const char *event) {
if (!lua_getmetatable(L, obj)) /* no metatable? */
return 0;
lua_pushstring(L, event);
@ -747,8 +700,7 @@ LUALIB_API int luaL_getmetafield(lua_State *L, int obj, const char *event)
}
LUALIB_API int luaL_callmeta(lua_State *L, int obj, const char *event)
{
LUALIB_API int luaL_callmeta(lua_State *L, int obj, const char *event) {
obj = lua_absindex(L, obj);
if (!luaL_getmetafield(L, obj, event)) /* no metafield? */
return 0;
@ -758,8 +710,7 @@ LUALIB_API int luaL_callmeta(lua_State *L, int obj, const char *event)
}
LUALIB_API int luaL_len(lua_State *L, int idx)
{
LUALIB_API int luaL_len(lua_State *L, int idx) {
int l;
int isnum;
lua_len(L, idx);
@ -771,8 +722,7 @@ LUALIB_API int luaL_len(lua_State *L, int idx)
}
LUALIB_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len)
{
LUALIB_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len) {
if (!luaL_callmeta(L, idx, "__tostring")) { /* no metafield? */
switch (lua_type(L, idx)) {
case LUA_TNUMBER:
@ -803,8 +753,7 @@ LUALIB_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len)
#if defined(LUA_COMPAT_MODULE)
static const char *luaL_findtable(lua_State *L, int idx,
const char *fname, int szhint)
{
const char *fname, int szhint) {
const char *e;
if (idx) lua_pushvalue(L, idx);
do {
@ -832,8 +781,7 @@ static const char *luaL_findtable(lua_State *L, int idx,
/*
** Count number of elements in a luaL_Reg list.
*/
static int libsize(const luaL_Reg *l)
{
static int libsize(const luaL_Reg *l) {
int size = 0;
for (; l && l->name; l++) size++;
return size;
@ -847,8 +795,7 @@ static int libsize(const luaL_Reg *l)
** the module table.
*/
LUALIB_API void luaL_pushmodule(lua_State *L, const char *modname,
int sizehint)
{
int sizehint) {
luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1); /* get _LOADED table */
lua_getfield(L, -1, modname); /* get _LOADED[modname] */
if (!lua_istable(L, -1)) { /* not found? */
@ -865,8 +812,7 @@ LUALIB_API void luaL_pushmodule(lua_State *L, const char *modname,
LUALIB_API void luaL_openlib(lua_State *L, const char *libname,
const luaL_Reg *l, int nup)
{
const luaL_Reg *l, int nup) {
luaL_checkversion(L);
if (libname) {
luaL_pushmodule(L, libname, libsize(l)); /* get/create library table */
@ -886,8 +832,7 @@ LUALIB_API void luaL_openlib(lua_State *L, const char *libname,
** function gets the 'nup' elements at the top as upvalues.
** Returns with only the table at the stack.
*/
LUALIB_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup)
{
LUALIB_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
luaL_checkversion(L);
luaL_checkstack(L, nup, "too many upvalues");
for (; l->name != NULL; l++) { /* fill the table with given functions */
@ -905,8 +850,7 @@ LUALIB_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup)
** ensure that stack[idx][fname] has a table and push that table
** into the stack
*/
LUALIB_API int luaL_getsubtable(lua_State *L, int idx, const char *fname)
{
LUALIB_API int luaL_getsubtable(lua_State *L, int idx, const char *fname) {
lua_getfield(L, idx, fname);
if (lua_istable(L, -1)) return 1; /* table already there */
else {
@ -927,8 +871,7 @@ LUALIB_API int luaL_getsubtable(lua_State *L, int idx, const char *fname)
** Leaves resulting module on the top.
*/
LUALIB_API void luaL_requiref(lua_State *L, const char *modname,
lua_CFunction openf, int glb)
{
lua_CFunction openf, int glb) {
lua_pushcfunction(L, openf);
lua_pushstring(L, modname); /* argument to open function */
lua_call(L, 1, 1); /* open module */
@ -944,8 +887,7 @@ LUALIB_API void luaL_requiref(lua_State *L, const char *modname,
LUALIB_API const char *luaL_gsub(lua_State *L, const char *s, const char *p,
const char *r)
{
const char *r) {
const char *wild;
size_t l = strlen(p);
luaL_Buffer b;
@ -961,8 +903,7 @@ LUALIB_API const char *luaL_gsub(lua_State *L, const char *s, const char *p,
}
static void *l_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
{
static void *l_alloc(void *ud, void *ptr, size_t osize, size_t nsize) {
(void)ud;
(void)osize; /* not used */
if (nsize == 0) {
@ -973,24 +914,21 @@ static void *l_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
}
static int panic(lua_State *L)
{
static int panic(lua_State *L) {
luai_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
lua_tostring(L, -1));
return 0; /* return to Lua to abort */
}
LUALIB_API lua_State *luaL_newstate(void)
{
LUALIB_API lua_State *luaL_newstate(void) {
lua_State *L = lua_newstate(l_alloc, NULL);
if (L) lua_atpanic(L, &panic);
return L;
}
LUALIB_API void luaL_checkversion_(lua_State *L, lua_Number ver)
{
LUALIB_API void luaL_checkversion_(lua_State *L, lua_Number ver) {
const lua_Number *v = lua_version(L);
if (v != lua_version(NULL))
luaL_error(L, "multiple Lua VMs detected");
@ -1000,7 +938,7 @@ LUALIB_API void luaL_checkversion_(lua_State *L, lua_Number ver)
/* check conversions number -> integer types */
lua_pushnumber(L, -(lua_Number)0x1234);
if (lua_tointeger(L, -1) != -0x1234 ||
lua_tounsigned(L, -1) != (lua_Unsigned) - 0x1234)
lua_tounsigned(L, -1) != (lua_Unsigned) - 0x1234)
luaL_error(L, "bad conversion number->int;"
" must recompile Lua with proper settings");
lua_pop(L, 1);