lib-fts: tokenizer-generic - move related helpers together in file

They're logically related, and not specifically simple or tr29 related,
so keep them together, so either tokeniser can use them. Cosmetic only,
no functional changes.

Signed-off-by: Phil Carmody <phil@dovecot.fi>

diff --git a/src/lib-fts/fts-tokenizer-generic.c b/src/lib-fts/fts-tokenizer-generic.c
index 2cec8f1e007481914e0c007d0b4a3704a4d759a3..0ac61dea38303a9ff824f156006d0357599731d2 100644 (file)
--- a/src/lib-fts/fts-tokenizer-generic.c
+++ b/src/lib-fts/fts-tokenizer-generic.c
@@ -108,6 +108,22 @@ shift_prev_type(struct generic_fts_tokenizer *tok, enum letter_type lt)
        tok->prev_type = lt;
 }
 
+static inline void
+add_prev_type(struct generic_fts_tokenizer *tok, enum letter_type lt)
+{
+       if(tok->prev_type != LETTER_TYPE_NONE)
+               tok->prev_prev_type = tok->prev_type;
+       tok->prev_type = lt;
+}
+
+static inline void
+add_letter(struct generic_fts_tokenizer *tok, unichar_t c)
+{
+       if(tok->letter != 0)
+               tok->prev_letter = tok->letter;
+       tok->letter = c;
+}
+
 static bool
 fts_tokenizer_generic_simple_current_token(struct generic_fts_tokenizer *tok,
                                            const char **token_r)
@@ -505,22 +521,6 @@ static bool letter_other(struct generic_fts_tokenizer *tok ATTR_UNUSED)
        return TRUE; /* Any / Any */
 }
 
-static inline void
-add_prev_type(struct generic_fts_tokenizer *tok, enum letter_type lt)
-{
-       if(tok->prev_type != LETTER_TYPE_NONE)
-               tok->prev_prev_type = tok->prev_type;
-       tok->prev_type = lt;
-}
-
-static inline void
-add_letter(struct generic_fts_tokenizer *tok, unichar_t c)
-{
-       if(tok->letter != 0)
-               tok->prev_letter = tok->letter;
-       tok->letter = c;
-}
-
 /*
    TODO: Define what to skip between words.
    TODO: Include double quotation marks? Messes up parsing?