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

[fix] need to set prev_state to the NULL state in numex parsing after a non-space/non-hyphen is encountered and the previous match, if any, is added to the result array

Browse Source
This commit is contained in:
Al
2017-04-13 16:01:46 -04:00
parent b464eb6c07
commit 413c584f08
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/numex.c
View File

@@ -744,6 +744,7 @@ numex_result_array *convert_numeric_expressions(char *str, char *lang) {
log_debug("last was separator\n"); log_debug("last was separator\n");
last_was_separator = false; last_was_separator = false;
possible_complete_token = true; possible_complete_token = true;
complete_token = false;
} else { } else {
log_debug("other char\n"); log_debug("other char\n");
if (result.len > 0 && (!whole_tokens_only || (prev_state.state == NUMEX_SEARCH_STATE_MATCH && is_punct) || (prev_state.state != NUMEX_SEARCH_STATE_MATCH && complete_token))) { if (result.len > 0 && (!whole_tokens_only || (prev_state.state == NUMEX_SEARCH_STATE_MATCH && is_punct) || (prev_state.state != NUMEX_SEARCH_STATE_MATCH && complete_token))) {
@@ -754,6 +755,7 @@ numex_result_array *convert_numeric_expressions(char *str, char *lang) {
} }
result = NULL_NUMEX_RESULT; result = NULL_NUMEX_RESULT;
rule = prev_rule = NUMEX_NULL_RULE; rule = prev_rule = NUMEX_NULL_RULE;
prev_state = NULL_NUMEX_SEARCH_STATE;
last_was_separator = false; last_was_separator = false;
possible_complete_token = false; possible_complete_token = false;
complete_token = false; complete_token = false;
@@ -1054,4 +1056,3 @@ char *replace_numeric_expressions(char *str, char *lang) {
return char_array_to_string(replacement); return char_array_to_string(replacement);
} }