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

[numex] Removing concatenated property from language struct as all numeric spellouts might be concatenated

Browse Source
This commit is contained in:
Al
2015-06-01 17:12:07 -04:00
parent a20b768237
commit 080f382065
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/numex.c
View File

@@ -85,12 +85,11 @@ numex_table_t *numex_table_new(void) {
}
numex_language_t *numex_language_new(char *name, bool concatenated, size_t rules_index, size_t num_rules, size_t ordinals_index, size_t num_ordinals) {
numex_language_t *numex_language_new(char *name, size_t rules_index, size_t num_rules, size_t ordinals_index, size_t num_ordinals) {
numex_language_t *language = malloc(sizeof(numex_language_t));
if (language == NULL) return NULL;
language->name = strdup(name);
language->concatenated = concatenated;
language->rules_index = rules_index;
language->num_rules = num_rules;
language->ordinals_index = ordinals_index;
@@ -144,11 +143,6 @@ numex_language_t *numex_language_read(FILE *f) {
return NULL;
}
bool concatenated;
if (!file_read_uint8(f, (uint8_t *)&concatenated)) {
return NULL;
}
size_t rules_index;
if (!file_read_uint64(f, (uint64_t *)&rules_index)) {
return NULL;
@@ -169,7 +163,7 @@ numex_language_t *numex_language_read(FILE *f) {
return NULL;
}
numex_language_t *language = numex_language_new(name, concatenated, rules_index, num_rules, ordinals_index, num_ordinals);
numex_language_t *language = numex_language_new(name, rules_index, num_rules, ordinals_index, num_ordinals);
return language;
@@ -186,10 +180,6 @@ bool numex_language_write(numex_language_t *language, FILE *f) {
return false;
}
if (!file_write_uint8(f, language->concatenated)) {
return false;
}
if (!file_write_uint64(f, language->rules_index)) {
return false;
}

3
src/numex.h
View File

@@ -68,7 +68,6 @@ VECTOR_INIT_FREE_DATA(ordinal_indicator_array, ordinal_indicator_t *, ordinal_in
typedef struct numex_language {
char *name;
bool concatenated;
size_t rules_index;
size_t num_rules;
size_t ordinals_index;
@@ -86,7 +85,7 @@ typedef struct {
numex_table_t *get_numex_table(void);
numex_language_t *numex_language_new(char *name, bool concatenated, size_t rules_index, size_t num_rules, size_t ordinals_index, size_t num_ordinals)
numex_language_t *numex_language_new(char *name, size_t rules_index, size_t num_rules, size_t ordinals_index, size_t num_ordinals)
void numex_language_destroy(numex_language_t *self);
bool numex_table_add_language(numex_language_t *language);