diff options
author | daurnimator <quae@daurnimator.com> | 2017-12-10 02:08:53 +1100 |
---|---|---|
committer | daurnimator <quae@daurnimator.com> | 2017-12-10 02:36:36 +1100 |
commit | 562ad6f874564c3770d096711f443b49f59ef686 (patch) | |
tree | 910d919dcee89c71eaeeec8465152add19dc4e9f /src/lobject.js | |
parent | 54c4a6a66778466630cca7a9223c760942c7ab70 (diff) | |
download | fengari-562ad6f874564c3770d096711f443b49f59ef686.tar.gz fengari-562ad6f874564c3770d096711f443b49f59ef686.tar.bz2 fengari-562ad6f874564c3770d096711f443b49f59ef686.zip |
src/: Fix some linter complaints
Diffstat (limited to 'src/lobject.js')
-rw-r--r-- | src/lobject.js | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/lobject.js b/src/lobject.js index 8754e20..97b0514 100644 --- a/src/lobject.js +++ b/src/lobject.js @@ -417,7 +417,7 @@ const lua_str2number = function(s) { return null; } /* parseFloat ignores trailing junk, validate with regex first */ - if (!/^[\t\v\f \n\r]*[\+\-]?([0-9]+\.?[0-9]*|\.[0-9]*)([eE][\+\-]?[0-9]+)?[\t\v\f \n\r]*$/.test(s)) + if (!/^[\t\v\f \n\r]*[+-]?([0-9]+\.?[0-9]*|\.[0-9]*)([eE][+-]?[0-9]+)?[\t\v\f \n\r]*$/.test(s)) return null; let flt = parseFloat(s); return !isNaN(flt) ? flt : null; @@ -539,23 +539,25 @@ const luaO_pushvfstring = function(L, fmt, argp) { let i = 0; let a = 0; let e; - while (1) { + for (;;) { e = fmt.indexOf(char['%'], i); if (e == -1) break; pushstr(L, fmt.slice(i, e)); switch(fmt[e+1]) { - case char['s']: + case char['s']: { let s = argp[a++]; if (s === null) s = defs.to_luastring("(null)", true); pushstr(L, s); break; - case char['c']: + } + case char['c']: { let buff = argp[a++]; if (ljstype.lisprint(buff)) pushstr(L, [buff]); else luaO_pushfstring(L, defs.to_luastring("<\\%d>", true), buff); break; + } case char['d']: case char['I']: ldo.luaD_inctop(L); @@ -567,7 +569,7 @@ const luaO_pushvfstring = function(L, fmt, argp) { L.stack[L.top-1].setfltvalue(argp[a++]); luaO_tostring(L, L.stack[L.top-1]); break; - case char['p']: + case char['p']: { let v = argp[a++]; if (v instanceof lstate.lua_State || v instanceof ltable.Table || @@ -581,15 +583,15 @@ const luaO_pushvfstring = function(L, fmt, argp) { pushstr(L, defs.to_luastring("<id NYI>")); } break; + } case char['U']: pushstr(L, defs.to_luastring(String.fromCodePoint(argp[a++]))); break; case char['%']: pushstr(L, [char['%']]); break; - default: { + default: ldebug.luaG_runerror(L, defs.to_luastring("invalid option '%%%c' to 'lua_pushfstring'"), fmt[e + 1]); - } } n += 2; i = e + 2; |