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

am e1e5a3fa: Merge "Fill in the format-specific shortcut reading methods (A3)" 

* commit 'e1e5a3fa2f01d5fa01e529f2bda19234bb096aa1':
  Fill in the format-specific shortcut reading methods (A3)
main
Jean Chalard 2012-01-05 21:37:42 -08:00 committed by Android Git Automerger
parent 91a97fa83c e1e5a3fa2f
commit 5f650f7b4f
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
native/src/terminal_attributes.h
View File

@ -30,20 +30,28 @@ class TerminalAttributes {
public: public:
class ShortcutIterator { class ShortcutIterator {
const uint8_t* const mDict; const uint8_t* const mDict;
bool mHasNextShortcutTarget;
int mPos; int mPos;
public: public:
ShortcutIterator(const uint8_t* const dict, const int pos) : mDict(dict), mPos(pos) { ShortcutIterator(const uint8_t* dict, const int pos, const uint8_t flags) : mDict(dict),
mPos(pos) {
mHasNextShortcutTarget = (0 != (flags & UnigramDictionary::FLAG_HAS_SHORTCUT_TARGETS));
} }
inline bool hasNextShortcutTarget() const { inline bool hasNextShortcutTarget() const {
// TODO: stub method. Fill this in. return mHasNextShortcutTarget;
return false;
} }
// Gets the shortcut target itself as a uint16_t string. For parameters and return value
// see BinaryFormat::getWordAtAddress.
inline int getNextShortcutTarget(const int maxDepth, uint16_t* outWord) { inline int getNextShortcutTarget(const int maxDepth, uint16_t* outWord) {
// TODO: stub method. Fill this in. const int shortcutFlags = BinaryFormat::getFlagsAndForwardPointer(mDict, &mPos);
return 0; mHasNextShortcutTarget =
0 != (shortcutFlags & UnigramDictionary::FLAG_ATTRIBUTE_HAS_NEXT);
int shortcutAddress =
BinaryFormat::getAttributeAddressAndForwardPointer(mDict, shortcutFlags, &mPos);
return BinaryFormat::getWordAtAddress(mDict, shortcutAddress, maxDepth, outWord);
} }
}; };
@ -58,12 +66,11 @@ class TerminalAttributes {
} }
inline bool isShortcutOnly() const { inline bool isShortcutOnly() const {
// TODO: stub method. Fill this in. return 0 != (mFlags & UnigramDictionary::FLAG_IS_SHORTCUT_ONLY);
return false;
} }
inline ShortcutIterator getShortcutIterator() const { inline ShortcutIterator getShortcutIterator() const {
return ShortcutIterator(mDict, mStartPos); return ShortcutIterator(mDict, mStartPos, mFlags);
} }
}; };
} // namespace latinime } // namespace latinime