diff options
author | Maximilian Szengel <gnunet@maxsz.de> | 2012-07-04 13:54:43 +0000 |
---|---|---|
committer | Maximilian Szengel <gnunet@maxsz.de> | 2012-07-04 13:54:43 +0000 |
commit | bd0e2cd49ae9ae916f6a4288ac8893128b8168d6 (patch) | |
tree | c680e35f3d2bb3cffb114808bd19f2299885af50 /src/regex/test_regex_eval_api.c | |
parent | a93954693fef730d7a41c168b4961d19e5dff90c (diff) | |
download | gnunet-bd0e2cd49ae9ae916f6a4288ac8893128b8168d6.tar.gz gnunet-bd0e2cd49ae9ae916f6a4288ac8893128b8168d6.zip |
Summary: regex cleanup and bugfixes
Author: szengel
Diffstat (limited to 'src/regex/test_regex_eval_api.c')
-rw-r--r-- | src/regex/test_regex_eval_api.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c index 5a6575c86..37fd38c0d 100644 --- a/src/regex/test_regex_eval_api.c +++ b/src/regex/test_regex_eval_api.c | |||
@@ -227,7 +227,7 @@ main (int argc, char *argv[]) | |||
227 | int check_rand; | 227 | int check_rand; |
228 | char *check_proof; | 228 | char *check_proof; |
229 | 229 | ||
230 | struct Regex_String_Pair rxstr[14] = { | 230 | struct Regex_String_Pair rxstr[16] = { |
231 | {"ab?(abcd)?", 5, | 231 | {"ab?(abcd)?", 5, |
232 | {"ababcd", "abab", "aabcd", "a", "abb"}, | 232 | {"ababcd", "abab", "aabcd", "a", "abb"}, |
233 | {match, nomatch, match, match, nomatch}}, | 233 | {match, nomatch, match, match, nomatch}}, |
@@ -270,6 +270,12 @@ main (int argc, char *argv[]) | |||
270 | {"(ab|c)+", 7, | 270 | {"(ab|c)+", 7, |
271 | {"", "ab", "c", "abc", "ababcc", "acc", "abac"}, | 271 | {"", "ab", "c", "abc", "ababcc", "acc", "abac"}, |
272 | {nomatch, match, match, match, match, nomatch, nomatch}}, | 272 | {nomatch, match, match, match, match, nomatch, nomatch}}, |
273 | {"((j|2j)K|(j|2j)AK|(j|2j)(D|e|(j|2j)A(D|e))D*K)", 1, | ||
274 | {"", "2j2jADK", "j2jADK"}, | ||
275 | {nomatch, match, match}}, | ||
276 | {"((j|2j)K|(j|2j)(D|e|((j|2j)j|(j|2j)2j)A(D|e))D*K|(j|2j)AK)", 2, | ||
277 | {"", "2j2jjADK", "j2jADK"}, | ||
278 | {nomatch, match, match}}, | ||
273 | {"ab(c|d)+c*(a(b|c)d)+", 1, | 279 | {"ab(c|d)+c*(a(b|c)d)+", 1, |
274 | {"abacd"}, | 280 | {"abacd"}, |
275 | {nomatch}} | 281 | {nomatch}} |
@@ -279,7 +285,7 @@ main (int argc, char *argv[]) | |||
279 | check_dfa = 0; | 285 | check_dfa = 0; |
280 | check_rand = 0; | 286 | check_rand = 0; |
281 | 287 | ||
282 | for (i = 0; i < 14; i++) | 288 | for (i = 0; i < 16; i++) |
283 | { | 289 | { |
284 | if (0 != regcomp (&rx, rxstr[i].regex, REG_EXTENDED)) | 290 | if (0 != regcomp (&rx, rxstr[i].regex, REG_EXTENDED)) |
285 | { | 291 | { |