nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix children position reading for dynamic patricia trie."

main
Keisuke Kuroyanagi 2013-08-29 09:46:32 +00:00 committed by Android (Google) Code Review
parent 6c926a1d5e 69ebca0643
commit b384cb28a1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_node_reader.cpp
View File

@ -45,15 +45,11 @@ void DynamicPatriciaTrieNodeReader::fetchNodeInfoFromBufferAndProcessMovedNode(c
} else { } else {
mProbability = NOT_A_PROBABILITY; mProbability = NOT_A_PROBABILITY;
} }
if (hasChildren()) {
mChildrenPos = DynamicPatriciaTrieReadingUtils::readChildrenPositionAndAdvancePosition( mChildrenPos = DynamicPatriciaTrieReadingUtils::readChildrenPositionAndAdvancePosition(
dictBuf, mFlags, &pos); dictBuf, mFlags, &pos);
if (usesAdditionalBuffer && mChildrenPos != NOT_A_DICT_POS) { if (usesAdditionalBuffer && mChildrenPos != NOT_A_DICT_POS) {
mChildrenPos += mOriginalDictSize; mChildrenPos += mOriginalDictSize;
} }
} else {
mChildrenPos = NOT_A_DICT_POS;
}
if (usesAdditionalBuffer) { if (usesAdditionalBuffer) {
pos += mOriginalDictSize; pos += mOriginalDictSize;
} }

2
native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_node_reader.h
View File

@ -71,7 +71,7 @@ class DynamicPatriciaTrieNodeReader {
} }
AK_FORCE_INLINE bool hasChildren() const { AK_FORCE_INLINE bool hasChildren() const {
return PatriciaTrieReadingUtils::hasChildrenInFlags(mFlags); return mChildrenPos != NOT_A_DICT_POS;
} }
AK_FORCE_INLINE bool isTerminal() const { AK_FORCE_INLINE bool isTerminal() const {

8
native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_reading_utils.cpp
View File

@ -32,7 +32,13 @@ const DptReadingUtils::NodeFlags DptReadingUtils::FLAG_IS_DELETED = 0x80;
const uint8_t *const buffer, const NodeFlags flags, int *const pos) { const uint8_t *const buffer, const NodeFlags flags, int *const pos) {
if ((flags & MASK_MOVED) == FLAG_IS_NOT_MOVED) { if ((flags & MASK_MOVED) == FLAG_IS_NOT_MOVED) {
const int base = *pos; const int base = *pos;
return base + ByteArrayUtils::readSint24AndAdvancePosition(buffer, pos); const int offset = ByteArrayUtils::readSint24AndAdvancePosition(buffer, pos);
if (offset == 0) {
// 0 offset means that the node does not have children.
return NOT_A_DICT_POS;
} else {
return base + offset;
}
} else { } else {
return NOT_A_DICT_POS; return NOT_A_DICT_POS;
} }