diff options
-rw-r--r-- | src/storage/pinyin_parser2.cpp | 3 | ||||
-rw-r--r-- | src/storage/pinyin_parser2.h | 1 | ||||
-rw-r--r-- | src/storage/pinyin_phrase2.h | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/storage/pinyin_parser2.cpp b/src/storage/pinyin_parser2.cpp index 8d3044a..5d2414d 100644 --- a/src/storage/pinyin_parser2.cpp +++ b/src/storage/pinyin_parser2.cpp @@ -24,9 +24,10 @@ #include <assert.h> #include <string.h> #include "stl_lite.h" +#include "pinyin_parser2.h" +#include "pinyin_phrase2.h" #include "pinyin_custom2.h" #include "chewing_key.h" -#include "pinyin_parser2.h" #include "pinyin_parser_table.h" diff --git a/src/storage/pinyin_parser2.h b/src/storage/pinyin_parser2.h index 948e31e..4e8bbdc 100644 --- a/src/storage/pinyin_parser2.h +++ b/src/storage/pinyin_parser2.h @@ -24,6 +24,7 @@ #include <glib.h> #include "chewing_key.h" +#include "pinyin_custom2.h" namespace pinyin{ diff --git a/src/storage/pinyin_phrase2.h b/src/storage/pinyin_phrase2.h index 65266fc..da8326d 100644 --- a/src/storage/pinyin_phrase2.h +++ b/src/storage/pinyin_phrase2.h @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PINYIN_PARSER2_H -#define PINYIN_PARSER2_H +#ifndef PINYIN_PHRASE2_H +#define PINYIN_PHRASE2_H #include "chewing_key.h" +#include "pinyin_custom2.h" #include "pinyin_parser2.h" namespace pinyin{ @@ -132,7 +133,7 @@ inline void compute_lower_value2(guint32 options, /* compute lower final */ sel = aKey.m_final; - for (k = aKey.m_final - 1; k >= CHEWING_ZERO_FINAL, --k) { + for (k = aKey.m_final - 1; k >= CHEWING_ZERO_FINAL; --k) { if (0 != pinyin_compare_middle_and_final2 (options, (ChewingMiddle)aKey.m_middle, (ChewingMiddle) aKey.m_middle, |