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

Merge branch 'master' into slugfix

Browse source 
Conflicts:
	tests/check_slug.c
This commit is contained in:
c9s 2014-06-02 01:23:10 +08:00
commit 24b84d068d
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -90,6 +90,9 @@ AM_CONDITIONAL(ENABLE_GRAPHVIZ, test "x$enable_graphviz" = "xyes")
AC_ARG_ENABLE(json, AS_HELP_STRING([--enable-json],[enable json encoder])) AC_ARG_ENABLE(json, AS_HELP_STRING([--enable-json],[enable json encoder]))
if test "x$enable_json" = "xyes"; then if test "x$enable_json" = "xyes"; then
PKG_CHECK_MODULES(JSONC, [json-c])
AC_SUBST(JSONC_CFLAGS)
AC_SUBST(JSONC_LIBS)
AC_DEFINE(ENABLE_JSON, 1, [enable json]) AC_DEFINE(ENABLE_JSON, 1, [enable json])
fi fi
AM_CONDITIONAL(ENABLE_JSON, test "x$enable_json" = "xyes") AM_CONDITIONAL(ENABLE_JSON, test "x$enable_json" = "xyes")

6
src/node.c
View file

@ -163,9 +163,6 @@ int r3_tree_compile_patterns(node * n, char **errstr) {
p = cpat; p = cpat;
strncat(p, "^", 1);
p++;
edge *e = NULL; edge *e = NULL;
int opcode_cnt = 0; int opcode_cnt = 0;
for ( int i = 0 ; i < n->edge_len ; i++ ) { for ( int i = 0 ; i < n->edge_len ; i++ ) {
@ -179,7 +176,8 @@ int r3_tree_compile_patterns(node * n, char **errstr) {
char * slug_pat = slug_compile(e->pattern, e->pattern_len); char * slug_pat = slug_compile(e->pattern, e->pattern_len);
strcat(p, slug_pat); strcat(p, slug_pat);
} else { } else {
strncat(p++,"(", 1); strncat(p,"^(", 2);
p += 2;
strncat(p, e->pattern, e->pattern_len); strncat(p, e->pattern, e->pattern_len);
p += e->pattern_len; p += e->pattern_len;

3
src/str.c
View file

@ -272,6 +272,9 @@ char * slug_compile(const char * str, int len)
} }
o = out; o = out;
strncat(o, "^", 1);
o++;
strncat(o, str, s1 - str); // string before slug strncat(o, str, s1 - str); // string before slug
o += (s1 - str); o += (s1 - str);

5
tests/Makefile.am
View file

@ -6,14 +6,13 @@
# endif # endif
TESTS = TESTS =
AM_CFLAGS=$(DEPS_CFLAGS) $(GVC_DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/3rdparty -Wall -std=c99 -ggdb -Wall AM_CFLAGS=$(DEPS_CFLAGS) $(GVC_DEPS_CFLAGS) $(JSONC_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/3rdparty -Wall -std=c99 -ggdb -Wall
AM_LDFLAGS=$(DEPS_LIBS) $(GVC_DEPS_LIBS) -L$(top_builddir) -lr3 -lcheck @CHECK_LIBS@ AM_LDFLAGS=$(DEPS_LIBS) $(GVC_DEPS_LIBS) $(JSONC_LIBS) -L$(top_builddir) -lr3 -lcheck @CHECK_LIBS@
if USE_JEMALLOC if USE_JEMALLOC
AM_CFLAGS += -ljemalloc AM_CFLAGS += -ljemalloc
endif endif
noinst_HEADERS = \ noinst_HEADERS = \
bench.h \ bench.h \
$(NULL) $(NULL)

8
tests/check_slug.c
View file

@ -25,19 +25,19 @@ START_TEST (test_slug_compile)
{ {
char * path = "/user/{id}"; char * path = "/user/{id}";
char * c = NULL; char * c = NULL;
ck_assert_str_eq( c = slug_compile(path, strlen(path) ) , "/user/([^/]+)" ); ck_assert_str_eq( c = slug_compile(path, strlen(path) ) , "^/user/([^/]+)" );
zfree(c); zfree(c);
char * path2 = "/what/{id}-foo"; char * path2 = "/what/{id}-foo";
ck_assert_str_eq( c = slug_compile(path2, strlen(path2) ) , "/what/([^/]+)-foo" ); ck_assert_str_eq( c = slug_compile(path2, strlen(path2) ) , "^/what/([^/]+)-foo" );
zfree(c); zfree(c);
char * path3 = "-{id}"; char * path3 = "-{id}";
ck_assert_str_eq( c = slug_compile(path3, strlen(path3)), "-([^/]+)" ); ck_assert_str_eq( c = slug_compile(path3, strlen(path3)), "^-([^/]+)" );
zfree(c); zfree(c);
char * path4 = "-{idx:\\d{3}}"; char * path4 = "-{idx:\\d{3}}";
ck_assert_str_eq( c = slug_compile(path4, strlen(path4)), "-(\\d{3})" ); ck_assert_str_eq( c = slug_compile(path4, strlen(path4)), "^-(\\d{3})" );
zfree(c); zfree(c);
} }
END_TEST END_TEST