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

more route tests

Browse source
This commit is contained in:
c9s 2014-05-16 14:36:48 +08:00
parent 4380f7e63a
commit f57ae07e4a
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/define.h
View file

@ -13,4 +13,19 @@ typedef unsigned char bool;
#define TRUE 1 #define TRUE 1
#define DEBUG 1
#ifdef DEBUG
#define info(fmt, ...) \
do { fprintf(stderr, fmt, __VA_ARGS__); } while (0)
#define debug(fmt, ...) \
do { fprintf(stderr, "%s:%d:%s(): " fmt, __FILE__, \
__LINE__, __func__, __VA_ARGS__); } while (0)
#else
#define info(...);
#define debug(...);
#endif
#endif /* !DEFINE_H */ #endif /* !DEFINE_H */

17
src/node.c
View file

@ -12,6 +12,7 @@
// Judy array // Judy array
#include <Judy.h> #include <Judy.h>
#include "define.h"
#include "str.h" #include "str.h"
#include "node.h" #include "node.h"
#include "token.h" #include "token.h"
@ -19,8 +20,6 @@
// String value as the index http://judy.sourceforge.net/doc/JudySL_3x.htm // String value as the index http://judy.sourceforge.net/doc/JudySL_3x.htm
/** /**
* Create a rnode object * Create a rnode object
*/ */
@ -165,7 +164,7 @@ void rnode_compile_patterns(rnode * n) {
rnode * rnode_match(rnode * n, char * path, int path_len) { rnode * rnode_match(rnode * n, char * path, int path_len) {
if (n->combined_pattern && n->pcre_pattern) { if (n->combined_pattern && n->pcre_pattern) {
// printf("pcre matching /%s/ on %s\n", n->combined_pattern, path); info("pcre matching %s on %s\n", n->combined_pattern, path);
// int ovector_count = (n->edge_len + 1) * 2; // int ovector_count = (n->edge_len + 1) * 2;
int ovector_count = 30; int ovector_count = 30;
int ovector[ovector_count]; int ovector[ovector_count];
@ -180,7 +179,7 @@ rnode * rnode_match(rnode * n, char * path, int path_len) {
ovector, /* output vector for substring information */ ovector, /* output vector for substring information */
ovector_count); /* number of elements in the output vector */ ovector_count); /* number of elements in the output vector */
printf("rc: %d\n", rc ); info("rc: %d\n", rc );
if (rc < 0) { if (rc < 0) {
switch(rc) switch(rc)
{ {
@ -199,12 +198,12 @@ rnode * rnode_match(rnode * n, char * path, int path_len) {
{ {
char *substring_start = path + ovector[2*i]; char *substring_start = path + ovector[2*i];
int substring_length = ovector[2*i+1] - ovector[2*i]; int substring_length = ovector[2*i+1] - ovector[2*i];
printf("%2d: %.*s\n", i, substring_length, substring_start); info("%2d: %.*s\n", i, substring_length, substring_start);
if ( substring_length > 0) { if ( substring_length > 0) {
int len = path_len - substring_length; // fully match to the end int restlen = path_len - ovector[2*i+1]; // fully match to the end
// printf("len:%d edges:%d i:%d\n", len, n->edge_len, i); info("matched item => restlen:%d edges:%d i:%d\n", restlen, n->edge_len, i);
if (len) { if (restlen) {
return rnode_match( n->edges[i - 1]->child, substring_start, len); return rnode_match( n->edges[i - 1]->child, substring_start + substring_length, restlen);
} }
return n->edges[i - 1]->child; return n->edges[i - 1]->child;
} }

6
tests/test_tree.c
View file

@ -55,6 +55,7 @@ START_TEST (test_compile)
fail_if( n->combined_pattern ); fail_if( n->combined_pattern );
fail_if( NULL == rnode_find_edge_str(n, "/", strlen("/") ) ); fail_if( NULL == rnode_find_edge_str(n, "/", strlen("/") ) );
rnode_insert_routel(n, "/foo/{id}", strlen("/foo/{id}") );
rnode_insert_routel(n, "/{id}", strlen("/{id}") ); rnode_insert_routel(n, "/{id}", strlen("/{id}") );
rnode_compile(n); rnode_compile(n);
rnode_dump(n, 0); rnode_dump(n, 0);
@ -81,7 +82,10 @@ START_TEST (test_compile)
m = rnode_match( n , "/bar", strlen("/bar") ); m = rnode_match( n , "/bar", strlen("/bar") );
fail_if( NULL == m ); fail_if( NULL == m );
m = rnode_match( n , "/zzz", strlen("/zzz") ); m = rnode_match( n , "/xxx", strlen("/xxx") );
fail_if( NULL == m );
m = rnode_match( n , "/foo/xxx", strlen("/foo/xxx") );
fail_if( NULL == m ); fail_if( NULL == m );
} }
END_TEST END_TEST