fixes test_chewing_table
authorPeng Wu <alexepico@gmail.com>
Fri, 18 May 2012 03:13:13 +0000 (11:13 +0800)
committerPeng Wu <alexepico@gmail.com>
Fri, 18 May 2012 03:21:23 +0000 (11:21 +0800)
tests/storage/test_chewing_table.cpp
utils/utils_helper.h [new file with mode: 0644]

index a5d5bea..1c705f1 100644 (file)
@@ -92,46 +92,47 @@ int main(int argc, char * argv[]) {
 
         for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) {
             GArray * & range = ranges[i];
-            if (range) {
-                if (range->len)
-                    printf("range items number:%d\n", range->len);
-
-                for (size_t k = 0; k < range->len; ++k) {
-                    PhraseIndexRange * onerange =
-                        &g_array_index(range, PhraseIndexRange, k);
-                    printf("start:%d\tend:%d\n", onerange->m_range_begin,
-                           onerange->m_range_end);
-
-                   PhraseItem item;
-                   for ( phrase_token_t token = onerange->m_range_begin;
-                          token != onerange->m_range_end; ++token){
-
-                       phrase_index.get_phrase_item( token, item);
-
-                        /* get phrase string */
-                       ucs4_t buffer[MAX_PHRASE_LENGTH + 1];
-                       item.get_phrase_string(buffer);
-                       char * string = g_ucs4_to_utf8
-                           ( buffer, item.get_phrase_length(),
-                             NULL, NULL, NULL);
-                       printf("%s\t", string);
-                       g_free(string);
-
-                        ChewingKey chewing_buffer[MAX_PHRASE_LENGTH];
-                        size_t npron = item.get_n_pronunciation();
-                        guint32 freq;
-                        for (size_t m = 0; m < npron; ++m){
-                            item.get_nth_pronunciation(m, chewing_buffer, freq);
-                            for (size_t n = 0; n < item.get_phrase_length();
-                                  ++n){
-                                printf("%s'",
-                                       chewing_buffer[n].get_pinyin_string());
-                            }
-                            printf("\b\t%d\t", freq);
+            if (!range)
+                continue;
+
+            if (range->len)
+                printf("range items number:%d\n", range->len);
+
+            for (size_t k = 0; k < range->len; ++k) {
+                PhraseIndexRange * onerange =
+                    &g_array_index(range, PhraseIndexRange, k);
+                printf("start:%d\tend:%d\n", onerange->m_range_begin,
+                       onerange->m_range_end);
+
+                PhraseItem item;
+                for ( phrase_token_t token = onerange->m_range_begin;
+                      token != onerange->m_range_end; ++token){
+
+                    phrase_index.get_phrase_item( token, item);
+
+                    /* get phrase string */
+                    ucs4_t buffer[MAX_PHRASE_LENGTH + 1];
+                    item.get_phrase_string(buffer);
+                    char * string = g_ucs4_to_utf8
+                        ( buffer, item.get_phrase_length(),
+                          NULL, NULL, NULL);
+                    printf("%s\t", string);
+                    g_free(string);
+
+                    ChewingKey chewing_buffer[MAX_PHRASE_LENGTH];
+                    size_t npron = item.get_n_pronunciation();
+                    guint32 freq;
+                    for (size_t m = 0; m < npron; ++m){
+                        item.get_nth_pronunciation(m, chewing_buffer, freq);
+                        for (size_t n = 0; n < item.get_phrase_length();
+                             ++n){
+                            printf("%s'",
+                                   chewing_buffer[n].get_pinyin_string());
                         }
+                        printf("\b\t%d\t", freq);
                     }
-                    printf("\n");
                 }
+                printf("\n");
             }
             g_array_set_size(range, 0);
         }
diff --git a/utils/utils_helper.h b/utils/utils_helper.h
new file mode 100644 (file)
index 0000000..e69de29