diff --git a/src/libpostal.c b/src/libpostal.c index 7c56cc9c..9c3624fb 100644 --- a/src/libpostal.c +++ b/src/libpostal.c @@ -37,27 +37,27 @@ static normalize_options_t LIBPOSTAL_DEFAULT_OPTIONS = { .languages = NULL, .num_languages = 0, .address_components = ADDRESS_NAME | ADDRESS_HOUSE_NUMBER | ADDRESS_STREET | ADDRESS_UNIT, - .latin_ascii = 1, - .transliterate = 1, - .strip_accents = 1, - .decompose = 1, - .lowercase = 1, - .trim_string = 1, - .drop_parentheticals = 1, - .replace_numeric_hyphens = 0, - .delete_numeric_hyphens = 0, - .split_alpha_from_numeric = 1, - .replace_word_hyphens = 1, - .delete_word_hyphens = 1, - .delete_final_periods = 1, - .delete_acronym_periods = 1, - .drop_english_possessives = 1, - .delete_apostrophes = 1, - .expand_numex = 1, - .roman_numerals = 1 + .latin_ascii = true, + .transliterate = true, + .strip_accents = true, + .decompose = true, + .lowercase = true, + .trim_string = true, + .drop_parentheticals = true, + .replace_numeric_hyphens = false, + .delete_numeric_hyphens = false, + .split_alpha_from_numeric = true, + .replace_word_hyphens = true, + .delete_word_hyphens = true, + .delete_final_periods = true, + .delete_acronym_periods = true, + .drop_english_possessives = true, + .delete_apostrophes = true, + .expand_numex = true, + .roman_numerals = true }; -inline normalize_options_t get_libpostal_default_options(void) { +normalize_options_t get_libpostal_default_options(void) { return LIBPOSTAL_DEFAULT_OPTIONS; } diff --git a/src/libpostal.h b/src/libpostal.h index a817df0d..8525e03e 100644 --- a/src/libpostal.h +++ b/src/libpostal.h @@ -41,24 +41,24 @@ typedef struct normalize_options { uint16_t address_components; // String options - uint64_t latin_ascii:1; - uint64_t transliterate:1; - uint64_t strip_accents:1; - uint64_t decompose:1; - uint64_t lowercase:1; - uint64_t trim_string:1; - uint64_t drop_parentheticals:1; - uint64_t replace_numeric_hyphens:1; - uint64_t delete_numeric_hyphens:1; - uint64_t split_alpha_from_numeric:1; - uint64_t replace_word_hyphens:1; - uint64_t delete_word_hyphens:1; - uint64_t delete_final_periods:1; - uint64_t delete_acronym_periods:1; - uint64_t drop_english_possessives:1; - uint64_t delete_apostrophes:1; - uint64_t expand_numex:1; - uint64_t roman_numerals:1; + bool latin_ascii; + bool transliterate; + bool strip_accents; + bool decompose; + bool lowercase; + bool trim_string; + bool drop_parentheticals; + bool replace_numeric_hyphens; + bool delete_numeric_hyphens; + bool split_alpha_from_numeric; + bool replace_word_hyphens; + bool delete_word_hyphens; + bool delete_final_periods; + bool delete_acronym_periods; + bool drop_english_possessives; + bool delete_apostrophes; + bool expand_numex; + bool roman_numerals; } normalize_options_t;