open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #15 from Enyby/patch-7

Browse Source 
Fix gmatch for pass testsuites
This commit was merged in pull request #15.
This commit is contained in:
Benjamin P. Jung
2018-09-14 12:13:34 +02:00
committed by GitHub
parent 69498dbb7c 27a1dcdd11
commit bf8ef8d1a9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/org/luaj/vm2/lib/StringLib.java
View File

@@ -525,12 +525,13 @@ public class StringLib extends TwoArgFunction {
this.soffset = 0; this.soffset = 0;
} }
public Varargs invoke(Varargs args) { public Varargs invoke(Varargs args) {
for ( ; soffset<srclen; soffset++ ) { for ( ; soffset<=srclen; soffset++ ) {
ms.reset(); ms.reset();
int res = ms.match(soffset, 0); int res = ms.match(soffset, 0);
if ( res >=0 ) { if ( res >=0 ) {
int soff = soffset; int soff = soffset;
soffset = res; soffset = res;
if (soff == res) soffset++; /* empty match? go at least one position */
return ms.push_captures( true, soff, res ); return ms.push_captures( true, soff, res );
} }
} }