isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/frt_q_match_all.c

@@ -16,13 +16,11 @@ typedef struct MatchAllScorer {
     float           score;
 } MatchAllScorer;
 
-static float masc_score(FrtScorer *self)
-{
+static float masc_score(FrtScorer *self) {
     return MASc(self)->score;
 }
 
-static bool masc_next(FrtScorer *self)
-{
+static bool masc_next(FrtScorer *self) {
     while (self->doc < (MASc(self)->max_doc - 1)) {
         self->doc++;
         if (!MASc(self)->ir->is_deleted(MASc(self)->ir, self->doc)) {
@@ -32,14 +30,12 @@ static bool masc_next(FrtScorer *self)
     return false;
 }
 
-static bool masc_skip_to(FrtScorer *self, int doc_num)
-{
+static bool masc_skip_to(FrtScorer *self, int doc_num) {
     self->doc = doc_num - 1;
     return masc_next(self);
 }
 
-static FrtExplanation *masc_explain(FrtScorer *self, int doc_num)
-{
+static FrtExplanation *masc_explain(FrtScorer *self, int doc_num) {
     (void)self;
     (void)doc_num;
     return frt_expl_new(1.0, "MatchAllScorer");
@@ -72,13 +68,11 @@ static FrtScorer *masc_new(FrtWeight *weight, FrtIndexReader *ir) {
  *
  ***************************************************************************/
 
-static char *maw_to_s(FrtWeight *self)
-{
+static char *maw_to_s(FrtWeight *self) {
     return frt_strfmt("MatchAllWeight(%f)", self->value);
 }
 
-static FrtExplanation *maw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num)
-{
+static FrtExplanation *maw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num) {
     FrtExplanation *expl;
     if (!ir->is_deleted(ir, doc_num)) {
         expl = frt_expl_new(self->value, "MatchAllQuery: product of:");
@@ -117,14 +111,12 @@ static char *maq_to_s(FrtQuery *self, ID default_field) {
     }
 }
 
-static unsigned long long maq_hash(FrtQuery *self)
-{
+static unsigned long long maq_hash(FrtQuery *self) {
     (void)self;
     return 0;
 }
 
-static int maq_eq(FrtQuery *self, FrtQuery *o)
-{
+static int maq_eq(FrtQuery *self, FrtQuery *o) {
     (void)self; (void)o;
     return true;
 }

data/ext/isomorfeus_ferret_ext/frt_q_multi_term.c

@@ -76,8 +76,7 @@ static bool tdew_next(TermDocEnumWrapper *self) {
         self->pointer_max = self->tde->read(self->tde, self->docs, self->freqs, TDE_READ_SIZE);
         if (self->pointer_max != 0) {
             self->pointer = 0;
-        }
-        else {
+        } else {
             return false;
         }
     }

data/ext/isomorfeus_ferret_ext/frt_q_parser.c

@@ -1957,8 +1957,7 @@ static const char *not_word =   " \t()[]{}!\"~^|<>=";
  * Note that +get_word+ is also responsible for returning field names and
  * matching the special tokens 'AND', 'NOT', 'REQ' and 'OR'.
  */
-static int get_word(YYSTYPE *lvalp, FrtQParser *qp)
-{
+static int get_word(YYSTYPE *lvalp, FrtQParser *qp) {
     bool is_wild = false;
     int len;
     char c;
@@ -1978,8 +1977,7 @@ static int get_word(YYSTYPE *lvalp, FrtQParser *qp)
             case '\\':
                 if ((c = *qp->qstrp) == '\0') {
                     *bufp++ = '\\';
-                }
-                else {
+                } else {
                     *bufp++ = c;
                     qp->qstrp++;
                 }
@@ -1989,8 +1987,7 @@ static int get_word(YYSTYPE *lvalp, FrtQParser *qp)
                     qp->qstrp++;
                     *bufp++ = ':';
                     *bufp++ = ':';
-                }
-                else {
+                } else {
                    goto get_word_done;
                 }
                 break;
@@ -2061,8 +2058,7 @@ get_word_done:
  * If no special characters or tokens are found then yylex delegates to
  * +get_word+ which will fetch the next query-word.
  */
-static int yylex(YYSTYPE *lvalp, FrtQParser *qp)
-{
+static int yylex(YYSTYPE *lvalp, FrtQParser *qp) {
     char c, nc;
 
     while ((c=*qp->qstrp++) == ' ' || c == '\t') {
@@ -2104,8 +2100,7 @@ static int yylex(YYSTYPE *lvalp, FrtQParser *qp)
  * It is responsible for clearing any memory that was allocated during the
  * parsing process.
  */
-static int yyerror(FrtQParser *qp, rb_encoding *encoding, char const *msg)
-{
+static int yyerror(FrtQParser *qp, rb_encoding *encoding, char const *msg) {
     (void)encoding;
     qp->destruct = true;
     if (!qp->handle_parse_errors) {
@@ -2143,12 +2138,10 @@ static FrtTokenStream *get_cached_ts(FrtQParser *qp, ID field, char *text, rb_en
         if (!ts) {
             ts = frt_a_get_ts(qp->analyzer, field, text, encoding);
             frt_h_set(qp->ts_cache, (void *)field, ts);
-        }
-        else {
+        } else {
             ts->reset(ts, text, encoding);
         }
-    }
-    else {
+    } else {
         ts = qp->non_tokenizer;
         ts->reset(ts, text, encoding);
     }
@@ -2160,29 +2153,25 @@ static FrtTokenStream *get_cached_ts(FrtQParser *qp, ID field, char *text, rb_en
  * if 0 or 1 clauses are present to NULL or the actual query in the clause
  * respectively.
  */
-static FrtQuery *get_bool_q(FrtBCArray *bca)
-{
+static FrtQuery *get_bool_q(FrtBCArray *bca) {
     FrtQuery *q;
     const int clause_count = bca->size;
 
     if (clause_count == 0) {
         q = NULL;
         free(bca->clauses);
-    }
-    else if (clause_count == 1) {
+    } else if (clause_count == 1) {
         FrtBooleanClause *bc = bca->clauses[0];
         if (bc->is_prohibited) {
             q = frt_bq_new(false);
             frt_bq_add_query_nr(q, bc->query, FRT_BC_MUST_NOT);
             frt_bq_add_query_nr(q, frt_maq_new(), FRT_BC_MUST);
-        }
-        else {
+        } else {
             q = bc->query;
         }
         free(bc);
         free(bca->clauses);
-    }
-    else {
+    } else {
         q = frt_bq_new(false);
         /* copy clauses into query */
 
@@ -2199,8 +2188,7 @@ static FrtQuery *get_bool_q(FrtBCArray *bca)
  * Base method for appending BooleanClauses to a FrtBooleanClause array. This
  * method doesn't care about the type of clause (MUST, SHOULD, MUST_NOT).
  */
-static void bca_add_clause(FrtBCArray *bca, FrtBooleanClause *clause)
-{
+static void bca_add_clause(FrtBCArray *bca, FrtBooleanClause *clause) {
     if (bca->size >= bca->capa) {
         bca->capa <<= 1;
         FRT_REALLOC_N(bca->clauses, FrtBooleanClause *, bca->capa);
@@ -2213,8 +2201,7 @@ static void bca_add_clause(FrtBCArray *bca, FrtBooleanClause *clause)
  * Add the first clause to a BooleanClause array. This method is also
  * responsible for allocating a new BooleanClause array.
  */
-static FrtBCArray *first_cls(FrtBooleanClause *clause)
-{
+static FrtBCArray *first_cls(FrtBooleanClause *clause) {
     FrtBCArray *bca = FRT_ALLOC_AND_ZERO(FrtBCArray);
     bca->capa = BCA_INIT_CAPA;
     bca->clauses = FRT_ALLOC_N(FrtBooleanClause *, BCA_INIT_CAPA);
@@ -2230,8 +2217,7 @@ static FrtBCArray *first_cls(FrtBooleanClause *clause)
  * MUST clauses. (If they are currently MUST_NOT clauses they stay as they
  * are.)
  */
-static FrtBCArray *add_and_cls(FrtBCArray *bca, FrtBooleanClause *clause)
-{
+static FrtBCArray *add_and_cls(FrtBCArray *bca, FrtBooleanClause *clause) {
     if (clause) {
         if (bca->size == 1) {
             if (!bca->clauses[0]->is_prohibited) {
@@ -2249,8 +2235,7 @@ static FrtBCArray *add_and_cls(FrtBCArray *bca, FrtBooleanClause *clause)
 /**
  * Add SHOULD clause to the BooleanClause array.
  */
-static FrtBCArray *add_or_cls(FrtBCArray *bca, FrtBooleanClause *clause)
-{
+static FrtBCArray *add_or_cls(FrtBCArray *bca, FrtBooleanClause *clause) {
     if (clause) {
         bca_add_clause(bca, clause);
     }
@@ -2262,12 +2247,10 @@ static FrtBCArray *add_or_cls(FrtBCArray *bca, FrtBooleanClause *clause)
  * clause type.
  */
 static FrtBCArray *add_default_cls(FrtQParser *qp, FrtBCArray *bca,
-                                FrtBooleanClause *clause)
-{
+                                FrtBooleanClause *clause) {
     if (qp->or_default) {
         add_or_cls(bca, clause);
-    }
-    else {
+    } else {
         add_and_cls(bca, clause);
     }
     return bca;
@@ -2276,8 +2259,7 @@ static FrtBCArray *add_default_cls(FrtQParser *qp, FrtBCArray *bca,
 /**
  * destroy array of BooleanClauses
  */
-static void bca_destroy(FrtBCArray *bca)
-{
+static void bca_destroy(FrtBCArray *bca) {
     int i;
     for (i = 0; i < bca->size; i++) {
         frt_bc_deref(bca->clauses[i]);
@@ -2289,12 +2271,10 @@ static void bca_destroy(FrtBCArray *bca)
 /**
  * Turn a query into a BooleanClause for addition to a BooleanQuery.
  */
-static FrtBooleanClause *get_bool_cls(FrtQuery *q, FrtBCType occur)
-{
+static FrtBooleanClause *get_bool_cls(FrtQuery *q, FrtBCType occur) {
     if (q) {
         return frt_bc_new(q, occur);
-    }
-    else {
+    } else {
         return NULL;
     }
 }
@@ -2314,8 +2294,7 @@ static FrtQuery *get_term_q(FrtQParser *qp, ID field, char *word, rb_encoding *e
 
     if ((token = frt_ts_next(stream)) == NULL) {
         q = NULL;
-    }
-    else {
+    } else {
         q = frt_tq_new(field, token->text);
         if ((token = frt_ts_next(stream)) != NULL) {
             /* Less likely case, destroy the term query and create a
@@ -2329,8 +2308,7 @@ static FrtQuery *get_term_q(FrtQParser *qp, ID field, char *word, rb_encoding *e
                     frt_phq_add_term(q, token->text, token->pos_inc);
                     /* add some slop since single term was expected */
                     ((FrtPhraseQuery *)q)->slop++;
-                }
-                else {
+                } else {
                     frt_phq_append_multi_term(q, token->text);
                 }
             } while ((token = frt_ts_next(stream)) != NULL);
@@ -2351,8 +2329,7 @@ static FrtQuery *get_fuzzy_q(FrtQParser *qp, ID field, char *word, char *slop_st
 
     if ((token = frt_ts_next(stream)) == NULL) {
         q = NULL;
-    }
-    else {
+    } else {
         /* it only makes sense to find one term in a fuzzy query */
         float slop = frt_qp_default_fuzzy_min_sim;
         if (slop_str) {
@@ -2423,8 +2400,7 @@ static FrtQuery *get_wild_q(FrtQParser *qp, ID field, char *pattern, rb_encoding
         pattern[len - 1] = 0;
         q = frt_prefixq_new(field, pattern);
         pattern[len - 1] = '*';
-    }
-    else {
+    } else {
         q = frt_wcq_new(field, pattern);
     }
     FrtMTQMaxTerms(q) = qp->max_clauses;
@@ -2447,8 +2423,7 @@ static FrtHashSet *add_field(FrtQParser *qp, const char *field_name) {
  * will push a new FieldStack object onto the stack and add +field+ to its
  * fields set.
  */
-static FrtHashSet *first_field(FrtQParser *qp, const char *field_name)
-{
+static FrtHashSet *first_field(FrtQParser *qp, const char *field_name) {
     qp_push_fields(qp, frt_hs_new_ptr(NULL), true);
     return add_field(qp, field_name);
 }
@@ -2456,8 +2431,7 @@ static FrtHashSet *first_field(FrtQParser *qp, const char *field_name)
 /**
  * Destroy a phrase object freeing all allocated memory.
  */
-static void ph_destroy(Phrase *self)
-{
+static void ph_destroy(Phrase *self) {
     int i;
     for (i = 0; i < self->size; i++) {
         frt_ary_destroy(self->positions[i].terms, &free);
@@ -2470,8 +2444,7 @@ static void ph_destroy(Phrase *self)
 /**
  * Allocate a new Phrase object
  */
-static Phrase *ph_new()
-{
+static Phrase *ph_new() {
   Phrase *self = FRT_ALLOC_AND_ZERO(Phrase);
   self->capa = PHRASE_INIT_CAPA;
   self->positions = FRT_ALLOC_AND_ZERO_N(FrtPhrasePosition, PHRASE_INIT_CAPA);
@@ -2482,8 +2455,7 @@ static Phrase *ph_new()
  * Add the first word to the phrase. This method is also in charge of
  * allocating a new Phrase object.
  */
-static Phrase *ph_first_word(char *word)
-{
+static Phrase *ph_first_word(char *word) {
     Phrase *self = ph_new();
     if (word) { /* no point in adding NULL in start */
         self->positions[0].terms = frt_ary_new_type_capa(char *, 1);
@@ -2496,8 +2468,7 @@ static Phrase *ph_first_word(char *word)
 /**
  * Add a new word to the Phrase
  */
-static Phrase *ph_add_word(Phrase *self, char *word)
-{
+static Phrase *ph_add_word(Phrase *self, char *word) {
     if (word) {
         const int index = self->size;
         FrtPhrasePosition *pp = self->positions;
@@ -2511,8 +2482,7 @@ static Phrase *ph_add_word(Phrase *self, char *word)
         frt_ary_push(pp[index].terms, frt_estrdup(word));
         self->size++;
         self->pos_inc = 0;
-    }
-    else {
+    } else {
         self->pos_inc++;
     }
     return self;
@@ -2522,8 +2492,7 @@ static Phrase *ph_add_word(Phrase *self, char *word)
  * Adds a word to the Phrase object in the same position as the previous word
  * added to the Phrase. This will later be turned into a multi-PhraseQuery.
  */
-static Phrase *ph_add_multi_word(Phrase *self, char *word)
-{
+static Phrase *ph_add_multi_word(Phrase *self, char *word) {
     const int index = self->size - 1;
     FrtPhrasePosition *pp = self->positions;
 
@@ -2570,8 +2539,7 @@ static FrtQuery *get_phrase_query(FrtQParser *qp, ID field, Phrase *phrase, char
         const int word_count = frt_ary_size(words);
         if (word_count == 1) {
             q = get_term_q(qp, field, words[0], encoding);
-        }
-        else {
+        } else {
             int i;
             int term_cnt = 0;
             FrtToken *token;
@@ -2583,8 +2551,7 @@ static FrtQuery *get_phrase_query(FrtQParser *qp, ID field, Phrase *phrase, char
                     free(words[i]);
                     last_word = words[i] = frt_estrdup(token->text);
                     ++term_cnt;
-                }
-                else {
+                } else {
                     /* empty words will later be ignored */
                     words[i][0] = '\0';
                 }
@@ -2608,8 +2575,7 @@ static FrtQuery *get_phrase_query(FrtQParser *qp, ID field, Phrase *phrase, char
                     break;
             }
         }
-    }
-    else if (pos_cnt > 1) {
+    } else if (pos_cnt > 1) {
         FrtToken *token;
         FrtTokenStream *stream;
         int i, j;
@@ -2635,15 +2601,13 @@ static FrtQuery *get_phrase_query(FrtQParser *qp, ID field, Phrase *phrase, char
                     if (token->pos_inc) {
                         frt_phq_add_term(q, token->text,
                                      pos_inc ? pos_inc : token->pos_inc);
-                    }
-                    else {
+                    } else {
                         frt_phq_append_multi_term(q, token->text);
                         ((FrtPhraseQuery *)q)->slop++;
                     }
                     pos_inc = 0;
                 }
-            }
-            else {
+            } else {
                 bool added_position = false;
 
                 for (j = 0; j < word_count; j++) {
@@ -2654,8 +2618,7 @@ static FrtQuery *get_phrase_query(FrtQParser *qp, ID field, Phrase *phrase, char
                                          pos_inc ? pos_inc : token->pos_inc);
                             added_position = true;
                             pos_inc = 0;
-                        }
-                        else {
+                        } else {
                             frt_phq_append_multi_term(q, token->text);
                         }
                     }
@@ -2671,8 +2634,7 @@ static FrtQuery *get_phrase_query(FrtQParser *qp, ID field, Phrase *phrase, char
  * the query parser as the all PhraseQuery didn't work well for this. Once the
  * PhraseQuery has been built the Phrase object needs to be destroyed.
  */
-static FrtQuery *get_phrase_q(FrtQParser *qp, Phrase *phrase, char *slop_str, rb_encoding *encoding)
-{
+static FrtQuery *get_phrase_q(FrtQParser *qp, Phrase *phrase, char *slop_str, rb_encoding *encoding) {
     FrtQuery *volatile q = NULL;
     FLDS(q, get_phrase_query(qp, field, phrase, slop_str, encoding));
     ph_destroy(phrase);
@@ -2724,8 +2686,7 @@ static FrtQuery *get_r_q(FrtQParser *qp, ID field, char *from, char *to, bool in
  * the bottom of the stack (ie the very first set of fields pushed onto the
  * stack).
  */
-static void qp_push_fields(FrtQParser *self, FrtHashSet *fields, bool destroy)
-{
+static void qp_push_fields(FrtQParser *self, FrtHashSet *fields, bool destroy) {
     FrtFieldStack *fs = FRT_ALLOC(FrtFieldStack);
 
     fs->next    = self->fields_top;
@@ -2741,8 +2702,7 @@ static void qp_push_fields(FrtQParser *self, FrtHashSet *fields, bool destroy)
  * get called when query modified by a field modifier ("field1|field2:") has
  * been fully parsed and the field specifier no longer applies.
  */
-static void qp_pop_fields(FrtQParser *self)
-{
+static void qp_pop_fields(FrtQParser *self) {
     FrtFieldStack *fs = self->fields_top;
 
     if (fs->destroy) {
@@ -2758,8 +2718,7 @@ static void qp_pop_fields(FrtQParser *self)
 /**
  * Free all memory allocated by the QueryParser.
  */
-void frt_qp_destroy(FrtQParser *self)
-{
+void frt_qp_destroy(FrtQParser *self) {
     if (self->tokenized_fields != self->all_fields) {
         frt_hs_destroy(self->tokenized_fields);
     }
@@ -2838,8 +2797,7 @@ static const char *PHRASE_CHARS = "<>|\"";
  * +str_insert_char+ inserts a character at the beginning of a string by
  * shifting the rest of the string right.
  */
-static void str_insert_char(char *str, int len, char chr)
-{
+static void str_insert_char(char *str, int len, char chr) {
     memmove(str+1, str, len*sizeof(char));
     *str = chr;
 }
@@ -2857,8 +2815,7 @@ static void str_insert_char(char *str, int len, char chr)
  * ( <>,|," ). Note that '<' and '>' will also be escaped unless the appear
  * together like so; '<>'.
  */
-char *frt_qp_clean_str(char *str)
-{
+char *frt_qp_clean_str(char *str) {
     int b, pb = -1;
     int br_cnt = 0;
     bool quote_open = false;
@@ -2892,8 +2849,7 @@ char *frt_qp_clean_str(char *str)
             case '(':
               if (!quote_open) {
                   br_cnt++;
-              }
-              else {
+              } else {
                   *nsp++ = '\\';
               }
               *nsp++ = b;
@@ -2903,12 +2859,10 @@ char *frt_qp_clean_str(char *str)
                     if (br_cnt == 0) {
                         str_insert_char(new_str, (int)(nsp - new_str), '(');
                         nsp++;
-                    }
-                    else {
+                    } else {
                         br_cnt--;
                     }
-                }
-                else {
+                } else {
                     *nsp++ = '\\';
                 }
                 *nsp++ = b;
@@ -2919,8 +2873,7 @@ char *frt_qp_clean_str(char *str)
                         /* remove the escape character */
                         nsp--;
                         nsp[-1] = '<';
-                    }
-                    else {
+                    } else {
                         *nsp++ = '\\';
                     }
                 }
@@ -2951,8 +2904,7 @@ char *frt_qp_clean_str(char *str)
  * analyzer. It then turns these tokens (if any) into a boolean query. If it
  * fails to find any tokens, this method will return NULL.
  */
-static FrtQuery *qp_get_bad_query(FrtQParser *qp, char *str, rb_encoding *encoding)
-{
+static FrtQuery *qp_get_bad_query(FrtQParser *qp, char *str, rb_encoding *encoding) {
     FrtQuery *volatile q = NULL;
     qp->recovering = true;
     assert(qp->fields_top->next == NULL);
@@ -2968,8 +2920,7 @@ static FrtQuery *qp_get_bad_query(FrtQParser *qp, char *str, rb_encoding *encodi
  * and turns them into a boolean query on the default fields.
  */
 
-FrtQuery *qp_parse(FrtQParser *self, char *query_string, rb_encoding *encoding)
-{
+FrtQuery *qp_parse(FrtQParser *self, char *query_string, rb_encoding *encoding) {
     FrtQuery *result = NULL;
     char *qstr;
     unsigned char *dp_start = NULL;