diff options
| -rw-r--r-- | lparser.c | 9 |
1 files changed, 4 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lparser.c,v 2.152 2016/03/07 19:25:39 roberto Exp roberto $ | 2 | ** $Id: lparser.c,v 2.153 2016/05/13 19:10:16 roberto Exp roberto $ |
| 3 | ** Lua Parser | 3 | ** Lua Parser |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -323,6 +323,8 @@ static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) { | |||
| 323 | luaK_nil(fs, reg, extra); | 323 | luaK_nil(fs, reg, extra); |
| 324 | } | 324 | } |
| 325 | } | 325 | } |
| 326 | if (nexps > nvars) | ||
| 327 | ls->fs->freereg -= nexps - nvars; /* remove extra values */ | ||
| 326 | } | 328 | } |
| 327 | 329 | ||
| 328 | 330 | ||
| @@ -1160,11 +1162,8 @@ static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) { | |||
| 1160 | int nexps; | 1162 | int nexps; |
| 1161 | checknext(ls, '='); | 1163 | checknext(ls, '='); |
| 1162 | nexps = explist(ls, &e); | 1164 | nexps = explist(ls, &e); |
| 1163 | if (nexps != nvars) { | 1165 | if (nexps != nvars) |
| 1164 | adjust_assign(ls, nvars, nexps, &e); | 1166 | adjust_assign(ls, nvars, nexps, &e); |
| 1165 | if (nexps > nvars) | ||
| 1166 | ls->fs->freereg -= nexps - nvars; /* remove extra values */ | ||
| 1167 | } | ||
| 1168 | else { | 1167 | else { |
| 1169 | luaK_setoneret(ls->fs, &e); /* close last expression */ | 1168 | luaK_setoneret(ls->fs, &e); /* close last expression */ |
| 1170 | luaK_storevar(ls->fs, &lh->v, &e); | 1169 | luaK_storevar(ls->fs, &lh->v, &e); |
