Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9688ef2 authored by Jean Chalard's avatar Jean Chalard
Browse files

Fix a small bug 

Tests results in Ibcd6c110f1d5582425f9592c42e31152131ef80c

Bug: 7226877
Change-Id: I8d03bae3264974eff7b790e27c073b0a8758d17a
parent 6d25be9a

native/jni/src/binary_format.h

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ class BinaryFormat { 
    static int detectFormat(const uint8_t *const dict);

    static int getHeaderSize(const uint8_t *const dict);

    static int getFlags(const uint8_t *const dict);

    static bool hasBlacklistedOrNotAWordFlag(const int flags);

    static void readHeaderValue(const uint8_t *const dict, const char *const key, int *outValue,

            const int outValueSize);

    static int readHeaderValueInt(const uint8_t *const dict, const char *const key);
@@ -162,6 +163,10 @@ inline int BinaryFormat::getFlags(const uint8_t *const dict) { 
    }

}



inline bool BinaryFormat::hasBlacklistedOrNotAWordFlag(const int flags) {

    return flags & (FLAG_IS_BLACKLISTED | FLAG_IS_NOT_A_WORD);

}



inline int BinaryFormat::getHeaderSize(const uint8_t *const dict) {

    switch (detectFormat(dict)) {

    case 1:

native/jni/src/suggest/core/dicnode/dic_node.h

+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ class DicNode { 
    }



    bool isImpossibleBigramWord() const {

        const int probability = mDicNodeProperties.getProbability();

        if (probability == 0) {

        if (mDicNodeProperties.hasBlacklistedOrNotAWordFlag()) {

            return true;

        }

        const int prevWordLen = mDicNodeState.mDicNodeStatePrevWord.getPrevWordLength()

native/jni/src/suggest/core/dicnode/dic_node_properties.h

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <stdint.h>



#include "binary_format.h"

#include "defines.h"



namespace latinime {
@@ -144,6 +145,10 @@ class DicNodeProperties { 
        return mChildrenCount > 0 || mDepth != mLeavingDepth;

    }



    bool hasBlacklistedOrNotAWordFlag() const {

        return BinaryFormat::hasBlacklistedOrNotAWordFlag(mFlags);

    }



 private:

    // Caution!!!

    // Use a default copy constructor and an assign operator because shallow copies are ok

native/jni/src/terminal_attributes.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class TerminalAttributes { 
    }



    bool isBlacklistedOrNotAWord() const {

        return mFlags & (BinaryFormat::FLAG_IS_BLACKLISTED | BinaryFormat::FLAG_IS_NOT_A_WORD);

        return BinaryFormat::hasBlacklistedOrNotAWordFlag(mFlags);

    }



 private: