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

Commit 99007de9 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Quit using BinaryDictionaryInfo in header reading methods. 

Bug: 6669677
Change-Id: I5198ae28fcc271dd6ab3c33df940a2d15513a8c8
parent 51f0c95f

native/jni/src/suggest/core/dictionary/binary_dictionary_format_utils.cpp

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#include "suggest/core/dictionary/binary_dictionary_format_utils.h"



#include "suggest/core/dictionary/byte_array_utils.h"



namespace latinime {



/**
@@ -27,7 +29,6 @@ const int BinaryDictionaryFormatUtils::DICTIONARY_MINIMUM_SIZE = 4; 
/**

 * Format versions

 */



// The versions of Latin IME that only handle format version 1 only test for the magic

// number, so we had to change it so that version 2 files would be rejected by older

// implementations. On this occasion, we made the magic number 32 bits long.

native/jni/src/suggest/core/dictionary/binary_dictionary_format_utils.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <stdint.h>



#include "defines.h"

#include "suggest/core/dictionary/byte_array_utils.h"



namespace latinime {

native/jni/src/suggest/core/dictionary/binary_dictionary_header.cpp

+5 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "suggest/core/dictionary/binary_dictionary_header.h"



#include "defines.h"

#include "suggest/core/dictionary/binary_dictionary_info.h"



namespace latinime {
@@ -26,16 +25,15 @@ const char *const BinaryDictionaryHeader::MULTIPLE_WORDS_DEMOTION_RATE_KEY = 
const float BinaryDictionaryHeader::DEFAULT_MULTI_WORD_COST_MULTIPLIER = 1.0f;

const float BinaryDictionaryHeader::MULTI_WORD_COST_MULTIPLIER_SCALE = 100.0f;



BinaryDictionaryHeader::BinaryDictionaryHeader(

        const BinaryDictionaryInfo *const binaryDictionaryInfo)

        : mBinaryDictionaryInfo(binaryDictionaryInfo),

          mDictionaryFlags(BinaryDictionaryHeaderReadingUtils::getFlags(binaryDictionaryInfo)),

          mSize(BinaryDictionaryHeaderReadingUtils::getHeaderSize(binaryDictionaryInfo)),

BinaryDictionaryHeader::BinaryDictionaryHeader(const uint8_t *const dictBuf)

        : mDictBuf(dictBuf),

          mDictionaryFlags(BinaryDictionaryHeaderReadingUtils::getFlags(mDictBuf)),

          mSize(BinaryDictionaryHeaderReadingUtils::getHeaderSize(mDictBuf)),

          mMultiWordCostMultiplier(readMultiWordCostMultiplier()) {}



float BinaryDictionaryHeader::readMultiWordCostMultiplier() const {

    const int headerValue = BinaryDictionaryHeaderReadingUtils::readHeaderValueInt(

            mBinaryDictionaryInfo, MULTIPLE_WORDS_DEMOTION_RATE_KEY);

            mDictBuf, MULTIPLE_WORDS_DEMOTION_RATE_KEY);

