remove table index in chewing key rest

diff --git a/src/storage/chewing_key.h b/src/storage/chewing_key.h
index 68733d4a405ab863e519049c0bac7e7ce3528ba3..3f1d1db1f6bd6d8dd6910b41070c86e5253a0f3c 100644 (file)
--- a/src/storage/chewing_key.h
+++ b/src/storage/chewing_key.h
@@ -197,18 +197,14 @@ static inline bool operator == (ChewingKey lhs, ChewingKey rhs) {
 
 struct ChewingKeyRest
 {
-    /* Note: the table index is deprecated,
-     *   and will be removed in the next major release.
-     *   Currently this is kept for debugging purpose.
+    /* Note: the table index is removed,
      *   Please use get_table_index in ChewingKey.
      */
-    guint16 m_table_index;         /* the index in pinyin parser table. */
     guint16 m_raw_begin;           /* the begin of the raw input. */
     guint16 m_raw_end;             /* the end of the raw input. */
 
     ChewingKeyRest() {
         /* the 0th item in pinyin parser table is reserved for invalid. */
-        m_table_index = 0;
         m_raw_begin = 0;
         m_raw_end = 0;
     }

diff --git a/src/storage/pinyin_parser2.cpp b/src/storage/pinyin_parser2.cpp
index d8cfaa69b8bd685adcbb1c12011c2a87b23e86ab..a7629098560e48912a5b8f04f5093ea5f4ee5ce1 100644 (file)
--- a/src/storage/pinyin_parser2.cpp
+++ b/src/storage/pinyin_parser2.cpp
@@ -416,7 +416,7 @@ int FullPinyinParser2::final_step(size_t step_len, ChewingKeyVector & keys,
         gint16 pos = curstep->m_num_keys - 1;
 
         /* skip "'" */
-        if (0 != curstep->m_key_rest.m_table_index) {
+        if (0 != curstep->m_key.get_table_index()) {
             ChewingKey * key = &g_array_index(keys, ChewingKey, pos);
             ChewingKeyRest * rest = &g_array_index
                 (key_rests, ChewingKeyRest, pos);