From 7dc3850e78493eed1e85fa7bc0b96068ae7fb9f4 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Wed, 8 Jun 2022 15:35:12 +0200 Subject: Fix warnings in minilua.c. --- src/host/genminilua.lua | 7 +++++++ src/host/minilua.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/host/genminilua.lua b/src/host/genminilua.lua index a72ef2ef..e8e86c53 100644 --- a/src/host/genminilua.lua +++ b/src/host/genminilua.lua @@ -327,6 +327,12 @@ local function rename_tokens2(src) return gsub(src, "ZY([%w_]+)", "union %1") end +local function fix_bugs_and_warnings(src) + src = gsub(src, "(luaD_checkstack%(L,p%->maxstacksize)%)", "%1+p->numparams)") + src = gsub(src, "if%(sep==%-1%)(return'%[';)\nelse (luaX_lexerror%b();)", "if (sep!=-1)%2\n%1") + return gsub(src, "(default:{\nNode%*n=mainposition)", "/*fallthrough*/\n%1") +end + local function func_gather(src) local nodes, list = {}, {} local pos, len = 1, #src @@ -425,5 +431,6 @@ src = rename_tokens1(src) src = func_collect(src) src = rename_tokens2(src) src = restore_strings(src) +src = fix_bugs_and_warnings(src) src = merge_header(src, license) io.write(src) diff --git a/src/host/minilua.c b/src/host/minilua.c index cfc7491d..76f32aed 100644 --- a/src/host/minilua.c +++ b/src/host/minilua.c @@ -1639,6 +1639,7 @@ lua_number2int(k,n); if(luai_numeq(cast_num(k),nvalue(key))) return luaH_getnum(t,k); } +/*fallthrough*/ default:{ Node*n=mainposition(t,key); do{ @@ -2905,8 +2906,8 @@ if(sep>=0){ read_long_string(ls,seminfo,sep); return TK_STRING; } -else if(sep==-1)return'['; -else luaX_lexerror(ls,"invalid long string delimiter",TK_STRING); +else if (sep!=-1)luaX_lexerror(ls,"invalid long string delimiter",TK_STRING); +return'['; } case'=':{ next(ls); -- cgit v1.2.1