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

[parser] Simplifying args in address_parser_data_set_tokenize_line

Browse Source
This commit is contained in:
Al
2015-12-10 18:48:23 -05:00
parent 1d288954d7
commit 743b74aea5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/address_parser_io.c
View File

@@ -19,7 +19,11 @@ address_parser_data_set_t *address_parser_data_set_init(char *filename) {
} }
bool address_parser_data_set_tokenize_line(char *input, token_array *tokens, uint32_array *separators, cstring_array *labels) { bool address_parser_data_set_tokenize_line(address_parser_data_set_t *data_set, char *input) {
token_array *tokens = data_set->tokens;
uint32_array *separators = data_set->separators;
cstring_array *labels = data_set->labels;
size_t count = 0; size_t count = 0;
token_t token; token_t token;
@@ -47,7 +51,7 @@ bool address_parser_data_set_tokenize_line(char *input, token_array *tokens, uin
label = str + last_separator_index + 1; label = str + last_separator_index + 1;
uint32_t last_separator_type; uint32_t last_separator_type = ADDRESS_SEPARATOR_NONE;
if (strcmp(label, FIELD_SEPARATOR_LABEL) == 0) { if (strcmp(label, FIELD_SEPARATOR_LABEL) == 0) {
last_separator_type = uint32_array_pop(separators); last_separator_type = uint32_array_pop(separators);
uint32_array_push(separators, ADDRESS_SEPARATOR_FIELD | ADDRESS_SEPARATOR_FIELD_INTERNAL); uint32_array_push(separators, ADDRESS_SEPARATOR_FIELD | ADDRESS_SEPARATOR_FIELD_INTERNAL);
@@ -135,10 +139,10 @@ bool address_parser_data_set_next(address_parser_data_set_t *data_set) {
tokenized_string_t *tokenized_str = NULL; tokenized_string_t *tokenized_str = NULL;
if (address_parser_data_set_tokenize_line(normalized, tokens, separators, labels)) { if (address_parser_data_set_tokenize_line(data_set, normalized)) {
// Add tokens as discrete strings for easier use in feature functions // Add tokens as discrete strings for easier use in feature functions
bool copy_tokens = true; bool copy_tokens = true;
tokenized_str = tokenized_string_from_tokens(normalized, tokens, copy_tokens); tokenized_str = tokenized_string_from_tokens(normalized, data_set->tokens, copy_tokens);
} }
data_set->tokenized_str = tokenized_str; data_set->tokenized_str = tokenized_str;

2
src/address_parser_io.h
View File

@@ -33,7 +33,7 @@ typedef struct address_parser_data_set {
address_parser_data_set_t *address_parser_data_set_init(char *filename); address_parser_data_set_t *address_parser_data_set_init(char *filename);
bool address_parser_data_set_tokenize_line(char *input, token_array *tokens, uint32_array *separators, cstring_array *labels); bool address_parser_data_set_tokenize_line(address_parser_data_set_t *data_ser, char *input);
bool address_parser_data_set_next(address_parser_data_set_t *data_set); bool address_parser_data_set_next(address_parser_data_set_t *data_set);
void address_parser_data_set_destroy(address_parser_data_set_t *self); void address_parser_data_set_destroy(address_parser_data_set_t *self);