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

[fix] trie_get methods just return node index rather than data value

Browse Source
This commit is contained in:
Al
2015-04-27 01:28:05 -04:00
parent 8fb9bacfa6
commit b2ba629f95
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/trie.c
View File

@@ -702,6 +702,7 @@ bool trie_add_suffix(trie_t *self, char *key, uint32_t data) {
return success; return success;
} }
uint32_t trie_get_from_index(trie_t *self, char *word, size_t len, uint32_t i) { uint32_t trie_get_from_index(trie_t *self, char *word, size_t len, uint32_t i) {
if (word == NULL) return NULL_ID; if (word == NULL) return NULL_ID;
@@ -713,15 +714,14 @@ uint32_t trie_get_from_index(trie_t *self, char *word, size_t len, uint32_t i) {
uint32_t next_id; uint32_t next_id;
/* Include NUL-byte if we're looking for whole phrases. // Include NUL-byte. It may be stored if this phrase is a prefix of a longer one
* It may be stored if this phrase is a prefix of a longer one */
for (int i = 0; i < len + 1; i++, ptr++, node_id = next_id) { for (int i = 0; i < len + 1; i++, ptr++, node_id = next_id) {
next_id = trie_get_transition_index(self, node, *ptr); next_id = trie_get_transition_index(self, node, *ptr);
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 0; return NULL_ID;
} }
if (node.check == node_id && node.base < 0) { if (node.check == node_id && node.base < 0) {
@@ -736,7 +736,7 @@ uint32_t trie_get_from_index(trie_t *self, char *word, size_t len, uint32_t i) {
int tail_match = strncmp((char *)current_tail, query_tail, query_tail_len); int tail_match = strncmp((char *)current_tail, query_tail, query_tail_len);
if (tail_match == 0) { if (tail_match == 0) {
return data_node.data; return next_id;
} else { } else {
return NULL_ID; return NULL_ID;
} }