fixes phrase_index.h

[platform/upstream/libpinyin.git] / src / storage / pinyin_parser2.cpp

diff --git a/src/storage/pinyin_parser2.cpp b/src/storage/pinyin_parser2.cpp
index 198edde..131231c 100644 (file)
--- a/src/storage/pinyin_parser2.cpp
+++ b/src/storage/pinyin_parser2.cpp
@@ -299,51 +299,6 @@ int FullPinyinParser2::parse (pinyin_option_t options, ChewingKeyVector & keys,
             next_sep = k;
         }
 
-#if 0
-        /* Heuristic Method:
-         *   do maximum forward match first. */
-        for (size_t pos = i; pos < next_sep; ++pos) {
-            curstep = &g_array_index(m_parse_steps, parse_value_t, pos);
-            size_t try_len = std_lite::min
-                (pos + max_full_pinyin_length, next_sep);
-            for (size_t n = try_len; n > pos; --n) {
-                nextstep = &g_array_index(m_parse_steps, parse_value_t, n);
-
-                /* gen next step */
-                const char * onepinyin = input + pos;
-                gint16 onepinyinlen = n - pos;
-                value = parse_value_t();
-
-                ChewingKey key; ChewingKeyRest rest;
-                bool parsed = parse_one_key
-                    (options, key, onepinyin, onepinyinlen);
-                rest.m_raw_begin = pos; rest.m_raw_end = n;
-
-                if (!parsed)
-                    continue;
-
-                //printf("onepinyin:%s len:%d\n", onepinyin, onepinyinlen);
-                value.m_key = key; value.m_key_rest = rest;
-                value.m_num_keys = curstep->m_num_keys + 1;
-                value.m_parsed_len = curstep->m_parsed_len + onepinyinlen;
-                value.m_last_step = pos;
-
-                /* save next step */
-                if (-1 == nextstep->m_last_step)
-                    *nextstep = value;
-                if (value.m_parsed_len > nextstep->m_parsed_len)
-                    *nextstep = value;
-                if (value.m_parsed_len == nextstep->m_parsed_len &&
-                    value.m_num_keys < nextstep->m_num_keys)
-                    *nextstep = value;
-
-                /* maximum forward, set pos to n in next iteration. */
-                pos = n - 1;
-                break;
-            }
-        }
-#endif
-
         /* dynamic programming here. */
         /* for (size_t m = i; m < next_sep; ++m) */
         {
@@ -515,12 +470,10 @@ bool FullPinyinParser2::post_process2(pinyin_option_t options,
         }
 
         /* lookup re-split table */
-        size_t k;
         const resplit_table_item_t * item = NULL;
 
         item = retrieve_resplit_item_by_original_pinyins
-            (options, cur_key, cur_rest, next_key, next_rest,
-             str, len);
+            (options, cur_key, cur_rest, next_key, next_rest, str, len);
 
         if (item) {
             /* no ops */
@@ -637,21 +590,21 @@ const resplit_table_item_t * FullPinyinParser2::retrieve_resplit_item_by_resplit
         item = resplit_table + k;
 
         const char * onepinyin = str + cur_rest->m_raw_begin;
-        size_t len = strlen(item->m_orig_keys[0]);
+        size_t len = strlen(item->m_new_keys[0]);
 
         if (cur_rest->length() != len)
             continue;
 
-        if (0 != strncmp(onepinyin, item->m_orig_keys[0], len))
+        if (0 != strncmp(onepinyin, item->m_new_keys[0], len))
             continue;
 
         onepinyin = str + next_rest->m_raw_begin;
-        len = strlen(item->m_orig_keys[1]);
+        len = strlen(item->m_new_keys[1]);
 
         if (next_rest->length() != len)
             continue;
 
-        if (0 == strncmp(onepinyin, item->m_orig_keys[1], len))
+        if (0 == strncmp(onepinyin, item->m_new_keys[1], len))
             break;
     }
 
@@ -693,6 +646,7 @@ bool DoublePinyinParser2::parse_one_key(pinyin_option_t options,
 
     ChewingTone tone = CHEWING_ZERO_TONE;
     options &= ~(PINYIN_INCOMPLETE|CHEWING_INCOMPLETE);
+    options |= PINYIN_CORRECT_UE_VE | PINYIN_CORRECT_V_U;
 
     /* parse tone */
     if (3 == len) {