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

Commit a65c267b authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Move some dictionary related implementations to the dictionary directory 

Change-Id: I6fe71a540ad91ca46755be234abc8894242e2413
parent 7097aa2d

native/jni/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -49,9 +49,7 @@ LATIN_IME_CORE_SRC_FILES := \ 
    bigram_dictionary.cpp \

    char_utils.cpp \

    correction.cpp \

    dictionary.cpp \

    dic_traverse_wrapper.cpp \

    digraph_utils.cpp \

    unigram_dictionary.cpp \

    words_priority_queue.cpp \

    suggest/core/suggest.cpp \
@@ -59,6 +57,9 @@ LATIN_IME_CORE_SRC_FILES := \ 
        dic_node.cpp \

        dic_node_utils.cpp \

        dic_nodes_cache.cpp) \

    $(addprefix suggest/core/dictionary/, \

        dictionary.cpp \

        digraph_utils.cpp) \

    $(addprefix suggest/core/layout/, \

        additional_proximity_chars.cpp \

        proximity_info.cpp \

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+3 −2
Original line number Diff line number Diff line
@@ -29,13 +29,14 @@ 
#include <cstdio> // for fopen() etc.

#endif // USE_MMAP_FOR_DICTIONARY



#include "binary_format.h"

#include "com_android_inputmethod_latin_BinaryDictionary.h"



#include "correction.h"

#include "dictionary.h"

#include "jni.h"

#include "jni_common.h"

#include "suggest_options.h"

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

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



namespace latinime {

native/jni/src/bigram_dictionary.cpp

+4 −3
Original line number Diff line number Diff line
@@ -19,11 +19,12 @@ 
#define LOG_TAG "LatinIME: bigram_dictionary.cpp"



#include "bigram_dictionary.h"

#include "binary_format.h"

#include "bloom_filter.h"



#include "char_utils.h"

#include "defines.h"

#include "dictionary.h"

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

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

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



namespace latinime {

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "dic_node.h"

#include "suggest/core/dicnode/dic_node.h"



namespace latinime {

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

+5 −5
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 


#include "char_utils.h"

#include "defines.h"

#include "dic_node_state.h"

#include "dic_node_profiler.h"

#include "dic_node_properties.h"

#include "dic_node_release_listener.h"

#include "digraph_utils.h"

#include "suggest/core/dicnode/dic_node_state.h"

#include "suggest/core/dicnode/dic_node_profiler.h"

#include "suggest/core/dicnode/dic_node_properties.h"

#include "suggest/core/dicnode/dic_node_release_listener.h"

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



#if DEBUG_DICT

#define LOGI_SHOW_ADD_COST_PROP \