[src/trunk]: src/external/mit/lua/dist/src Apply second and third patch from ...

[mbalmer <mbalmer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/78411cb81542
branches:  trunk
changeset: 344375:78411cb81542
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Fri Mar 25 08:15:20 2016 +0000

description:
Apply second and third patch from http://lua.org/bugs.html.

diffstat:

 external/mit/lua/dist/src/lparser.c |  4 ++--
 external/mit/lua/dist/src/lstrlib.c |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r c230d69a9d29 -r 78411cb81542 external/mit/lua/dist/src/lparser.c
--- a/external/mit/lua/dist/src/lparser.c       Fri Mar 25 07:48:16 2016 +0000
+++ b/external/mit/lua/dist/src/lparser.c       Fri Mar 25 08:15:20 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lparser.c,v 1.4 2016/01/28 14:41:39 lneto Exp $        */
+/*     $NetBSD: lparser.c,v 1.5 2016/03/25 08:15:20 mbalmer Exp $      */
 
 /*
 ** Id: lparser.c,v 2.149 2015/11/02 16:09:30 roberto Exp 
@@ -1240,7 +1240,7 @@
   checkrepeated(fs, ll, label);  /* check for repeated labels */
   checknext(ls, TK_DBCOLON);  /* skip double colon */
   /* create new entry for this label */
-  l = newlabelentry(ls, ll, label, line, fs->pc);
+  l = newlabelentry(ls, ll, label, line, luaK_getlabel(fs));
   skipnoopstat(ls);  /* skip other no-op statements */
   if (block_follow(ls, 0)) {  /* label is last no-op statement in the block? */
     /* assume that locals are already out of scope */
diff -r c230d69a9d29 -r 78411cb81542 external/mit/lua/dist/src/lstrlib.c
--- a/external/mit/lua/dist/src/lstrlib.c       Fri Mar 25 07:48:16 2016 +0000
+++ b/external/mit/lua/dist/src/lstrlib.c       Fri Mar 25 08:15:20 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lstrlib.c,v 1.11 2016/01/28 14:41:39 lneto Exp $       */
+/*     $NetBSD: lstrlib.c,v 1.12 2016/03/25 08:15:20 mbalmer Exp $     */
 
 /*
 ** Id: lstrlib.c,v 1.239 2015/11/25 16:28:17 roberto Exp 
@@ -692,6 +692,7 @@
 static int gmatch_aux (lua_State *L) {
   GMatchState *gm = (GMatchState *)lua_touserdata(L, lua_upvalueindex(3));
   const char *src;
+  gm->ms.L = L;
   for (src = gm->src; src <= gm->ms.src_end; src++) {
     const char *e;
     reprepstate(&gm->ms);