aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/terminal_attributes.h
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-01-12 01:18:00 +0900
committerKen Wakasa <kwakasa@google.com>2013-01-15 12:39:08 +0900
commit5db594abbad2d9e8d2cf1aa6e417aa50ffc5dfc1 (patch)
tree1b8506c49f7ac09e50da134f3fdc30df414b9f6f /native/jni/src/terminal_attributes.h
parent019bcc62b92d2a43057a00c2db0a2928966c6247 (diff)
downloadlatinime-5db594abbad2d9e8d2cf1aa6e417aa50ffc5dfc1.tar.gz
latinime-5db594abbad2d9e8d2cf1aa6e417aa50ffc5dfc1.tar.xz
latinime-5db594abbad2d9e8d2cf1aa6e417aa50ffc5dfc1.zip
Remove MAX_WORD_LENGTH_INTERNAL
Change-Id: Ie11ff000675601acff5fbb00e9e9f48eb32c5071
Diffstat (limited to 'native/jni/src/terminal_attributes.h')
-rw-r--r--native/jni/src/terminal_attributes.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/native/jni/src/terminal_attributes.h b/native/jni/src/terminal_attributes.h
index 6c2e0dce1..a8cc03b8d 100644
--- a/native/jni/src/terminal_attributes.h
+++ b/native/jni/src/terminal_attributes.h
@@ -30,10 +30,6 @@ namespace latinime {
class TerminalAttributes {
public:
class ShortcutIterator {
- const uint8_t *const mDict;
- int mPos;
- bool mHasNextShortcutTarget;
-
public:
ShortcutIterator(const uint8_t *dict, const int pos, const uint8_t flags)
: mDict(dict), mPos(pos),
@@ -50,7 +46,7 @@ class TerminalAttributes {
const int shortcutFlags = BinaryFormat::getFlagsAndForwardPointer(mDict, &mPos);
mHasNextShortcutTarget = 0 != (shortcutFlags & BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT);
unsigned int i;
- for (i = 0; i < MAX_WORD_LENGTH_INTERNAL; ++i) {
+ for (i = 0; i < MAX_WORD_LENGTH; ++i) {
const int codePoint = BinaryFormat::getCodePointAndForwardPointer(mDict, &mPos);
if (NOT_A_CODE_POINT == codePoint) break;
outWord[i] = codePoint;
@@ -58,6 +54,11 @@ class TerminalAttributes {
*outFreq = BinaryFormat::getAttributeFrequencyFromFlags(shortcutFlags);
return i;
}
+
+ private:
+ const uint8_t *const mDict;
+ int mPos;
+ bool mHasNextShortcutTarget;
};
TerminalAttributes(const uint8_t *const dict, const uint8_t flags, const int pos)