Fritz/regex
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

..

No commits in common. "0448ebed7a6d1e1d306d35aedfe5b4027b26d4c9" and "27bfbe6ef4606f5bee80e89984be23d2d626839d" have entirely different histories.
0448ebed7a ... 27bfbe6ef4

1 changed files with 20 additions and 18 deletions

38
regex.c
View file

@ -73,12 +73,14 @@ char *next_char(char *needle)
int db; int db;
if (*needle && *needle != '[') if (*needle && *needle != '[')
return needle + 1; return needle + 1;
for (db = 1; for (db = (*needle == '[' ? 2 : 0);
*needle && (*needle != ']' || db); *needle && (*needle != ']' || db);
needle++) needle++)
if (db) {
if (db > 1)
db--; db--;
return needle + 1; }
return needle;
} }
// Find first character behind the closing parenthesis of the current group, or end of string // Find first character behind the closing parenthesis of the current group, or end of string
@ -151,18 +153,7 @@ bool regex_match(char *haystack, char *needle)
if (!bv[st]) if (!bv[st])
continue; continue;
fprintf(stderr, "prepr %lu: \"%s\"\n", st, needle + st); fprintf(stderr, "prepr %lu: \"%s\"\n", st, needle + st);
if (needle[st] == '(') if (needle[st] == '|')
{
// at start of group, look at variants and quantifier
for (var = needle + st + 1; *var && *var != ')'; var = next_var(var))
bv[var - needle] = true;
if (*var == ')')
var++;
q = quant(*var);
if (strchr("*?", q))
bv[var + 1 - needle] = true;
}
else if (needle[st] == '|')
{ {
// at end of variant, look at end of group // at end of variant, look at end of group
bv[st] = false; bv[st] = false;
@ -182,7 +173,7 @@ bool regex_match(char *haystack, char *needle)
fprintf(stderr, "quant %c\n", q); fprintf(stderr, "quant %c\n", q);
fprintf(stderr, "suffix \"%s\"\n", needle + (q ? st + 2 : st + 1)); fprintf(stderr, "suffix \"%s\"\n", needle + (q ? st + 2 : st + 1));
nneedl = start_of_group(needle, needle + st); nneedl = start_of_group(needle, needle + st);
if (strchr("+*", q) && !bv[nneedl - needle]) if ((q == '+' || q == '*') && !bv[nneedl - needle])
{ {
// spicy: if the quantifier allows multiple occurences, we have to activate a previous state // spicy: if the quantifier allows multiple occurences, we have to activate a previous state
fprintf(stderr, "start of group: \"%s\"\n", nneedl); fprintf(stderr, "start of group: \"%s\"\n", nneedl);
@ -192,12 +183,23 @@ bool regex_match(char *haystack, char *needle)
else else
bv[nneedl - needle] = false; bv[nneedl - needle] = false;
} }
else if (needle[st] == '(')
{
// at start of group, look at variants and quantifier
for (var = needle + st + 1; *var && *var != ')'; var = next_var(var))
bv[var - needle] = true;
if (*var == ')')
var++;
q = quant(*var);
if (q == '*' || q == '?')
bv[var + 1 - needle] = true;
}
else else
{ {
// check if current needle is optional // check if current needle is optional
nneedl = next_char(needle + st); nneedl = next_char(needle + st);
q = *nneedl; q = *nneedl;
if (strchr("?*", q)) if (q == '*' || q == '?')
bv[nneedl + 1 - needle] = true; bv[nneedl + 1 - needle] = true;
} }
} }
@ -218,7 +220,7 @@ bool regex_match(char *haystack, char *needle)
na = false; na = false;
if (q) if (q)
nneedl++; nneedl++;
if (strchr("*+", q)) if (q == '*' || q == '+')
bv[st-1] = true; bv[st-1] = true;
bv[nneedl - needle] = true; bv[nneedl - needle] = true;
} }