diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2018-03-16 11:22:09 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2018-03-16 11:22:09 -0300 |
commit | 0c7738240ef81b88ded842e3a8ebfb3180bcf00c (patch) | |
tree | 6472e77d6591df2c003d6e2c7c0a5b612eac6d8e | |
parent | 7b0b6b3b3945b1adcf460321227243143d7e1543 (diff) | |
download | lua-0c7738240ef81b88ded842e3a8ebfb3180bcf00c.tar.gz lua-0c7738240ef81b88ded842e3a8ebfb3180bcf00c.tar.bz2 lua-0c7738240ef81b88ded842e3a8ebfb3180bcf00c.zip |
FALLTHROUGH comment must be last "statement"
(so it does not work when inside a block)
-rw-r--r-- | lcode.c | 5 | ||||
-rw-r--r-- | lgc.c | 6 |
2 files changed, 5 insertions, 6 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lcode.c,v 2.158 2018/02/26 14:16:05 roberto Exp roberto $ | 2 | ** $Id: lcode.c,v 2.159 2018/03/07 15:55:38 roberto Exp roberto $ |
3 | ** Code generator for Lua | 3 | ** Code generator for Lua |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -1696,8 +1696,7 @@ void luaK_finish (FuncState *fs) { | |||
1696 | break; /* no extra work */ | 1696 | break; /* no extra work */ |
1697 | /* else use OP_RETURN to do the extra work */ | 1697 | /* else use OP_RETURN to do the extra work */ |
1698 | SET_OPCODE(*pc, OP_RETURN); | 1698 | SET_OPCODE(*pc, OP_RETURN); |
1699 | /* FALLTHROUGH */ | 1699 | } /* FALLTHROUGH */ |
1700 | } | ||
1701 | case OP_RETURN: case OP_TAILCALL: { | 1700 | case OP_RETURN: case OP_TAILCALL: { |
1702 | if (p->sizep > 0 || p->is_vararg) { | 1701 | if (p->sizep > 0 || p->is_vararg) { |
1703 | SETARG_C(*pc, p->is_vararg ? p->numparams + 1 : 0); | 1702 | SETARG_C(*pc, p->is_vararg ? p->numparams + 1 : 0); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lgc.c,v 2.251 2018/02/23 13:21:27 roberto Exp roberto $ | 2 | ** $Id: lgc.c,v 2.252 2018/02/26 13:35:03 roberto Exp roberto $ |
3 | ** Garbage Collector | 3 | ** Garbage Collector |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -301,8 +301,8 @@ static void reallymarkobject (global_State *g, GCObject *o) { | |||
301 | gray2black(o); /* nothing else to mark */ | 301 | gray2black(o); /* nothing else to mark */ |
302 | break; | 302 | break; |
303 | } | 303 | } |
304 | /* else *//* FALLTHROUGH */ | 304 | /* else... */ |
305 | } | 305 | } /* FALLTHROUGH */ |
306 | case LUA_TLCL: case LUA_TCCL: case LUA_TTABLE: | 306 | case LUA_TLCL: case LUA_TCCL: case LUA_TTABLE: |
307 | case LUA_TTHREAD: case LUA_TPROTO: { | 307 | case LUA_TTHREAD: case LUA_TPROTO: { |
308 | linkobjgclist(o, g->gray); | 308 | linkobjgclist(o, g->gray); |