diff options
| author | Peng Wu <alexepico@gmail.com> | 2012-09-06 13:46:56 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2012-09-06 13:46:56 +0800 |
| commit | 732e8b4010613953e5af74ea6062af24b770f572 (patch) | |
| tree | c7fec427063b4ba29cde1460f12a34325cf8d889 /utils/storage | |
| parent | bb3218247dfddf2c90f0a353059908dfb6890119 (diff) | |
| download | libpinyin-732e8b4010613953e5af74ea6062af24b770f572.tar.gz libpinyin-732e8b4010613953e5af74ea6062af24b770f572.tar.xz libpinyin-732e8b4010613953e5af74ea6062af24b770f572.zip | |
write TAGLIB_GET_TAGVALUE
Diffstat (limited to 'utils/storage')
| -rw-r--r-- | utils/storage/import_interpolation.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/utils/storage/import_interpolation.cpp b/utils/storage/import_interpolation.cpp index 9295096..787f893 100644 --- a/utils/storage/import_interpolation.cpp +++ b/utils/storage/import_interpolation.cpp @@ -33,6 +33,14 @@ (phrase_table, phrase_index, string); \ } +#define TAGLIB_GET_TAGVALUE(type, var, conv) \ + type var; \ + { \ + gpointer value = NULL; \ + assert(g_hash_table_lookup_extended \ + (required, #var, NULL, &value)); \ + var = conv((const char *)value); \ + } enum LINE_TYPE{ BEGIN_LINE = 1, @@ -81,10 +89,9 @@ bool parse_headline(){ } assert(line_type == BEGIN_LINE); - char * value = NULL; - assert(g_hash_table_lookup_extended - (required, "model", NULL, (gpointer *)&value)); - if ( !( strcmp("interpolation", value) == 0 ) ) { + /* check header */ + TAGLIB_GET_TAGVALUE(const char *, model, (const char *)); + if ( !( strcmp("interpolation", model) == 0 ) ) { fprintf(stderr, "error: interpolation model expected.\n"); return false; } @@ -137,9 +144,7 @@ bool parse_unigram(FILE * input, PhraseLargeTable2 * phrase_table, /* handle \item in \1-gram */ TAGLIB_GET_VALUE(token, 0); - gpointer value = NULL; - assert(g_hash_table_lookup_extended(required, "count", NULL, &value)); - glong count = atol((const char *)value); + TAGLIB_GET_TAGVALUE(glong, count, atol); phrase_index->add_unigram_frequency(token, count); break; } @@ -174,10 +179,7 @@ bool parse_bigram(FILE * input, PhraseLargeTable2 * phrase_table, TAGLIB_GET_VALUE(token1, 0); TAGLIB_GET_VALUE(token2, 1); - gpointer value = NULL; - /* tag: count */ - assert(g_hash_table_lookup_extended(required, "count", NULL, &value)); - glong count = atol((const char *)value); + TAGLIB_GET_TAGVALUE(glong, count, atol); if ( last_token != token1 ) { if ( last_token && last_single_gram ) { |