collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add char ** errstr to r3_node_find_common_prefix

Browse source
This commit is contained in:
c9s 2014-06-02 15:52:40 +08:00
parent 7cc84867ce
commit 1f21ea19a8
4 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/r3.h
View file

@ -109,7 +109,7 @@ edge * r3_node_find_edge(const node * n, const char * pat, int pat_len);
void r3_node_append_edge(node *n, edge *child); void r3_node_append_edge(node *n, edge *child);
edge * r3_node_find_common_prefix(node *n, char *path, int path_len, int *prefix_len); edge * r3_node_find_common_prefix(node *n, char *path, int path_len, int *prefix_len, char **errstr);
node * r3_tree_insert_pathl(node *tree, const char *path, int path_len, void * data); node * r3_tree_insert_pathl(node *tree, const char *path, int path_len, void * data);

11
src/node.c
View file

@ -492,7 +492,7 @@ node * r3_tree_insert_pathl(node *tree, const char *path, int path_len, void * d
* 4. "aaa{slug:xxx}/hate" vs "aab{slug:yyy}/bar" => common prefix = "aa" * 4. "aaa{slug:xxx}/hate" vs "aab{slug:yyy}/bar" => common prefix = "aa"
* 5. "/foo/{slug}/hate" vs "/fo{slug}/bar" => common prefix = "/fo" * 5. "/foo/{slug}/hate" vs "/fo{slug}/bar" => common prefix = "/fo"
*/ */
edge * r3_node_find_common_prefix(node *n, char *path, int path_len, int *prefix_len) { edge * r3_node_find_common_prefix(node *n, char *path, int path_len, int *prefix_len, char **errstr) {
int i = 0; int i = 0;
int prefix = 0; int prefix = 0;
edge *e = NULL; edge *e = NULL;
@ -520,7 +520,7 @@ edge * r3_node_find_common_prefix(node *n, char *path, int path_len, int *prefix
slug = r3_slug_new(path, path_len); slug = r3_slug_new(path, path_len);
do { do {
ret = r3_slug_parse(slug, path, path_len, offset, NULL); ret = r3_slug_parse(slug, path, path_len, offset, errstr);
// found slug // found slug
if (ret == 1) { if (ret == 1) {
// inside slug, backtrace to the begin of the slug // inside slug, backtrace to the begin of the slug
@ -536,6 +536,8 @@ edge * r3_node_find_common_prefix(node *n, char *path, int path_len, int *prefix
} else { } else {
break; break;
} }
} else if (ret == -1) {
return -1;
} else { } else {
break; break;
} }
@ -563,7 +565,10 @@ node * r3_tree_insert_pathl_ex(node *tree, const char *path, int path_len, route
/* length of common prefix */ /* length of common prefix */
int prefix_len = 0; int prefix_len = 0;
e = r3_node_find_common_prefix(tree, path, path_len, &prefix_len); e = r3_node_find_common_prefix(tree, path, path_len, &prefix_len, errstr);
if (e == -1) {
return NULL;
}
const char * subpath = path + prefix_len; const char * subpath = path + prefix_len;
const int subpath_len = path_len - prefix_len; const int subpath_len = path_len - prefix_len;

2
tests/check_slug.c
View file

@ -88,7 +88,7 @@ START_TEST (test_incomplete_slug)
char * errstr = NULL; char * errstr = NULL;
char * pattern = "/user/{name:\\d{3}}/to/{id"; char * pattern = "/user/{name:\\d{3}}/to/{id";
cnt = slug_count(pattern, strlen(pattern), &errstr); cnt = slug_count(pattern, strlen(pattern), &errstr);
ck_assert_int_eq(cnt, 0); ck_assert_int_eq(cnt, -1);
ck_assert(errstr); ck_assert(errstr);
printf("%s\n",errstr); printf("%s\n",errstr);
free(errstr); free(errstr);

46
tests/check_tree.c
View file

@ -20,43 +20,43 @@ START_TEST (test_find_common_prefix)
edge *ret_edge = NULL; edge *ret_edge = NULL;
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo", sizeof("/foo")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo", sizeof("/foo")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge != NULL);
ck_assert_int_eq(prefix_len, 4); ck_assert_int_eq(prefix_len, 4);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo/", sizeof("/foo/")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo/", sizeof("/foo/")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge != NULL);
ck_assert_int_eq(prefix_len, 5); ck_assert_int_eq(prefix_len, 5);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo/{slog}", sizeof("/foo/{slog}")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo/{slog}", sizeof("/foo/{slog}")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge != NULL);
ck_assert_int_eq(prefix_len, 5); ck_assert_int_eq(prefix_len, 5);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo/{bar}", sizeof("/foo/{bar}")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo/{bar}", sizeof("/foo/{bar}")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge != NULL);
ck_assert_int_eq(prefix_len, 5); ck_assert_int_eq(prefix_len, 5);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo/bar", sizeof("/foo/bar")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo/bar", sizeof("/foo/bar")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge != NULL);
ck_assert_int_eq(prefix_len, 5); ck_assert_int_eq(prefix_len, 5);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/bar/", sizeof("/bar/")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/bar/", sizeof("/bar/")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge != NULL);
ck_assert_int_eq(prefix_len, 1); ck_assert_int_eq(prefix_len, 1);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "{bar}", sizeof("{bar}")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "{bar}", sizeof("{bar}")-1, &prefix_len, NULL);
ck_assert(!ret_edge); ck_assert(!ret_edge != NULL);
ck_assert_int_eq(prefix_len, 0); ck_assert_int_eq(prefix_len, 0);
@ -79,19 +79,19 @@ START_TEST (test_find_common_prefix_after)
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo", sizeof("/foo")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo", sizeof("/foo")-1, &prefix_len, NULL);
ck_assert(ret_edge == NULL); ck_assert(ret_edge == NULL);
ck_assert_int_eq(prefix_len, 0); ck_assert_int_eq(prefix_len, 0);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "{slug}/bar", sizeof("{slug}/bar")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "{slug}/bar", sizeof("{slug}/bar")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge);
ck_assert_int_eq(prefix_len, 7); ck_assert_int_eq(prefix_len, 7);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "{slug}/foo", sizeof("{slug}/foo")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "{slug}/foo", sizeof("{slug}/foo")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge);
ck_assert_int_eq(prefix_len, 10); ck_assert_int_eq(prefix_len, 10);
@ -112,7 +112,7 @@ START_TEST (test_find_common_prefix_double_middle)
edge *ret_edge = NULL; edge *ret_edge = NULL;
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "{slug}/foo/{number}", sizeof("{slug}/foo/{number}")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "{slug}/foo/{number}", sizeof("{slug}/foo/{number}")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge);
ck_assert_int_eq(prefix_len, 11); ck_assert_int_eq(prefix_len, 11);
@ -132,12 +132,12 @@ START_TEST (test_find_common_prefix_middle)
edge *ret_edge = NULL; edge *ret_edge = NULL;
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo/{slug}/bar", sizeof("/foo/{slug}/bar")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo/{slug}/bar", sizeof("/foo/{slug}/bar")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge);
ck_assert_int_eq(prefix_len, 12); ck_assert_int_eq(prefix_len, 12);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/fo/{slug}/bar", sizeof("/fo/{slug}/bar")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/fo/{slug}/bar", sizeof("/fo/{slug}/bar")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge);
ck_assert_int_eq(prefix_len, 3); ck_assert_int_eq(prefix_len, 3);
@ -155,13 +155,13 @@ START_TEST (test_find_common_prefix_same_pattern)
edge *ret_edge = NULL; edge *ret_edge = NULL;
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo/{slug:yyy}/hate", sizeof("/foo/{slug:yyy}/hate")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo/{slug:yyy}/hate", sizeof("/foo/{slug:yyy}/hate")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge);
ck_assert_int_eq(prefix_len, 5); ck_assert_int_eq(prefix_len, 5);
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "/foo/{slug}/hate", sizeof("/foo/{slug}/hate")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "/foo/{slug}/hate", sizeof("/foo/{slug}/hate")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge);
ck_assert_int_eq(prefix_len, 5); ck_assert_int_eq(prefix_len, 5);
@ -179,7 +179,7 @@ START_TEST (test_find_common_prefix_same_pattern2)
edge *ret_edge = NULL; edge *ret_edge = NULL;
prefix_len = 0; prefix_len = 0;
ret_edge = r3_node_find_common_prefix(n, "{slug:yyy}/hate", sizeof("{slug:yyy}/hate")-1, &prefix_len); ret_edge = r3_node_find_common_prefix(n, "{slug:yyy}/hate", sizeof("{slug:yyy}/hate")-1, &prefix_len, NULL);
ck_assert(ret_edge); ck_assert(ret_edge);
ck_assert_int_eq(prefix_len, 0); ck_assert_int_eq(prefix_len, 0);