refine pinyin.h

diff --git a/src/include/novel_types.h b/src/include/novel_types.h
index b72708b..e2d2363 100644 (file)
--- a/src/include/novel_types.h
+++ b/src/include/novel_types.h
@@ -131,6 +131,10 @@ typedef double parameter_t;
 
 #define LAMBDA_PARAMETER 0.330642
 
+/* Array of ChewingKey/ChewingKeyRest */
+typedef GArray * ChewingKeyVector;
+typedef GArray * ChewingKeyRestVector;
+
 /* Array of phrase_token_t */
 typedef GArray * TokenVector;
 typedef TokenVector MatchResults;

diff --git a/src/pinyin.h b/src/pinyin.h
index 1543a07..2183388 100644 (file)
--- a/src/pinyin.h
+++ b/src/pinyin.h
@@ -27,7 +27,6 @@
 #include "novel_types.h"
 #include "pinyin_custom2.h"
 #include "chewing_key.h"
-#include "pinyin_parser2.h"
 
 using namespace pinyin;
 

diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am
index 0ad3bdf..9eac03c 100644 (file)
--- a/src/storage/Makefile.am
+++ b/src/storage/Makefile.am
@@ -23,11 +23,11 @@ libpinyinincludedir = $(includedir)/libpinyin-@VERSION@
 
 libpinyininclude_HEADERS= chewing_enum.h \
                          chewing_key.h \
-                         pinyin_custom2.h \
-                         pinyin_parser2.h
+                         pinyin_custom2.h
 
 
-noinst_HEADERS         = phrase_index.h \
+noinst_HEADERS         = pinyin_parser2.h \
+                         phrase_index.h \
                          phrase_index_logger.h \
                          phrase_large_table.h \
                          ngram.h \

diff --git a/src/storage/pinyin_parser2.h b/src/storage/pinyin_parser2.h
index 864932a..644dd07 100644 (file)
--- a/src/storage/pinyin_parser2.h
+++ b/src/storage/pinyin_parser2.h
@@ -79,8 +79,6 @@ typedef struct {
     const char m_tone;
 } chewing_tone_item_t;
 
-typedef GArray * ChewingKeyVector;
-typedef GArray * ChewingKeyRestVector;
 typedef GArray * ParseValueVector;