From d8454869b62d72593c2393ef7d23c9e6c64f4b16 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 22 Mar 2012 14:25:10 +0800 Subject: update validate_constraint method --- src/lookup/pinyin_lookup.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lookup/pinyin_lookup.cpp b/src/lookup/pinyin_lookup.cpp index 0db69d9..0acf982 100644 --- a/src/lookup/pinyin_lookup.cpp +++ b/src/lookup/pinyin_lookup.cpp @@ -609,21 +609,21 @@ bool PinyinLookup::clear_constraint(CandidateConstraints constraints, size_t ind return true; } -bool PinyinLookup::validate_constraint(CandidateConstraints constraints, ChewingKeyVector m_parsed_keys){ +bool PinyinLookup::validate_constraint(CandidateConstraints constraints, ChewingKeyVector keys){ //resize constraints array size_t constraints_length = constraints->len; - if ( m_parsed_keys->len > constraints_length ){ - g_array_set_size(constraints, m_parsed_keys->len); + if ( keys->len > constraints_length ){ + g_array_set_size(constraints, keys->len); //initialize new element - for( size_t i = constraints_length; i < m_parsed_keys->len; ++i){ + for( size_t i = constraints_length; i < keys->len; ++i){ lookup_constraint_t * constraint = &g_array_index(constraints, lookup_constraint_t, i); constraint->m_type = NO_CONSTRAINT; } - }else if (m_parsed_keys->len < constraints_length ){ - g_array_set_size(constraints, m_parsed_keys->len); + }else if (keys->len < constraints_length ){ + g_array_set_size(constraints, keys->len); } - ChewingKey * pinyin_keys = (ChewingKey *)m_parsed_keys->data; + ChewingKey * pinyin_keys = (ChewingKey *)keys->data; for ( size_t i = 0; i < constraints->len; ++i){ lookup_constraint_t * constraint = &g_array_index(constraints, lookup_constraint_t, i); -- cgit