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

Commit 432789ac authored by Jean Chalard's avatar Jean Chalard
Browse files

Internal cleanup 

Moving functions around, renaming parameters

Change-Id: I3ab480f483d7d9700b9328cb07b16b51005098e5
parent ffefdb6c

native/src/unigram_dictionary.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ inline bool UnigramDictionary::processCurrentNode(const int pos, const int depth 
        const int diffs, const int skipPos, const int excessivePos, const int transposedPos,

        int *nextLetters, const int nextLettersSize, int *newCount, int *newChildPosition,

        bool *newTraverseAllNodes, int *newMatchRate, int *newInputIndex, int *newDiffs,

        int *nextSiblingPosition, int *nextOutputIndex) {

        int *nextSiblingPosition, int *newOutputIndex) {

    if (DEBUG_DICT) {

        int inputCount = 0;

        if (skipPos >= 0) ++inputCount;
@@ -1053,7 +1053,7 @@ inline bool UnigramDictionary::processCurrentNode(const int pos, const int depth 


    *nextSiblingPosition = Dictionary::setDictionaryValues(DICT_ROOT, IS_LATEST_DICT_VERSION, pos,

            &c, &childPosition, &terminal, &freq);

    *nextOutputIndex = depth + 1;

    *newOutputIndex = depth + 1;



    const bool needsToTraverseChildrenNodes = childPosition != 0;

native/src/unigram_dictionary.h

+3 −3
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ private: 
            bool *newTraverseAllNodes, int *newSnr, int*newInputIndex, int *newDiffs,

            int *nextSiblingPosition, int *nextOutputIndex);

    bool existsAdjacentProximityChars(const int inputIndex, const int inputLength) const;

    inline const int* getInputCharsAt(const int index) const {

        return mInputCodes + (index * MAX_PROXIMITY_CHARS);

    }

    void getWordsRec(const int childrenCount, const int pos, const int depth, const int maxDepth,

            const bool traverseAllNodes, const int snr, const int inputIndex, const int diffs,

            const int skipPos, const int excessivePos, const int transposedPos, int *nextLetters,
@@ -101,9 +104,6 @@ private: 
    bool processCurrentNodeForExactMatch(const int firstChildPos,

            const int startInputIndex, const int depth, unsigned short *word,

            int *newChildPosition, int *newCount, bool *newTerminal, int *newFreq, int *siblingPos);

    inline const int* getInputCharsAt(const int index) const {

        return mInputCodes + (index * MAX_PROXIMITY_CHARS);

    }



    const uint8_t* const DICT_ROOT;

    const int MAX_WORD_LENGTH;