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

am ebe3b3e8: Merge "Fix bug related to dynamic patricia trie bigram adding." 

* commit 'ebe3b3e8fd7b7a6ecbffa7088a36c60bfef8807a':
  Fix bug related to dynamic patricia trie bigram adding.
main
Keisuke Kuroyanagi 2013-09-12 22:51:06 -07:00 committed by Android Git Automerger
parent dc2cc82182 ebe3b3e8fd
commit 6af8936bec
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ void DynamicPatriciaTrieNodeReader::fetchNodeInfoFromBufferAndProcessMovedNode(c
mChildrenPosFieldPos += mBuffer->getOriginalBufferSize(); mChildrenPosFieldPos += mBuffer->getOriginalBufferSize();
} }
mChildrenPos = DynamicPatriciaTrieReadingUtils::readChildrenPositionAndAdvancePosition( mChildrenPos = DynamicPatriciaTrieReadingUtils::readChildrenPositionAndAdvancePosition(
dictBuf, mFlags, &pos); dictBuf, &pos);
if (usesAdditionalBuffer && mChildrenPos != NOT_A_DICT_POS) { if (usesAdditionalBuffer && mChildrenPos != NOT_A_DICT_POS) {
mChildrenPos += mBuffer->getOriginalBufferSize(); mChildrenPos += mBuffer->getOriginalBufferSize();
} }

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

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

3
native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_reading_utils.h
View File

@ -42,8 +42,7 @@ class DynamicPatriciaTrieReadingUtils {
return ByteArrayUtils::readSint24AndAdvancePosition(buffer, pos); return ByteArrayUtils::readSint24AndAdvancePosition(buffer, pos);
} }
static int readChildrenPositionAndAdvancePosition(const uint8_t *const buffer, static int readChildrenPositionAndAdvancePosition(const uint8_t *const buffer, int *const pos);
const NodeFlags flags, int *const pos);
/** /**
* Node Flags * Node Flags

1
native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h
View File

@ -172,6 +172,7 @@ class ByteArrayUtils {
int codePoint = readCodePointAndAdvancePosition(buffer, pos); int codePoint = readCodePointAndAdvancePosition(buffer, pos);
while (NOT_A_CODE_POINT != codePoint && length < maxLength) { while (NOT_A_CODE_POINT != codePoint && length < maxLength) {
codePoint = readCodePointAndAdvancePosition(buffer, pos); codePoint = readCodePointAndAdvancePosition(buffer, pos);
length++;
} }
return length; return length;
} }