diff options
| author |   Yuichiro Hanada <yhanada@google.com> | 2012-09-18 10:10:02 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-09-18 10:10:02 -0700 |
| commit | f05a2c329498d1fd781ccde4b425792ae4da6503 (patch) | |
| tree | b5604ee849fcda8eda3b84d09907062ea212fa84 | |
| parent | ea24d13c7ae5c8f1417a0165d806b47702eda07b (diff) | |
| parent | b686df15fcc95611c524318359fe9ecb4fd6f74c (diff) | |
| download | latinime-f05a2c329498d1fd781ccde4b425792ae4da6503.tar.gz latinime-f05a2c329498d1fd781ccde4b425792ae4da6503.tar.xz latinime-f05a2c329498d1fd781ccde4b425792ae4da6503.zip | |
am b686df15: Add a new flag for linked list nodes.
* commit 'b686df15fcc95611c524318359fe9ecb4fd6f74c':
Add a new flag for linked list nodes.
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/FormatSpec.java | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java index 3a5f24c86..72d12299b 100644 --- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java +++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java @@ -786,7 +786,8 @@ public class BinaryDictInputOutput { return (options.mFrenchLigatureProcessing ? FormatSpec.FRENCH_LIGATURE_PROCESSING_FLAG : 0) + (options.mGermanUmlautProcessing ? FormatSpec.GERMAN_UMLAUT_PROCESSING_FLAG : 0) + (hasBigrams ? FormatSpec.CONTAINS_BIGRAMS_FLAG : 0) - + (formatOptions.mHasParentAddress ? FormatSpec.HAS_PARENT_ADDRESS : 0); + + (formatOptions.mHasParentAddress ? FormatSpec.HAS_PARENT_ADDRESS : 0) + + (formatOptions.mHasLinkedListNode ? FormatSpec.HAS_LINKEDLIST_NODE : 0); } /** @@ -1540,7 +1541,8 @@ public class BinaryDictInputOutput { 0 != (optionsFlags & FormatSpec.GERMAN_UMLAUT_PROCESSING_FLAG), 0 != (optionsFlags & FormatSpec.FRENCH_LIGATURE_PROCESSING_FLAG)), new FormatOptions(version, - 0 != (optionsFlags & FormatSpec.HAS_PARENT_ADDRESS))); + 0 != (optionsFlags & FormatSpec.HAS_PARENT_ADDRESS), + 0 != (optionsFlags & FormatSpec.HAS_LINKEDLIST_NODE))); return header; } diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java index 7b6817a25..f8f13b197 100644 --- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java +++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java @@ -150,9 +150,12 @@ public final class FormatSpec { // These options need to be the same numeric values as the one in the native reading code. static final int GERMAN_UMLAUT_PROCESSING_FLAG = 0x1; + // TODO: Make the native reading code read this variable. static final int HAS_PARENT_ADDRESS = 0x2; static final int FRENCH_LIGATURE_PROCESSING_FLAG = 0x4; static final int CONTAINS_BIGRAMS_FLAG = 0x8; + // TODO: Make the native reading code read this variable. + static final int HAS_LINKEDLIST_NODE = 0x10; // TODO: Make this value adaptative to content data, store it in the header, and // use it in the reading code. |