rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug: 'gmatch' iterator fails when called from a coroutine different 

from the one that created it
This commit is contained in:
Roberto Ierusalimschy 2016-03-23 14:12:17 -03:00
parent e7b2e01d43
commit acff3ad88d
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bugs
View File

@ -3575,6 +3575,33 @@ patch = [[
}
Bug{
what = [['gmatch' iterator fails when called from a coroutine different
from the one that created it]],
report = [[Nagaev Boris, 2016/03/18]],
since = [[5.3.2]],
fix = nil,
example = [[
local f = string.gmatch("1 2 3 4 5", "%d+")
print(f()) --> 1
co = coroutine.wrap(f)
print(co()) --> ??? (should be 2)
]],
patch = [[
--- lstrlib.c 2016/02/25 19:42:55 1.240
+++ lstrlib.c 2016/03/21 17:27:07
@@ -688,14 +688,13 @@
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);
]]
}
--[=[
Bug{
what = [[ ]],

9
lstrlib.c
View File

@ -1,5 +1,5 @@
/*
** $Id: lstrlib.c,v 1.239 2015/11/25 16:28:17 roberto Exp roberto $
** $Id: lstrlib.c,v 1.240 2016/02/25 19:42:55 roberto Exp roberto $
** Standard library for string operations and pattern-matching
** See Copyright Notice in lua.h
*/
@ -688,14 +688,13 @@ typedef struct GMatchState {
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);
if ((e = match(&gm->ms, src, gm->p)) != NULL) {
if (e == src) /* empty match? */
gm->src =src + 1; /* go at least one position */
else
gm->src = e;
/* in empty matches, advance at least one position */
gm->src = (e == src) ? src + 1 : e;
return push_captures(&gm->ms, src, e);
}
}