diff options
Diffstat (limited to 'native/jni/src/terminal_attributes.h')
| -rw-r--r-- | native/jni/src/terminal_attributes.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/native/jni/src/terminal_attributes.h b/native/jni/src/terminal_attributes.h index 34ab8f0ef..53ae385ea 100644 --- a/native/jni/src/terminal_attributes.h +++ b/native/jni/src/terminal_attributes.h @@ -52,9 +52,9 @@ class TerminalAttributes { 0 != (shortcutFlags & BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT); unsigned int i; for (i = 0; i < MAX_WORD_LENGTH_INTERNAL; ++i) { - const int charCode = BinaryFormat::getCharCodeAndForwardPointer(mDict, &mPos); - if (NOT_A_CHARACTER == charCode) break; - outWord[i] = (uint16_t)charCode; + const int codePoint = BinaryFormat::getCodePointAndForwardPointer(mDict, &mPos); + if (NOT_A_CODE_POINT == codePoint) break; + outWord[i] = (uint16_t)codePoint; } *outFreq = BinaryFormat::getAttributeFrequencyFromFlags(shortcutFlags); mPos += BinaryFormat::CHARACTER_ARRAY_TERMINATOR_SIZE; @@ -62,8 +62,8 @@ class TerminalAttributes { } }; - TerminalAttributes(const uint8_t *const dict, const uint8_t flags, const int pos) : - mDict(dict), mFlags(flags), mStartPos(pos) { + TerminalAttributes(const uint8_t *const dict, const uint8_t flags, const int pos) + : mDict(dict), mFlags(flags), mStartPos(pos) { } inline ShortcutIterator getShortcutIterator() const { @@ -72,6 +72,10 @@ class TerminalAttributes { return ShortcutIterator(mDict, mStartPos + BinaryFormat::SHORTCUT_LIST_SIZE_SIZE, mFlags); } + bool isBlacklistedOrNotAWord() const { + return mFlags & (BinaryFormat::FLAG_IS_BLACKLISTED | BinaryFormat::FLAG_IS_NOT_A_WORD); + } + private: DISALLOW_IMPLICIT_CONSTRUCTORS(TerminalAttributes); const uint8_t *const mDict; |