tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[phrases] constant for NULL prefix results

Browse Source
This commit is contained in:
Al
2015-05-22 09:08:07 -04:00
parent cb14e5eef1
commit 27171e068d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/trie.c
View File

@@ -697,7 +697,7 @@ inline trie_data_node_t trie_get_data_node(trie_t *self, trie_node_t node) {
trie_prefix_result_t trie_get_prefix_from_index(trie_t *self, char *key, size_t len, uint32_t i, size_t tail_pos) { trie_prefix_result_t trie_get_prefix_from_index(trie_t *self, char *key, size_t len, uint32_t i, size_t tail_pos) {
if (key == NULL) { if (key == NULL) {
return (trie_prefix_result_t){NULL_NODE_ID, 0}; return NULL_PREFIX_RESULT;
} }
unsigned char *ptr = (unsigned char *)key; unsigned char *ptr = (unsigned char *)key;
@@ -705,7 +705,7 @@ trie_prefix_result_t trie_get_prefix_from_index(trie_t *self, char *key, size_t
uint32_t node_id = i; uint32_t node_id = i;
trie_node_t node = trie_get_node(self, i); trie_node_t node = trie_get_node(self, i);
if (node.base == NULL_NODE_ID) { if (node.base == NULL_NODE_ID) {
return (trie_prefix_result_t){NULL_NODE_ID, 0}; return NULL_PREFIX_RESULT;
} }
uint32_t next_id = NULL_NODE_ID; uint32_t next_id = NULL_NODE_ID;
@@ -719,7 +719,7 @@ trie_prefix_result_t trie_get_prefix_from_index(trie_t *self, char *key, size_t
node = trie_get_node(self, next_id); node = trie_get_node(self, next_id);
if (node.check != node_id) { if (node.check != node_id) {
return (trie_prefix_result_t){NULL_NODE_ID, 0}; return NULL_PREFIX_RESULT;
} }
if (node.base < 0) break; if (node.base < 0) break;
@@ -737,13 +737,13 @@ trie_prefix_result_t trie_get_prefix_from_index(trie_t *self, char *key, size_t
if (data_node.tail != 0 && trie_compare_tail(self, query_tail, query_len, data_node.tail + tail_pos)) { if (data_node.tail != 0 && trie_compare_tail(self, query_tail, query_len, data_node.tail + tail_pos)) {
return (trie_prefix_result_t){next_id, query_len}; return (trie_prefix_result_t){next_id, query_len};
} else { } else {
return (trie_prefix_result_t){NULL_NODE_ID, 0}; return NULL_PREFIX_RESULT;
} }
} }
return (trie_prefix_result_t){next_id, 0}; return NULL_PREFIX_RESULT;
} }

4
src/trie.h
View File

@@ -110,9 +110,11 @@ typedef struct trie_prefix_result {
size_t tail_pos; size_t tail_pos;
} trie_prefix_result_t; } trie_prefix_result_t;
const trie_prefix_result_t NULL_PREFIX_RESULT = {NULL_NODE_ID, 0};
trie_prefix_result_t trie_get_prefix(trie_t *self, char *key); trie_prefix_result_t trie_get_prefix(trie_t *self, char *key);
trie_prefix_result_t trie_get_prefix_len(trie_t *self, char *key, size_t len); trie_prefix_result_t trie_get_prefix_len(trie_t *self, char *key, size_t len);
trie_prefix_result_t trie_get_prefix_from_index(trie_t *self, char *key, size_t len, uint32_t i); trie_prefix_result_t trie_get_prefix_from_index(trie_t *self, char *key, size_t len, uint32_t i, size_t tail_pos);
void trie_print(trie_t *self); void trie_print(trie_t *self);