    if (headerValue == S_INT_MIN) {

        // not found

        return DEFAULT_MULTI_WORD_COST_MULTIPLIER;

native/jni/src/suggest/core/dictionary/binary_dictionary_header.h

+6 −3
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef LATINIME_BINARY_DICTIONARY_HEADER_H

#define LATINIME_BINARY_DICTIONARY_HEADER_H



#include <stdint.h>



#include "defines.h"

#include "suggest/core/dictionary/binary_dictionary_header_reading_utils.h"
@@ -28,9 +30,10 @@ class BinaryDictionaryInfo; 
 * This class abstracts dictionary header structures and provide interface to access dictionary

 * header information.

 */

// TODO:: Move header classes to policyimpl.

class BinaryDictionaryHeader {

 public:

    explicit BinaryDictionaryHeader(const BinaryDictionaryInfo *const binaryDictionaryInfo);

    explicit BinaryDictionaryHeader(const uint8_t *const dictBuf);



    AK_FORCE_INLINE int getSize() const {

        return mSize;
@@ -60,7 +63,7 @@ class BinaryDictionaryHeader { 
            outValue[0] = '\0';

            return;

        }

        if (!BinaryDictionaryHeaderReadingUtils::readHeaderValue(mBinaryDictionaryInfo,

        if (!BinaryDictionaryHeaderReadingUtils::readHeaderValue(mDictBuf,

                key, outValue, outValueSize)) {

            outValue[0] = '?';

            outValue[1] = '\0';
@@ -74,7 +77,7 @@ class BinaryDictionaryHeader { 
    static const float DEFAULT_MULTI_WORD_COST_MULTIPLIER;

    static const float MULTI_WORD_COST_MULTIPLIER_SCALE;



    const BinaryDictionaryInfo *const mBinaryDictionaryInfo;

    const uint8_t *const mDictBuf;

    const BinaryDictionaryHeaderReadingUtils::DictionaryFlags mDictionaryFlags;

    const int mSize;

    const float mMultiWordCostMultiplier;

native/jni/src/suggest/core/dictionary/binary_dictionary_header_reading_utils.cpp

+18 −33
Original line number Diff line number Diff line
@@ -20,12 +20,11 @@ 
#include <cstdlib>



#include "defines.h"

#include "suggest/core/dictionary/binary_dictionary_info.h"

#include "suggest/core/dictionary/byte_array_utils.h"



namespace latinime {



const int BinaryDictionaryHeaderReadingUtils::MAX_OPTION_KEY_LENGTH = 256;



const int BinaryDictionaryHeaderReadingUtils::VERSION_2_HEADER_MAGIC_NUMBER_SIZE = 4;

const int BinaryDictionaryHeaderReadingUtils::VERSION_2_HEADER_DICTIONARY_VERSION_SIZE = 2;

const int BinaryDictionaryHeaderReadingUtils::VERSION_2_HEADER_FLAG_SIZE = 2;
@@ -43,68 +42,54 @@ const BinaryDictionaryHeaderReadingUtils::DictionaryFlags 
const BinaryDictionaryHeaderReadingUtils::DictionaryFlags

        BinaryDictionaryHeaderReadingUtils::FRENCH_LIGATURE_PROCESSING_FLAG = 0x4;



/* static */ int BinaryDictionaryHeaderReadingUtils::getHeaderSize(

        const BinaryDictionaryInfo *const binaryDictionaryInfo) {

    switch (getHeaderVersion(binaryDictionaryInfo->getFormat())) {

        case HEADER_VERSION_2:

/* static */ int BinaryDictionaryHeaderReadingUtils::getHeaderSize(const uint8_t *const dictBuf) {

    // See the format of the header in the comment in

    // BinaryDictionaryFormatUtils::detectFormatVersion()

            return ByteArrayUtils::readUint32(binaryDictionaryInfo->getDictBuf(),

    return ByteArrayUtils::readUint32(dictBuf,

            VERSION_2_HEADER_MAGIC_NUMBER_SIZE + VERSION_2_HEADER_DICTIONARY_VERSION_SIZE

                    + VERSION_2_HEADER_FLAG_SIZE);

        default:

            return S_INT_MAX;

    }

}



/* static */ BinaryDictionaryHeaderReadingUtils::DictionaryFlags

        BinaryDictionaryHeaderReadingUtils::getFlags(

                const BinaryDictionaryInfo *const binaryDictionaryInfo) {

    switch (getHeaderVersion(binaryDictionaryInfo->getFormat())) {

        case HEADER_VERSION_2:

            return ByteArrayUtils::readUint16(binaryDictionaryInfo->getDictBuf(),

                    VERSION_2_HEADER_MAGIC_NUMBER_SIZE + VERSION_2_HEADER_DICTIONARY_VERSION_SIZE);

        default:

            return NO_FLAGS;

    }

        BinaryDictionaryHeaderReadingUtils::getFlags(const uint8_t *const dictBuf) {

    return ByteArrayUtils::readUint16(dictBuf, VERSION_2_HEADER_MAGIC_NUMBER_SIZE

            + VERSION_2_HEADER_DICTIONARY_VERSION_SIZE);

}



// Returns if the key is found or not and reads the found value into outValue.

/* static */ bool BinaryDictionaryHeaderReadingUtils::readHeaderValue(

        const BinaryDictionaryInfo *const binaryDictionaryInfo,

/* static */ bool BinaryDictionaryHeaderReadingUtils::readHeaderValue(const uint8_t *const dictBuf,

        const char *const key, int *outValue, const int outValueSize) {

    if (outValueSize <= 0) {

        return false;

    }

    const int headerSize = getHeaderSize(binaryDictionaryInfo);

    int pos = getHeaderOptionsPosition(binaryDictionaryInfo->getFormat());

    const int headerSize = getHeaderSize(dictBuf);

    int pos = getHeaderOptionsPosition();

    if (pos == NOT_A_DICT_POS) {

        // The header doesn't have header options.

        return false;

    }

    while (pos < headerSize) {

        if(ByteArrayUtils::compareStringInBufferWithCharArray(

                binaryDictionaryInfo->getDictBuf(), key, headerSize - pos, &pos) == 0) {

                dictBuf, key, headerSize - pos, &pos) == 0) {

            // The key was found.

            const int length = ByteArrayUtils::readStringAndAdvancePosition(

                    binaryDictionaryInfo->getDictBuf(), outValueSize, outValue, &pos);

                    dictBuf, outValueSize, outValue, &pos);

            // Add a 0 terminator to the string.

            outValue[length < outValueSize ? length : outValueSize - 1] = '\0';

            return true;

        }

        ByteArrayUtils::advancePositionToBehindString(

                binaryDictionaryInfo->getDictBuf(), headerSize - pos, &pos);

        ByteArrayUtils::advancePositionToBehindString(dictBuf, headerSize - pos, &pos);

    }

    // The key was not found.

    return false;

}



/* static */ int BinaryDictionaryHeaderReadingUtils::readHeaderValueInt(

        const BinaryDictionaryInfo *const binaryDictionaryInfo, const char *const key) {

        const uint8_t *const dictBuf, const char *const key) {

    const int bufferSize = LARGEST_INT_DIGIT_COUNT;

    int intBuffer[bufferSize];

    char charBuffer[bufferSize];

    if (!readHeaderValue(binaryDictionaryInfo, key, intBuffer, bufferSize)) {

    if (!readHeaderValue(dictBuf, key, intBuffer, bufferSize)) {

        return S_INT_MIN;

    }

    for (int i = 0; i < bufferSize; ++i) {