diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-03-07 13:06:32 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2013-03-07 13:23:02 +0900 |
| commit | f4425aaae971fe78d44530ebe01cf7a59b2e47aa (patch) | |
| tree | 74a6455cbcfa01e63995b42eff21ba2209a1ebed /native/jni/src/defines.h | |
| parent | 2192d08b9cca6a40d834d6a5001d19b5845ed8a0 (diff) | |
| download | latinime-f4425aaae971fe78d44530ebe01cf7a59b2e47aa.tar.gz latinime-f4425aaae971fe78d44530ebe01cf7a59b2e47aa.tar.xz latinime-f4425aaae971fe78d44530ebe01cf7a59b2e47aa.zip | |
Refactor ProximityType and CorrectionType
Bug: 8277656
Change-Id: Ia7940bbf81fcf4ff5eb7869b105d98aa34155d33
Diffstat (limited to 'native/jni/src/defines.h')
| -rw-r--r-- | native/jni/src/defines.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 11dc3d20e..0aedc287f 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -275,7 +275,7 @@ static inline void prof_out(void) { #define NOT_A_CODE_POINT (-1) #define NOT_A_DISTANCE (-1) #define NOT_A_COORDINATE (-1) -#define EQUIVALENT_CHAR_WITHOUT_DISTANCE_INFO (-2) +#define MATCH_CHAR_WITHOUT_DISTANCE_INFO (-2) #define PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO (-3) #define ADDITIONAL_PROXIMITY_CHAR_DISTANCE_INFO (-4) #define NOT_AN_INDEX (-1) @@ -396,15 +396,15 @@ template<typename T> AK_FORCE_INLINE const T &max(const T &a, const T &b) { retu // Used as a return value for character comparison typedef enum { // Same char, possibly with different case or accent - EQUIVALENT_CHAR, + MATCH_CHAR, // It is a char located nearby on the keyboard - NEAR_PROXIMITY_CHAR, - // It is an unrelated char and could be a substitution char - UNRELATED_CHAR, - // It is an unrelated char nor a substitution char - UNRELATED_NOR_SUBSTITUTION_CHAR, + PROXIMITY_CHAR, // Additional proximity char which can differ by language. - ADDITIONAL_PROXIMITY_CHAR + ADDITIONAL_PROXIMITY_CHAR, + // It is a substitution char + SUBSTITUTION_CHAR, + // It is an unrelated char + UNRELATED_CHAR, } ProximityType; typedef enum { @@ -415,15 +415,16 @@ typedef enum { typedef enum { CT_MATCH, + CT_PROXIMITY, + CT_ADDITIONAL_PROXIMITY, + CT_SUBSTITUTION, CT_OMISSION, CT_INSERTION, CT_TRANSPOSITION, - CT_SUBSTITUTION, CT_SPACE_SUBSTITUTION, CT_SPACE_OMISSION, CT_COMPLETION, CT_TERMINAL, CT_NEW_WORD, - CT_NEW_WORD_BIGRAM, } CorrectionType; #endif // LATINIME_DEFINES_H |