RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-02-09 23:47:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

regex: rewrite the repetition parsing code

Browse Source 
The goto logic was hard to follow and modify. This is
in preparation for the BRE \+ and \? support.
This commit is contained in:
Szabolcs Nagy 2015-04-18 17:25:31 +00:00 committed by Rich Felker
parent da4cc13b97
commit 03498ec22a
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/regex/regcomp.c
View File

@ -984,41 +984,40 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx)
/* extension: repetitions are rejected after an empty node /* extension: repetitions are rejected after an empty node
eg. (+), |*, {2}, but assertions are not treated as empty eg. (+), |*, {2}, but assertions are not treated as empty
so ^* or $? are accepted currently. */ so ^* or $? are accepted currently. */
switch (*s) { for (;;) {
case '+': if (*s!='\\' && *s!='*') {
case '?': if (!ere)
if (!ere) break;
if (*s!='+' && *s!='?' && *s!='{')
break;
}
if (*s=='\\' && ere)
break; break;
/* fallthrough */ if (*s=='\\' && s[1]!='{')
case '*':; break;
int min=0, max=-1; if (*s=='\\')
if (*s == '+') s++;
min = 1;
if (*s == '?')
max = 1;
s++;
ctx->n = tre_ast_new_iter(ctx->mem, ctx->n, min, max, 0);
if (!ctx->n)
return REG_ESPACE;
/* extension: multiple consecutive *+?{,} is unspecified, /* extension: multiple consecutive *+?{,} is unspecified,
but (a+)+ has to be supported so accepting a++ makes but (a+)+ has to be supported so accepting a++ makes
sense, note however that the RE_DUP_MAX limit can be sense, note however that the RE_DUP_MAX limit can be
circumvented: (a{255}){255} uses a lot of memory.. */ circumvented: (a{255}){255} uses a lot of memory.. */
goto parse_iter; if (*s=='{') {
case '\\': err = parse_dup(ctx, s+1);
if (ere || s[1] != '{') if (err != REG_OK)
break; return err;
s++; s = ctx->s;
goto parse_brace; } else {
case '{': int min=0, max=-1;
if (!ere) if (*s == '+')
break; min = 1;
parse_brace: if (*s == '?')
err = parse_dup(ctx, s+1); max = 1;
if (err != REG_OK) s++;
return err; ctx->n = tre_ast_new_iter(ctx->mem, ctx->n, min, max, 0);
s = ctx->s; if (!ctx->n)
goto parse_iter; return REG_ESPACE;
}
} }
nbranch = tre_ast_new_catenation(ctx->mem, nbranch, ctx->n); nbranch = tre_ast_new_catenation(ctx->mem, nbranch, ctx->n);