cdo/regex-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle quantifiers in parse_term()

Browse Source
This commit is contained in:
Camden Dixie O'Brien 2024-10-25 14:59:24 +01:00
parent 80a26997b8
commit 40db26a62d
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/parser.c
View File

@ -18,6 +18,9 @@ static bool is_special(char c)
case '\\': case '\\':
case '(': case '(':
case ')': case ')':
case '*':
case '+':
case '?':
return true; return true;
default: default:
return false; return false;
@ -67,7 +70,24 @@ static int parse_term(const char *input, int rem, term_t *out)
used += result; used += result;
} }
if (used < rem) {
switch (input[used]) {
case '*':
out->quantifier = QUANTIFIER_ZERO_OR_MORE;
++used;
break;
case '+':
out->quantifier = QUANTIFIER_ONE_OR_MORE;
++used;
break;
case '?':
out->quantifier = QUANTIFIER_ZERO_OR_ONE;
++used;
break;
default:
out->quantifier = QUANTIFIER_NONE; out->quantifier = QUANTIFIER_NONE;
}
}
return used; return used;
} }

42
tests/parser_tests.c
View File

@ -172,6 +172,45 @@ static void a_in_parens_b_is_parsed_as_sequence_with_regex_term(void)
regex_free_children(&r); regex_free_children(&r);
} }
static void dot_star_is_parsed_as_zero_or_more_wildcard(void)
{
regex_t r = { 0 };
const int result = PARSE_REGEX_STRING(".*", &r);
ASSERT_NE(-1, result);
ASSERT_EQ(1, r.sequence.len);
ASSERT_EQ(QUANTIFIER_ZERO_OR_MORE, r.sequence.contents[0].quantifier);
ASSERT_EQ(TERM_TYPE_WILDCARD, r.sequence.contents[0].type);
regex_free_children(&r);
}
static void dot_plus_is_parsed_as_one_or_more_wildcard(void)
{
regex_t r = { 0 };
const int result = PARSE_REGEX_STRING(".+", &r);
ASSERT_NE(-1, result);
ASSERT_EQ(1, r.sequence.len);
ASSERT_EQ(QUANTIFIER_ONE_OR_MORE, r.sequence.contents[0].quantifier);
ASSERT_EQ(TERM_TYPE_WILDCARD, r.sequence.contents[0].type);
regex_free_children(&r);
}
static void dot_question_mark_is_parsed_as_zero_or_one_wildcard(void)
{
regex_t r = { 0 };
const int result = PARSE_REGEX_STRING(".?", &r);
ASSERT_NE(-1, result);
ASSERT_EQ(1, r.sequence.len);
ASSERT_EQ(QUANTIFIER_ZERO_OR_ONE, r.sequence.contents[0].quantifier);
ASSERT_EQ(TERM_TYPE_WILDCARD, r.sequence.contents[0].type);
regex_free_children(&r);
}
int main(void) int main(void)
{ {
TESTING_BEGIN(); TESTING_BEGIN();
@ -186,5 +225,8 @@ int main(void)
backslash_backslash_is_parsed_as_unquantified_literal(); backslash_backslash_is_parsed_as_unquantified_literal();
a_pipe_b_in_parens_is_parsed_as_regex_term(); a_pipe_b_in_parens_is_parsed_as_regex_term();
a_in_parens_b_is_parsed_as_sequence_with_regex_term(); a_in_parens_b_is_parsed_as_sequence_with_regex_term();
dot_star_is_parsed_as_zero_or_more_wildcard();
dot_plus_is_parsed_as_one_or_more_wildcard();
dot_question_mark_is_parsed_as_zero_or_one_wildcard();
return TESTING_END(); return TESTING_END();
} }