GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-02-04 06:13:04 +08:00
Code Issues Projects Releases Wiki Activity

details (avoid 'lint' warnings)

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2015-03-28 16:14:47 -03:00
parent b436ed58a3
commit e723c75c02
7 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lapi.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lapi.c,v 2.246 2015/02/11 18:47:22 roberto Exp $ ** $Id: lapi.c,v 2.247 2015/03/06 19:49:50 roberto Exp roberto $
** Lua API ** Lua API
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -160,7 +160,7 @@ LUA_API const lua_Number *lua_version (lua_State *L) {
LUA_API int lua_absindex (lua_State *L, int idx) { LUA_API int lua_absindex (lua_State *L, int idx) {
return (idx > 0 || ispseudo(idx)) return (idx > 0 || ispseudo(idx))
? idx ? idx
: cast_int(L->top - L->ci->func + idx); : cast_int(L->top - L->ci->func) + idx;
} }

4
lbaselib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lbaselib.c,v 1.308 2014/12/08 15:26:55 roberto Exp roberto $ ** $Id: lbaselib.c,v 1.309 2014/12/10 12:26:42 roberto Exp roberto $
** Basic library ** Basic library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -55,7 +55,7 @@ static const char *b_str2int (const char *s, int base, lua_Integer *pn) {
return NULL; return NULL;
do { do {
int digit = (isdigit((unsigned char)*s)) ? *s - '0' int digit = (isdigit((unsigned char)*s)) ? *s - '0'
: toupper((unsigned char)*s) - 'A' + 10; : (toupper((unsigned char)*s) - 'A') + 10;
if (digit >= base) return NULL; /* invalid numeral */ if (digit >= base) return NULL; /* invalid numeral */
n = n * base + digit; n = n * base + digit;
s++; s++;

10
lcode.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lcode.c,v 2.98 2014/12/19 13:36:32 roberto Exp roberto $ ** $Id: lcode.c,v 2.99 2014/12/29 16:49:25 roberto Exp roberto $
** Code generator for Lua ** Code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -573,8 +573,8 @@ int luaK_exp2RK (FuncState *fs, expdesc *e) {
case VKFLT: { case VKFLT: {
e->u.info = luaK_numberK(fs, e->u.nval); e->u.info = luaK_numberK(fs, e->u.nval);
e->k = VK; e->k = VK;
/* go through */
} }
/* FALLTHROUGH */
case VK: { case VK: {
vk: vk:
if (e->u.info <= MAXINDEXRK) /* constant fits in 'argC'? */ if (e->u.info <= MAXINDEXRK) /* constant fits in 'argC'? */
@ -793,7 +793,7 @@ static int constfolding (FuncState *fs, int op, expdesc *e1, expdesc *e2) {
static void codeexpval (FuncState *fs, OpCode op, static void codeexpval (FuncState *fs, OpCode op,
expdesc *e1, expdesc *e2, int line) { expdesc *e1, expdesc *e2, int line) {
lua_assert(op >= OP_ADD); lua_assert(op >= OP_ADD);
if (op <= OP_BNOT && constfolding(fs, op - OP_ADD + LUA_OPADD, e1, e2)) if (op <= OP_BNOT && constfolding(fs, (op - OP_ADD) + LUA_OPADD, e1, e2))
return; /* result has been folded */ return; /* result has been folded */
else { else {
int o1, o2; int o1, o2;
@ -920,11 +920,11 @@ void luaK_posfix (FuncState *fs, BinOpr op,
break; break;
} }
case OPR_EQ: case OPR_LT: case OPR_LE: { case OPR_EQ: case OPR_LT: case OPR_LE: {
codecomp(fs, cast(OpCode, op - OPR_EQ + OP_EQ), 1, e1, e2); codecomp(fs, cast(OpCode, (op - OPR_EQ) + OP_EQ), 1, e1, e2);
break; break;
} }
case OPR_NE: case OPR_GT: case OPR_GE: { case OPR_NE: case OPR_GT: case OPR_GE: {
codecomp(fs, cast(OpCode, op - OPR_NE + OP_EQ), 0, e1, e2); codecomp(fs, cast(OpCode, (op - OPR_NE) + OP_EQ), 0, e1, e2);
break; break;
} }
default: lua_assert(0); default: lua_assert(0);

8
ldebug.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ldebug.c,v 2.112 2015/03/06 19:49:50 roberto Exp roberto $ ** $Id: ldebug.c,v 2.113 2015/03/11 16:10:41 roberto Exp roberto $
** Debug Interface ** Debug Interface
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -126,7 +126,7 @@ static const char *upvalname (Proto *p, int uv) {
static const char *findvararg (CallInfo *ci, int n, StkId *pos) { static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
int nparams = clLvalue(ci->func)->p->numparams; int nparams = clLvalue(ci->func)->p->numparams;
if (n >= ci->u.l.base - ci->func - nparams) if (n >= cast_int(ci->u.l.base - ci->func) - nparams)
return NULL; /* no such vararg */ return NULL; /* no such vararg */
else { else {
*pos = ci->func + nparams + n; *pos = ci->func + nparams + n;
@ -172,7 +172,7 @@ LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0); name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0);
} }
else { /* active function; get information through 'ar' */ else { /* active function; get information through 'ar' */
StkId pos = 0; /* to avoid warnings */ StkId pos = NULL; /* to avoid warnings */
name = findlocal(L, ar->i_ci, n, &pos); name = findlocal(L, ar->i_ci, n, &pos);
if (name) { if (name) {
setobj2s(L, L->top, pos); setobj2s(L, L->top, pos);
@ -186,7 +186,7 @@ LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) { LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
StkId pos = 0; /* to avoid warnings */ StkId pos = NULL; /* to avoid warnings */
const char *name; const char *name;
lua_lock(L); lua_lock(L);
swapextra(L); swapextra(L);

12
llex.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 2.89 2014/11/14 16:06:09 roberto Exp roberto $ ** $Id: llex.c,v 2.90 2015/03/03 18:17:04 roberto Exp roberto $
** Lexical Analyzer ** Lexical Analyzer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -283,8 +283,9 @@ static int read_numeral (LexState *ls, SemInfo *seminfo) {
/* /*
** skip a sequence '[=*[' or ']=*]' and return its number of '='s or ** skip a sequence '[=*[' or ']=*]'; if sequence is wellformed, return
** -1 if sequence is malformed ** its number of '='s; otherwise, return a negative number (-1 iff there
** are no '='s after initial bracket)
*/ */
static int skip_sep (LexState *ls) { static int skip_sep (LexState *ls) {
int count = 0; int count = 0;
@ -501,8 +502,9 @@ static int llex (LexState *ls, SemInfo *seminfo) {
read_long_string(ls, seminfo, sep); read_long_string(ls, seminfo, sep);
return TK_STRING; return TK_STRING;
} }
else if (sep == -1) return '['; else if (sep != -1) /* '[=...' missing second bracket */
else lexerror(ls, "invalid long string delimiter", TK_STRING); lexerror(ls, "invalid long string delimiter", TK_STRING);
return '[';
} }
case '=': { case '=': {
next(ls); next(ls);

10
lobject.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lobject.c,v 2.101 2014/12/26 14:43:45 roberto Exp roberto $ ** $Id: lobject.c,v 2.102 2015/02/05 17:15:33 roberto Exp roberto $
** Some generic functions over Lua objects ** Some generic functions over Lua objects
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -150,13 +150,13 @@ void luaO_arith (lua_State *L, int op, const TValue *p1, const TValue *p2,
} }
/* could not perform raw operation; try metamethod */ /* could not perform raw operation; try metamethod */
lua_assert(L != NULL); /* should not fail when folding (compile time) */ lua_assert(L != NULL); /* should not fail when folding (compile time) */
luaT_trybinTM(L, p1, p2, res, cast(TMS, op - LUA_OPADD + TM_ADD)); luaT_trybinTM(L, p1, p2, res, cast(TMS, (op - LUA_OPADD) + TM_ADD));
} }
int luaO_hexavalue (int c) { int luaO_hexavalue (int c) {
if (lisdigit(c)) return c - '0'; if (lisdigit(c)) return c - '0';
else return ltolower(c) - 'a' + 10; else return (ltolower(c) - 'a') + 10;
} }
@ -243,7 +243,7 @@ static const char *l_str2d (const char *s, lua_Number *result) {
*result = lua_strx2number(s, &endptr); *result = lua_strx2number(s, &endptr);
else else
*result = lua_str2number(s, &endptr); *result = lua_str2number(s, &endptr);
if (endptr == s) return 0; /* nothing recognized */ if (endptr == s) return NULL; /* nothing recognized */
while (lisspace(cast_uchar(*endptr))) endptr++; while (lisspace(cast_uchar(*endptr))) endptr++;
return (*endptr == '\0' ? endptr : NULL); /* OK if no trailing characters */ return (*endptr == '\0' ? endptr : NULL); /* OK if no trailing characters */
} }
@ -289,7 +289,7 @@ size_t luaO_str2num (const char *s, TValue *o) {
} }
else else
return 0; /* conversion failed */ return 0; /* conversion failed */
return (e - s + 1); /* success; return string size */ return (e - s) + 1; /* success; return string size */
} }

24
lstrlib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lstrlib.c,v 1.225 2015/02/05 17:50:24 roberto Exp roberto $ ** $Id: lstrlib.c,v 1.226 2015/02/09 18:05:46 roberto Exp roberto $
** Standard library for string operations and pattern-matching ** Standard library for string operations and pattern-matching
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -70,7 +70,7 @@ static int str_sub (lua_State *L) {
if (start < 1) start = 1; if (start < 1) start = 1;
if (end > (lua_Integer)l) end = l; if (end > (lua_Integer)l) end = l;
if (start <= end) if (start <= end)
lua_pushlstring(L, s + start - 1, (size_t)(end - start + 1)); lua_pushlstring(L, s + start - 1, (size_t)(end - start) + 1);
else lua_pushliteral(L, ""); else lua_pushliteral(L, "");
return 1; return 1;
} }
@ -149,9 +149,9 @@ static int str_byte (lua_State *L) {
if (posi < 1) posi = 1; if (posi < 1) posi = 1;
if (pose > (lua_Integer)l) pose = l; if (pose > (lua_Integer)l) pose = l;
if (posi > pose) return 0; /* empty interval; return no values */ if (posi > pose) return 0; /* empty interval; return no values */
n = (int)(pose - posi + 1); if (pose - posi >= INT_MAX) /* arithmetic overflow? */
if (posi + n <= pose) /* arithmetic overflow? */
return luaL_error(L, "string slice too long"); return luaL_error(L, "string slice too long");
n = (int)(pose - posi) + 1;
luaL_checkstack(L, n, "string slice too long"); luaL_checkstack(L, n, "string slice too long");
for (i=0; i<n; i++) for (i=0; i<n; i++)
lua_pushinteger(L, uchar(s[posi+i-1])); lua_pushinteger(L, uchar(s[posi+i-1]));
@ -499,7 +499,7 @@ static const char *match (MatchState *ms, const char *s, const char *p) {
} }
case '+': /* 1 or more repetitions */ case '+': /* 1 or more repetitions */
s++; /* 1 match already done */ s++; /* 1 match already done */
/* go through */ /* FALLTHROUGH */
case '*': /* 0 or more repetitions */ case '*': /* 0 or more repetitions */
s = max_expand(ms, s, p, ep); s = max_expand(ms, s, p, ep);
break; break;
@ -554,7 +554,7 @@ static void push_onecapture (MatchState *ms, int i, const char *s,
ptrdiff_t l = ms->capture[i].len; ptrdiff_t l = ms->capture[i].len;
if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture"); if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
if (l == CAP_POSITION) if (l == CAP_POSITION)
lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1); lua_pushinteger(ms->L, (ms->capture[i].init - ms->src_init) + 1);
else else
lua_pushlstring(ms->L, ms->capture[i].init, l); lua_pushlstring(ms->L, ms->capture[i].init, l);
} }
@ -598,8 +598,8 @@ static int str_find_aux (lua_State *L, int find) {
/* do a plain search */ /* do a plain search */
const char *s2 = lmemfind(s + init - 1, ls - (size_t)init + 1, p, lp); const char *s2 = lmemfind(s + init - 1, ls - (size_t)init + 1, p, lp);
if (s2) { if (s2) {
lua_pushinteger(L, s2 - s + 1); lua_pushinteger(L, (s2 - s) + 1);
lua_pushinteger(L, s2 - s + lp); lua_pushinteger(L, (s2 - s) + lp);
return 2; return 2;
} }
} }
@ -621,7 +621,7 @@ static int str_find_aux (lua_State *L, int find) {
lua_assert(ms.matchdepth == MAXCCALLS); lua_assert(ms.matchdepth == MAXCCALLS);
if ((res=match(&ms, s1, p)) != NULL) { if ((res=match(&ms, s1, p)) != NULL) {
if (find) { if (find) {
lua_pushinteger(L, s1 - s + 1); /* start */ lua_pushinteger(L, (s1 - s) + 1); /* start */
lua_pushinteger(L, res - s); /* end */ lua_pushinteger(L, res - s); /* end */
return push_captures(&ms, NULL, 0) + 2; return push_captures(&ms, NULL, 0) + 2;
} }
@ -935,8 +935,8 @@ static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
if (isdigit(uchar(*p))) if (isdigit(uchar(*p)))
luaL_error(L, "invalid format (width or precision too long)"); luaL_error(L, "invalid format (width or precision too long)");
*(form++) = '%'; *(form++) = '%';
memcpy(form, strfrmt, (p - strfrmt + 1) * sizeof(char)); memcpy(form, strfrmt, ((p - strfrmt) + 1) * sizeof(char));
form += p - strfrmt + 1; form += (p - strfrmt) + 1;
*form = '\0'; *form = '\0';
return p; return p;
} }
@ -1335,7 +1335,7 @@ static int str_pack (lua_State *L) {
totalsize += len + 1; totalsize += len + 1;
break; break;
} }
case Kpadding: luaL_addchar(&b, LUA_PACKPADBYTE); /* go through */ case Kpadding: luaL_addchar(&b, LUA_PACKPADBYTE); /* FALLTHROUGH */
case Kpaddalign: case Knop: case Kpaddalign: case Knop:
arg--; /* undo increment */ arg--; /* undo increment */
break; break;