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

[strings] making string_tree_iterator_done more meaningful (returns true if the iterator has no paths left to traverse)

Browse Source
This commit is contained in:
Al
2016-12-31 00:54:36 -05:00
parent 8978000320
commit 58b063b632
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libpostal.c
View File

@@ -814,7 +814,7 @@ static void expand_alternative(cstring_array *strings, khash_t(str_set) *unique_
kh_resize(str_set, unique_strings, kh_size(unique_strings) + tokenized_iter->remaining);
for (; string_tree_iterator_done(tokenized_iter); string_tree_iterator_next(tokenized_iter)) {
for (; !string_tree_iterator_done(tokenized_iter); string_tree_iterator_next(tokenized_iter)) {
char_array_clear(temp_string);
string_tree_iterator_foreach_token(tokenized_iter, token, {
@@ -868,7 +868,7 @@ static void expand_alternative(cstring_array *strings, khash_t(str_set) *unique_
iter = string_tree_iterator_new(alternatives);
log_debug("iter->num_tokens=%d\n", iter->num_tokens);
for (; string_tree_iterator_done(iter); string_tree_iterator_next(iter)) {
for (; !string_tree_iterator_done(iter); string_tree_iterator_next(iter)) {
char_array_clear(temp_string);
string_tree_iterator_foreach_token(iter, token, {
log_debug("token=%s\n", token);
@@ -937,7 +937,7 @@ char **expand_address(char *input, normalize_options_t options, size_t *n) {
log_debug("Adding alternatives for multiple normalizations\n");
string_tree_iterator_t *iter = string_tree_iterator_new(tree);
for (; string_tree_iterator_done(iter); string_tree_iterator_next(iter)) {
for (; !string_tree_iterator_done(iter); string_tree_iterator_next(iter)) {
char *segment;
char_array_clear(temp_string);
bool is_first = true;