From 080f3820650dfe9f05df19a26645885259acbaff Mon Sep 17 00:00:00 2001
From: Al <albarrentine@gmail.com>
Date: Mon, 1 Jun 2015 17:12:07 -0400
Subject: [PATCH] [numex] Removing concatenated property from language struct
 as all numeric spellouts might be concatenated

---
 src/numex.c | 14 ++------------
 src/numex.h |  3 +--
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/numex.c b/src/numex.c
index 6af1fed5..e737ccf4 100644
--- a/src/numex.c
+++ b/src/numex.c
@@ -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;
     }
diff --git a/src/numex.h b/src/numex.h
index a2640845..d789b2c0 100644
--- a/src/numex.h
+++ b/src/numex.h
@@ -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);