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

Commit 90619ae0 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Move utils for reading dict to policyimpl. 

Bug: 6669677
Change-Id: Ia1da3cb84b457665cf26172d3810e1d28329bca4
parent ae59ce02

native/jni/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -53,9 +53,7 @@ LATIN_IME_CORE_SRC_FILES := \ 
        dic_nodes_cache.cpp) \

    $(addprefix suggest/core/dictionary/, \

        bigram_dictionary.cpp \

        binary_dictionary_format_utils.cpp \

        bloom_filter.cpp \

        byte_array_utils.cpp \

        dictionary.cpp \

        digraph_utils.cpp \

        multi_bigram_map.cpp) \
@@ -72,6 +70,8 @@ LATIN_IME_CORE_SRC_FILES := \ 
        header/header_policy.cpp \

        header/header_reading_utils.cpp \

        shortcut/shortcut_list_reading_utils.cpp \

        utils/byte_array_utils.cpp \

        utils/format_utils.cpp \

        dictionary_structure_with_buffer_policy_factory.cpp \

        dynamic_patricia_trie_node_reader.cpp \

        dynamic_patricia_trie_policy.cpp \

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+3 −3
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
#include "defines.h"

#include "jni.h"

#include "jni_common.h"

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

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

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

#include "suggest/core/suggest_options.h"

#include "suggest/policyimpl/dictionary/utils/format_utils.h"

#include "utils/autocorrection_threshold_utils.h"



namespace latinime {
@@ -87,8 +87,8 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s 
        return 0;

    }

    Dictionary *dictionary = 0;

    if (BinaryDictionaryFormatUtils::UNKNOWN_VERSION

            == BinaryDictionaryFormatUtils::detectFormatVersion(static_cast<uint8_t *>(dictBuf),

    if (FormatUtils::UNKNOWN_VERSION

            == FormatUtils::detectFormatVersion(static_cast<uint8_t *>(dictBuf),

                    static_cast<int>(dictSize))) {

        AKLOGE("DICT: dictionary format is unknown, bad magic number");

        releaseDictBuf(static_cast<const char *>(dictBuf) - offset, adjDictSize, fd);

native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_reading_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include "suggest/policyimpl/dictionary/bigram/bigram_list_reading_utils.h"



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

#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"



namespace latinime {

native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_reading_utils.h

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



#include "defines.h"

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

#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h"



namespace latinime {

native/jni/src/suggest/policyimpl/dictionary/dictionary_structure_with_buffer_policy_factory.cpp

+4 −4
Original line number Diff line number Diff line
@@ -19,19 +19,19 @@ 
#include <stdint.h>



#include "defines.h"

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

#include "suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.h"

#include "suggest/policyimpl/dictionary/patricia_trie_policy.h"

#include "suggest/policyimpl/dictionary/utils/format_utils.h"



namespace latinime {



/* static */ DictionaryStructureWithBufferPolicy *DictionaryStructureWithBufferPolicyFactory

        ::newDictionaryStructureWithBufferPolicy(const uint8_t *const dictBuf,

                const int dictSize) {

    switch (BinaryDictionaryFormatUtils::detectFormatVersion(dictBuf, dictSize)) {

        case BinaryDictionaryFormatUtils::VERSION_2:

    switch (FormatUtils::detectFormatVersion(dictBuf, dictSize)) {

        case FormatUtils::VERSION_2:

            return new PatriciaTriePolicy(dictBuf);

        case BinaryDictionaryFormatUtils::VERSION_3:

        case FormatUtils::VERSION_3:

            return new DynamicPatriciaTriePolicy(dictBuf);

        default:

            ASSERT(false);