CVS commit: src/external/mit/lua/dist/src

[Guilherme Salazar]

Module Name:    src
Committed By:   salazar
Date:           Thu Sep  8 02:53:39 UTC 2016

Modified Files:
        src/external/mit/lua/dist/src: lparser.c

Log Message:
fix bug 1 reported on www.lua.org/bugs.html


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lparser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/external/mit/lua/dist/src/lparser.c
diff -u src/external/mit/lua/dist/src/lparser.c:1.6 src/external/mit/lua/dist/src/lparser.c:1.7
--- src/external/mit/lua/dist/src/lparser.c:1.6	Thu Sep  8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lparser.c	Thu Sep  8 02:53:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lparser.c,v 1.6 2016/09/08 02:21:31 salazar Exp $	*/
+/*	$NetBSD: lparser.c,v 1.7 2016/09/08 02:53:39 salazar Exp $	*/
 
 /*
 ** Id: lparser.c,v 2.153 2016/05/13 19:10:16 roberto Exp 
@@ -327,6 +327,8 @@ static void adjust_assign (LexState *ls,
       luaK_nil(fs, reg, extra);
     }
   }
+  if (nexps > nvars)
+    ls->fs->freereg -= nexps - nvars;  /* remove extra values */
 }
 
 
@@ -1174,11 +1176,8 @@ static void assignment (LexState *ls, st
     int nexps;
     checknext(ls, '=');
     nexps = explist(ls, &e);
-    if (nexps != nvars) {
+    if (nexps != nvars)
       adjust_assign(ls, nvars, nexps, &e);
-      if (nexps > nvars)
-        ls->fs->freereg -= nexps - nvars;  /* remove extra values */
-    }
     else {
       luaK_setoneret(ls->fs, &e);  /* close last expression */
       luaK_storevar(ls->fs, &lh->v, &e);