diff options
| author | Mike Pall <mike> | 2022-06-08 15:35:12 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-06-08 15:35:12 +0200 |
| commit | 7dc3850e78493eed1e85fa7bc0b96068ae7fb9f4 (patch) | |
| tree | 35b258b5d77d3f861de2765c6ca08a6c352ce66c /src/host | |
| parent | fd86c924b9810cfb3034b03d08a2b77e243639c3 (diff) | |
| download | luajit-7dc3850e78493eed1e85fa7bc0b96068ae7fb9f4.tar.gz luajit-7dc3850e78493eed1e85fa7bc0b96068ae7fb9f4.tar.bz2 luajit-7dc3850e78493eed1e85fa7bc0b96068ae7fb9f4.zip | |
Fix warnings in minilua.c.
Diffstat (limited to 'src/host')
| -rw-r--r-- | src/host/genminilua.lua | 7 | ||||
| -rw-r--r-- | 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) | |||
| 327 | return gsub(src, "ZY([%w_]+)", "union %1") | 327 | return gsub(src, "ZY([%w_]+)", "union %1") |
| 328 | end | 328 | end |
| 329 | 329 | ||
| 330 | local function fix_bugs_and_warnings(src) | ||
| 331 | src = gsub(src, "(luaD_checkstack%(L,p%->maxstacksize)%)", "%1+p->numparams)") | ||
| 332 | src = gsub(src, "if%(sep==%-1%)(return'%[';)\nelse (luaX_lexerror%b();)", "if (sep!=-1)%2\n%1") | ||
| 333 | return gsub(src, "(default:{\nNode%*n=mainposition)", "/*fallthrough*/\n%1") | ||
| 334 | end | ||
| 335 | |||
| 330 | local function func_gather(src) | 336 | local function func_gather(src) |
| 331 | local nodes, list = {}, {} | 337 | local nodes, list = {}, {} |
| 332 | local pos, len = 1, #src | 338 | local pos, len = 1, #src |
| @@ -425,5 +431,6 @@ src = rename_tokens1(src) | |||
| 425 | src = func_collect(src) | 431 | src = func_collect(src) |
| 426 | src = rename_tokens2(src) | 432 | src = rename_tokens2(src) |
| 427 | src = restore_strings(src) | 433 | src = restore_strings(src) |
| 434 | src = fix_bugs_and_warnings(src) | ||
| 428 | src = merge_header(src, license) | 435 | src = merge_header(src, license) |
| 429 | io.write(src) | 436 | 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); | |||
| 1639 | if(luai_numeq(cast_num(k),nvalue(key))) | 1639 | if(luai_numeq(cast_num(k),nvalue(key))) |
| 1640 | return luaH_getnum(t,k); | 1640 | return luaH_getnum(t,k); |
| 1641 | } | 1641 | } |
| 1642 | /*fallthrough*/ | ||
| 1642 | default:{ | 1643 | default:{ |
| 1643 | Node*n=mainposition(t,key); | 1644 | Node*n=mainposition(t,key); |
| 1644 | do{ | 1645 | do{ |
| @@ -2905,8 +2906,8 @@ if(sep>=0){ | |||
| 2905 | read_long_string(ls,seminfo,sep); | 2906 | read_long_string(ls,seminfo,sep); |
| 2906 | return TK_STRING; | 2907 | return TK_STRING; |
| 2907 | } | 2908 | } |
| 2908 | else if(sep==-1)return'['; | 2909 | else if (sep!=-1)luaX_lexerror(ls,"invalid long string delimiter",TK_STRING); |
| 2909 | else luaX_lexerror(ls,"invalid long string delimiter",TK_STRING); | 2910 | return'['; |
| 2910 | } | 2911 | } |
| 2911 | case'=':{ | 2912 | case'=':{ |
| 2912 | next(ls); | 2913 | next(ls); |
