From 8861bc3da5e49f0c0ae074593a72df3771d57ec6 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 20 Jun 2016 10:29:03 +0800 Subject: rename functions --- src/pinyin.cpp | 9 +++------ src/storage/phonetic_key_matrix.cpp | 8 ++++---- src/storage/phonetic_key_matrix.h | 10 +++++----- 3 files changed, 12 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/pinyin.cpp b/src/pinyin.cpp index 1d50ea9..b107918 100644 --- a/src/pinyin.cpp +++ b/src/pinyin.cpp @@ -1194,8 +1194,7 @@ size_t pinyin_parse_more_full_pinyins(pinyin_instance_t * instance, instance->m_parsed_len = parsed_len; - fill_phonetic_key_matrix_from_chewing_keys - (&matrix, keys, key_rests); + fill_matrix(&matrix, keys, key_rests); resplit_step(options, &matrix); @@ -1235,8 +1234,7 @@ size_t pinyin_parse_more_double_pinyins(pinyin_instance_t * instance, instance->m_parsed_len = parsed_len; - fill_phonetic_key_matrix_from_chewing_keys - (&matrix, keys, key_rests); + fill_matrix(&matrix, keys, key_rests); fuzzy_syllable_step(options, &matrix); @@ -1272,8 +1270,7 @@ size_t pinyin_parse_more_chewings(pinyin_instance_t * instance, instance->m_parsed_len = parsed_len; - fill_phonetic_key_matrix_from_chewing_keys - (&matrix, keys, key_rests); + fill_matrix(&matrix, keys, key_rests); fuzzy_syllable_step(options, &matrix); diff --git a/src/storage/phonetic_key_matrix.cpp b/src/storage/phonetic_key_matrix.cpp index 8b7e295..5b6ec5b 100644 --- a/src/storage/phonetic_key_matrix.cpp +++ b/src/storage/phonetic_key_matrix.cpp @@ -27,9 +27,9 @@ namespace pinyin{ -bool fill_phonetic_key_matrix_from_chewing_keys(PhoneticKeyMatrix * matrix, - ChewingKeyVector keys, - ChewingKeyRestVector key_rests) { +bool fill_matrix(PhoneticKeyMatrix * matrix, + ChewingKeyVector keys, + ChewingKeyRestVector key_rests) { assert(keys->len == key_rests->len); const ChewingKey * key = NULL; @@ -299,7 +299,7 @@ bool fuzzy_syllable_step(pinyin_option_t options, } -bool dump_phonetic_key_matrix(PhoneticKeyMatrix * matrix) { +bool dump_matrix(PhoneticKeyMatrix * matrix) { size_t length = matrix->size(); GArray * keys = g_array_new(TRUE, TRUE, sizeof(ChewingKey)); diff --git a/src/storage/phonetic_key_matrix.h b/src/storage/phonetic_key_matrix.h index 2d3c24f..75ea2aa 100644 --- a/src/storage/phonetic_key_matrix.h +++ b/src/storage/phonetic_key_matrix.h @@ -171,13 +171,13 @@ public: }; /** - * fill_phonetic_key_matrix_from_chewing_keys: + * fill_matrix: * Convert ChewingKeyVector and ChewingKeyRestVector * to PhoneticKeyMatrix. */ -bool fill_phonetic_key_matrix_from_chewing_keys(PhoneticKeyMatrix * matrix, - ChewingKeyVector keys, - ChewingKeyRestVector key_rests); +bool fill_matrix(PhoneticKeyMatrix * matrix, + ChewingKeyVector keys, + ChewingKeyRestVector key_rests); /** * resplit_step: @@ -205,7 +205,7 @@ bool inner_split_step(pinyin_option_t options, bool fuzzy_syllable_step(pinyin_option_t options, PhoneticKeyMatrix * matrix); -bool dump_phonetic_key_matrix(PhoneticKeyMatrix * matrix); +bool dump_matrix(PhoneticKeyMatrix * matrix); int search_matrix(FacadeChewingTable2 * table, PhoneticKeyMatrix * matrix, -- cgit