diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2015-06-25 11:00:01 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2015-06-25 11:00:01 -0300 |
| commit | f01c12c8917ab2ac9ef6a491374e06ac0611ab92 (patch) | |
| tree | 80149fdcbf3d6e64eb1ef74437d4797236c14c71 /lvm.c | |
| parent | 5aabb7a89172b74097faa8f34a6a6520d839bde6 (diff) | |
| download | lua-f01c12c8917ab2ac9ef6a491374e06ac0611ab92.tar.gz lua-f01c12c8917ab2ac9ef6a491374e06ac0611ab92.tar.bz2 lua-f01c12c8917ab2ac9ef6a491374e06ac0611ab92.zip | |
detail (cast to avoid mixing types in conditional expression)
Diffstat (limited to 'lvm.c')
| -rw-r--r-- | lvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lvm.c,v 2.244 2015/06/02 19:11:24 roberto Exp roberto $ | 2 | ** $Id: lvm.c,v 2.245 2015/06/09 15:53:35 roberto Exp roberto $ |
| 3 | ** Lua virtual machine | 3 | ** Lua virtual machine |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -1125,7 +1125,7 @@ void luaV_execute (lua_State *L) { | |||
| 1125 | vmcase(OP_RETURN) { | 1125 | vmcase(OP_RETURN) { |
| 1126 | int b = GETARG_B(i); | 1126 | int b = GETARG_B(i); |
| 1127 | if (cl->p->sizep > 0) luaF_close(L, base); | 1127 | if (cl->p->sizep > 0) luaF_close(L, base); |
| 1128 | b = luaD_poscall(L, ra, (b != 0 ? b - 1 : L->top - ra)); | 1128 | b = luaD_poscall(L, ra, (b != 0 ? b - 1 : cast_int(L->top - ra))); |
| 1129 | if (!(ci->callstatus & CIST_REENTRY)) /* 'ci' still the called one */ | 1129 | if (!(ci->callstatus & CIST_REENTRY)) /* 'ci' still the called one */ |
| 1130 | return; /* external invocation: return */ | 1130 | return; /* external invocation: return */ |
| 1131 | else { /* invocation via reentry: continue execution */ | 1131 | else { /* invocation via reentry: continue execution */ |