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

am e85b5bed: Merge "Skip shortcut targets if any. (A1)"

Browse source 
* commit 'e85b5bed57f4086f45bce53f27f959277afe3f0c':
  Skip shortcut targets if any. (A1)
This commit is contained in:
Jean Chalard 2011-12-26 19:51:11 -08:00 committed by Android Git Automerger
commit f2a12e5ad3
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
native/src/binary_format.h
View file

@ -145,15 +145,15 @@ inline int BinaryFormat::skipFrequency(const uint8_t flags, const int pos) {
inline int BinaryFormat::skipAllAttributes(const uint8_t* const dict, const uint8_t flags,
const int pos) {
// This function skips all attributes. The format makes provision for future extension
// with other attributes (notably shortcuts) but for the time being, bigrams are the
// only attributes that may be found in a character group, so we only look at bigrams
// in this version.
if (UnigramDictionary::FLAG_HAS_BIGRAMS & flags) {
return skipAttributes(dict, pos);
} else {
return pos;
// This function skips all attributes: shortcuts and bigrams.
int newPos = pos;
if (UnigramDictionary::FLAG_HAS_SHORTCUT_TARGETS & flags) {
newPos = skipAttributes(dict, newPos);
}
if (UnigramDictionary::FLAG_HAS_BIGRAMS & flags) {
newPos = skipAttributes(dict, newPos);
}
return newPos;
}
inline int BinaryFormat::skipChildrenPosAndAttributes(const uint8_t* const dict,