From fa643f7a3a028244e60d686a3a0fcc9a2b5d94c6 Mon Sep 17 00:00:00 2001 From: Al Date: Tue, 30 Jun 2015 19:17:20 -0400 Subject: [PATCH] [utf8] Moving language length constant --- src/constants.h | 3 +++ src/transliterate.h | 7 ------- src/unicode_scripts.h | 6 ++++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/constants.h b/src/constants.h index 04fa9e5d..3575e196 100644 --- a/src/constants.h +++ b/src/constants.h @@ -7,4 +7,7 @@ #define NAMESPACE_SEPARATOR_CHAR "|" #define NAMESPACE_SEPARATOR_CHAR_LEN strlen(NAMESPACE_SEPARATOR_CHAR) +// Supports ISO 639 alpha 2 and alpha 3 codes +#define MAX_LANGUAGE_LEN 4 + #endif \ No newline at end of file diff --git a/src/transliterate.h b/src/transliterate.h index 2cdf626f..8f5d9dee 100644 --- a/src/transliterate.h +++ b/src/transliterate.h @@ -72,13 +72,6 @@ KHASH_MAP_INIT_STR(str_transliterator, transliterator_t *) #define kh_script_lang_hash(key) ((uint64_t)(key).script ^ (((key).language == NULL) ? 0 : kh_str_hash_func((key).language))) #define kh_script_lang_equal(a, b) (((a).script == (b).script) && strcmp((a).language, (b).language) == 0) -#define MAX_LANGUAGE_LEN 4 - -typedef struct script_language { - script_t script; - char language[MAX_LANGUAGE_LEN]; -} script_language_t; - typedef struct transliterator_index { size_t transliterator_index; size_t num_transliterators; diff --git a/src/unicode_scripts.h b/src/unicode_scripts.h index ba797eea..c347aaef 100644 --- a/src/unicode_scripts.h +++ b/src/unicode_scripts.h @@ -2,6 +2,7 @@ #define UNICODE_SCRIPTS_H #include +#include "constants.h" #include "utf8proc/utf8proc.h" #include "unicode_script_types.h" @@ -10,6 +11,11 @@ typedef struct script_code { char *code; } script_code_t; +typedef struct script_language { + script_t script; + char language[MAX_LANGUAGE_LEN]; +} script_language_t; + typedef struct script_languages { size_t num_languages; char *languages[MAX_LANGS];