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

Initial brackets handling

Browse Source
This commit is contained in:
Sergey Lyubka 2013-07-29 23:24:41 +01:00
parent c6d2484b85
commit 6b8205b99c
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
slre.c
View File

@ -82,17 +82,19 @@ static int is_quantifier(const char *re) {
return re[0] == '*' || re[0] == '+' || re[0] == '?'; return re[0] == '*' || re[0] == '+' || re[0] == '?';
} }
static int get_brackets_length(const char *p, const struct regex_info *info) { static int get_brackets_index(const char *p, const struct regex_info *info) {
int i; int i;
for (i = 0; i < info->num_bracket_pairs; i++) { for (i = 0; i < info->num_bracket_pairs; i++)
if (info->brackets[i].opening_bracket == p) { if (info->brackets[i].opening_bracket == p)
return info->brackets[i].closing_bracket - return i;
info->brackets[i].opening_bracket;
}
}
return 0; return 0;
} }
static int get_brackets_length(const char *p, const struct regex_info *info) {
int i = get_brackets_index(p, info);
return info->brackets[i].closing_bracket - info->brackets[i].opening_bracket;
}
static int m1(const char *re, int re_len, const char *s, int s_len, static int m1(const char *re, int re_len, const char *s, int s_len,
struct slre_cap *caps, struct regex_info *info) { struct slre_cap *caps, struct regex_info *info) {
/* i is offset in re, j is offset in s */ /* i is offset in re, j is offset in s */
@ -170,6 +172,22 @@ static int m1(const char *re, int re_len, const char *s, int s_len,
} }
break; break;
case '(':
{
int n = m1(re + i + 1, step - 1, s + j, s_len - j, caps, info);
DBG(("CAPTURING [%.*s] [%.*s] => %d\n", step - 1, re + i + 1,
s_len - j, s + j, n));
FAIL_IF(n <= 0, static_error_no_match);
if (caps != NULL) {
int bi = get_brackets_index(re + i, info);
caps[bi].ptr = s + j;
caps[bi].len = n;
}
j += n;
i++;
}
break;
case '^': case '^':
FAIL_IF(j != 0, static_error_no_match); FAIL_IF(j != 0, static_error_no_match);
break; break;
@ -208,8 +226,8 @@ static int m(const char *re, int re_len, const char *s, int s_len,
stack[0] = re; stack[0] = re;
info->brackets[0].opening_bracket = re; info->brackets[0].opening_bracket = re - 1; /* Imaginary ( before re */
info->brackets[0].closing_bracket = re + re_len; info->brackets[0].closing_bracket = re + re_len; /* Imaginary ) after re */
info->brackets[0].nesting_depth = 0; info->brackets[0].nesting_depth = 0;
info->num_bracket_pairs = 1; info->num_bracket_pairs = 1;
@ -232,7 +250,7 @@ static int m(const char *re, int re_len, const char *s, int s_len,
info->brackets[info->num_bracket_pairs].nesting_depth = depth; info->brackets[info->num_bracket_pairs].nesting_depth = depth;
info->num_bracket_pairs++; info->num_bracket_pairs++;
} else if (re[i] == ')') { } else if (re[i] == ')') {
info->brackets[info->num_bracket_pairs].closing_bracket = &re[i]; info->brackets[info->num_bracket_pairs - 1].closing_bracket = &re[i];
depth--; depth--;
FAIL_IF(depth < 0, static_error_unbalanced_brackets); FAIL_IF(depth < 0, static_error_unbalanced_brackets);
} }
@ -263,7 +281,7 @@ int slre_match(const char *regexp, const char *s, int s_len,
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.error_msg = static_error_no_match; info.error_msg = static_error_no_match;
DBG(("---------------- [%s] [%.*s]\n", regexp, s_len, s)); DBG(("========================> [%s] [%.*s]\n", regexp, s_len, s));
result = m(regexp, strlen(regexp), s, s_len, caps, &info); result = m(regexp, strlen(regexp), s, s_len, caps, &info);
if (error_msg != NULL) { if (error_msg != NULL) {

8
unit_test.c
View File

@ -41,6 +41,8 @@ static int static_failed_tests = 0;
int main(void) { int main(void) {
const char *msg = ""; const char *msg = "";
#if 0
#endif
ASSERT(slre_match("fo", "foo", 3, NULL, &msg) == 2); ASSERT(slre_match("fo", "foo", 3, NULL, &msg) == 2);
ASSERT(slre_match(".+", "foo", 3, NULL, &msg) == 3); ASSERT(slre_match(".+", "foo", 3, NULL, &msg) == 3);
@ -73,8 +75,10 @@ int main(void) {
ASSERT(slre_match("klz?mn", "fooklmn", 7, NULL, &msg) == 7); ASSERT(slre_match("klz?mn", "fooklmn", 7, NULL, &msg) == 7);
ASSERT(slre_match("fa?b", "fooklmn", 7, NULL, &msg) == 0); ASSERT(slre_match("fa?b", "fooklmn", 7, NULL, &msg) == 0);
#if 0
#endif ASSERT(slre_match("^(te)", "tenacity subdues all", 20, NULL, &msg) == 2);
ASSERT(slre_match("(bc)", "abcdef", 6, NULL, &msg) == 3);
ASSERT(slre_match(".(d.)", "abcdef", 6, NULL, &msg) == 5);
printf("Unit test %s (total test: %d, failed tests: %d)\n", printf("Unit test %s (total test: %d, failed tests: %d)\n",
static_failed_tests > 0 ? "FAILED" : "PASSED", static_failed_tests > 0 ? "FAILED" : "PASSED",