AIR/slre
1
0
Fork 0
mirror of https://github.com/cesanta/slre.git synced 2024-11-24 03:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed https://github.com/cesanta/slre/issues/6

Browse Source
This commit is contained in:
Sergey Lyubka 2013-10-17 07:30:46 -07:00
parent b017911490
commit ca79a93d07
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
slre.c
View File

@ -218,17 +218,22 @@ static int bar(const char *re, int re_len, const char *s, int s_len,
ni++;
}
while ((n1 = bar(re + i, step, s + j2, s_len - j2, info, bi)) > 0) {
do {
n1 = bar(re + i, step, s + j2, s_len - j2, info, bi);
j2 += n1 > 0 ? n1 : 0;
if (re[i + step] == '+' && n1 < 0) break;
if (ni >= re_len) {
/* After quantifier, there is nothing */
nj = j2 + n1;
} else if ((n2 = bar(re + ni, re_len - ni, s + j2 + n1,
s_len - (j2 + n1), info, bi)) >= 0) {
nj = j2 + n1 + n2;
nj = j2;
} else if ((n2 = bar(re + ni, re_len - ni, s + j2,
s_len - j2, info, bi)) >= 0) {
/* Regex after quantifier matched */
nj = j2 + n2;
}
if (nj > j && non_greedy) break;
j2 += n1;
}
} while (n1 > 0);
DBG(("STAR/PLUS END: %d %d %d\n", j, nj, re_len - ni));
FAIL_IF(re[i + step] == '+' && nj == j, SLRE_NO_MATCH);