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

[fix] making a few internal functions static

Browse Source
This commit is contained in:
Al
2017-12-29 04:50:08 -05:00
parent 098babfdee
commit cadf52d19f
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/expand.c
View File

@@ -45,7 +45,7 @@ inline uint64_t get_normalize_string_options(libpostal_normalize_options_t optio
} }
inline size_t valid_ordinal_suffix_len(char *str, token_t token, token_t prev_token, char *lang) { static inline size_t valid_ordinal_suffix_len(char *str, token_t token, token_t prev_token, char *lang) {
size_t len_ordinal_suffix = ordinal_suffix_len(str + token.offset, token.len, lang); size_t len_ordinal_suffix = ordinal_suffix_len(str + token.offset, token.len, lang);
int32_t unichr = 0; int32_t unichr = 0;
@@ -495,7 +495,7 @@ bool add_period_affixes_or_token(string_tree_t *tree, char *str, token_t token,
} }
inline uint32_t gazetteer_ignorable_components(uint16_t dictionary_id) { static inline uint32_t gazetteer_ignorable_components(uint16_t dictionary_id) {
switch (dictionary_id) { switch (dictionary_id) {
case DICTIONARY_ACADEMIC_DEGREE: case DICTIONARY_ACADEMIC_DEGREE:
return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET; return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET;
@@ -553,7 +553,7 @@ inline uint32_t gazetteer_ignorable_components(uint16_t dictionary_id) {
} }
inline uint32_t gazetteer_valid_components(uint16_t dictionary_id) { static inline uint32_t gazetteer_valid_components(uint16_t dictionary_id) {
switch (dictionary_id) { switch (dictionary_id) {
case DICTIONARY_DIRECTIONAL: case DICTIONARY_DIRECTIONAL:
return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET | LIBPOSTAL_ADDRESS_CATEGORY | LIBPOSTAL_ADDRESS_NEAR | LIBPOSTAL_ADDRESS_TOPONYM | LIBPOSTAL_ADDRESS_UNIT | LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_STAIRCASE | LIBPOSTAL_ADDRESS_ENTRANCE; return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET | LIBPOSTAL_ADDRESS_CATEGORY | LIBPOSTAL_ADDRESS_NEAR | LIBPOSTAL_ADDRESS_TOPONYM | LIBPOSTAL_ADDRESS_UNIT | LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_STAIRCASE | LIBPOSTAL_ADDRESS_ENTRANCE;
@@ -568,7 +568,7 @@ inline uint32_t gazetteer_valid_components(uint16_t dictionary_id) {
} }
} }
inline uint32_t gazetteer_edge_ignorable_components(uint16_t dictionary_id) { static inline uint32_t gazetteer_edge_ignorable_components(uint16_t dictionary_id) {
switch (dictionary_id) { switch (dictionary_id) {
// Pre/post directionals can be removed if there are non-phrase tokens // Pre/post directionals can be removed if there are non-phrase tokens
case DICTIONARY_DIRECTIONAL: case DICTIONARY_DIRECTIONAL:
@@ -582,7 +582,7 @@ inline uint32_t gazetteer_edge_ignorable_components(uint16_t dictionary_id) {
} }
} }
inline uint32_t gazetteer_specifier_components(uint16_t dictionary_id) { static inline uint32_t gazetteer_specifier_components(uint16_t dictionary_id) {
switch (dictionary_id) { switch (dictionary_id) {
case DICTIONARY_LEVEL_STANDALONE: case DICTIONARY_LEVEL_STANDALONE:
return LIBPOSTAL_ADDRESS_LEVEL; return LIBPOSTAL_ADDRESS_LEVEL;
@@ -600,7 +600,7 @@ inline uint32_t gazetteer_specifier_components(uint16_t dictionary_id) {
} }
inline uint32_t gazetteer_possible_root_components(uint16_t dictionary_id) { static inline uint32_t gazetteer_possible_root_components(uint16_t dictionary_id) {
switch (dictionary_id) { switch (dictionary_id) {
case DICTIONARY_ACADEMIC_DEGREE: case DICTIONARY_ACADEMIC_DEGREE:
return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET; return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET;
@@ -632,7 +632,7 @@ typedef enum {
} gazetteer_match_type_t; } gazetteer_match_type_t;
inline bool address_expansion_matches_type_for_components(address_expansion_t expansion, uint32_t address_components, gazetteer_match_type_t match_type) { static inline bool address_expansion_matches_type_for_components(address_expansion_t expansion, uint32_t address_components, gazetteer_match_type_t match_type) {
for (uint32_t j = 0; j < expansion.num_dictionaries; j++) { for (uint32_t j = 0; j < expansion.num_dictionaries; j++) {
uint16_t dictionary_id = expansion.dictionary_ids[j]; uint16_t dictionary_id = expansion.dictionary_ids[j];
uint32_t components = 0; uint32_t components = 0;
@@ -662,23 +662,23 @@ inline bool address_expansion_matches_type_for_components(address_expansion_t ex
return false; return false;
} }
inline bool address_expansion_is_ignorable_for_components(address_expansion_t expansion, uint32_t address_components) { bool address_expansion_is_ignorable_for_components(address_expansion_t expansion, uint32_t address_components) {
return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_IGNORABLE); return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_IGNORABLE);
} }
inline bool address_expansion_is_edge_ignorable_for_components(address_expansion_t expansion, uint32_t address_components) { bool address_expansion_is_edge_ignorable_for_components(address_expansion_t expansion, uint32_t address_components) {
return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_EDGE_IGNORABLE); return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_EDGE_IGNORABLE);
} }
inline bool address_expansion_is_possible_root_for_components(address_expansion_t expansion, uint32_t address_components) { bool address_expansion_is_possible_root_for_components(address_expansion_t expansion, uint32_t address_components) {
return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_POSSIBLE_ROOT); return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_POSSIBLE_ROOT);
} }
inline bool address_expansion_is_specifier_for_components(address_expansion_t expansion, uint32_t address_components) { bool address_expansion_is_specifier_for_components(address_expansion_t expansion, uint32_t address_components) {
return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_SPECIFIER); return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_SPECIFIER);
} }
inline bool address_expansion_is_valid_for_components(address_expansion_t expansion, uint32_t address_components) { bool address_expansion_is_valid_for_components(address_expansion_t expansion, uint32_t address_components) {
return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_VALID_COMPONENTS); return address_expansion_matches_type_for_components(expansion, address_components, GAZETTEER_MATCH_VALID_COMPONENTS);
} }

2
src/near_dupe.c
View File

@@ -169,7 +169,7 @@ cstring_array *expanded_component_combined(char *input, libpostal_normalize_opti
} }
} }
inline cstring_array *expanded_component_root_with_fallback(char *input, libpostal_normalize_options_t options, size_t *n) { static inline cstring_array *expanded_component_root_with_fallback(char *input, libpostal_normalize_options_t options, size_t *n) {
cstring_array *root_expansions = expand_address_root(input, options, n); cstring_array *root_expansions = expand_address_root(input, options, n);
if (*n > 0) { if (*n > 0) {
return root_expansions; return root_expansions;

2
src/place.c
View File

@@ -1,7 +1,7 @@
#include "place.h" #include "place.h"
#include "address_parser.h" #include "address_parser.h"
inline bool is_address_text_component(char *label) { static inline bool is_address_text_component(char *label) {
return (string_equals(label, ADDRESS_PARSER_LABEL_HOUSE) || return (string_equals(label, ADDRESS_PARSER_LABEL_HOUSE) ||
string_equals(label, ADDRESS_PARSER_LABEL_ROAD) || string_equals(label, ADDRESS_PARSER_LABEL_ROAD) ||
string_equals(label, ADDRESS_PARSER_LABEL_METRO_STATION) || string_equals(label, ADDRESS_PARSER_LABEL_METRO_STATION) ||