isomorfeus-ferret 0.12.7 → 0.13.2

data/ext/isomorfeus_ferret_ext/frt_q_phrase.c

@@ -4,6 +4,8 @@
 #include "frt_search.h"
 #include "frt_array.h"
 
+#undef close
+
 #define PhQ(query) ((FrtPhraseQuery *)(query))
 
 /**
@@ -13,8 +15,7 @@
  * consistant order of positions when testing. Functionally it makes no
  * difference.
  */
-static int phrase_pos_cmp(const void *p1, const void *p2)
-{
+static int phrase_pos_cmp(const void *p1, const void *p2) {
     int pos1 = ((FrtPhrasePosition *)p1)->pos;
     int pos2 = ((FrtPhrasePosition *)p2)->pos;
     if (pos1 > pos2) {
@@ -38,17 +39,15 @@ static int phrase_pos_cmp(const void *p1, const void *p2)
  ***************************************************************************/
 
 #define PP(p) ((PhPos *)(p))
-typedef struct PhPos
-{
+typedef struct PhPos {
     FrtTermDocEnum *tpe;
-    int offset;
-    int count;
-    int doc;
-    int position;
+    int            offset;
+    int            count;
+    int            doc;
+    int            position;
 } PhPos;
 
-static bool pp_next(PhPos *self)
-{
+static bool pp_next(PhPos *self) {
     FrtTermDocEnum *tpe = self->tpe;
     assert(tpe);
 
@@ -590,7 +589,7 @@ static FrtExplanation *phw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_
         return frt_expl_new(0.0, "field \"%s\" does not exist in the index", field_name);
     }
 
-    query_str = self->query->to_s(self->query, (FrtSymbol)NULL);
+    query_str = self->query->to_s(self->query, (ID)NULL);
 
     expl = frt_expl_new(0.0, "weight(%s in %d), product of:", query_str, doc_num);
 
@@ -931,8 +930,7 @@ static void phq_extract_terms(FrtQuery *self, FrtHashSet *term_set)
     }
 }
 
-static char *phq_to_s(FrtQuery *self, FrtSymbol default_field)
-{
+static char *phq_to_s(FrtQuery *self, ID default_field) {
     FrtPhraseQuery *phq = PhQ(self);
     const int pos_cnt = phq->pos_cnt;
     FrtPhrasePosition *positions = phq->positions;
@@ -1110,10 +1108,11 @@ static int phq_eq(FrtQuery *self, FrtQuery *o)
     return true;
 }
 
-FrtQuery *frt_phq_new(FrtSymbol field)
-{
-    FrtQuery *self = frt_q_new(FrtPhraseQuery);
+FrtQuery *frt_phq_alloc(void) {
+    return frt_q_new(FrtPhraseQuery);
+}
 
+FrtQuery *frt_phq_init(FrtQuery *self, ID field) {
     PhQ(self)->field        = field;
     PhQ(self)->pos_cnt      = 0;
     PhQ(self)->pos_capa     = PhQ_INIT_CAPA;
@@ -1131,6 +1130,11 @@ FrtQuery *frt_phq_new(FrtSymbol field)
     return self;
 }
 
+FrtQuery *frt_phq_new(ID field) {
+    FrtQuery *self = frt_phq_alloc();
+    return frt_phq_init(self, field);
+}
+
 void frt_phq_add_term_abs(FrtQuery *self, const char *term, int position)
 {
     FrtPhraseQuery *phq = PhQ(self);

data/ext/isomorfeus_ferret_ext/frt_q_prefix.c

@@ -2,6 +2,8 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
+#undef close
+
 /****************************************************************************
  *
  * FrtPrefixQuery
@@ -10,8 +12,7 @@
 
 #define PfxQ(query) ((FrtPrefixQuery *)(query))
 
-static char *prq_to_s(FrtQuery *self, FrtSymbol default_field)
-{
+static char *prq_to_s(FrtQuery *self, ID default_field) {
     char *buffer, *bptr;
     const char *prefix = PfxQ(self)->prefix;
     size_t plen = strlen(prefix);
@@ -33,8 +34,7 @@ static char *prq_to_s(FrtQuery *self, FrtSymbol default_field)
     return buffer;
 }
 
-static FrtQuery *prq_rewrite(FrtQuery *self, FrtIndexReader *ir)
-{
+static FrtQuery *prq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     const int field_num = frt_fis_get_field_num(ir->fis, PfxQ(self)->field);
     FrtQuery *volatile q = frt_multi_tq_new_conf(PfxQ(self)->field,
                                           FrtMTQMaxTerms(self), 0.0);
@@ -61,30 +61,28 @@ static FrtQuery *prq_rewrite(FrtQuery *self, FrtIndexReader *ir)
     return q;
 }
 
-static void prq_destroy(FrtQuery *self)
-{
+static void prq_destroy(FrtQuery *self) {
     free(PfxQ(self)->prefix);
     frt_q_destroy_i(self);
 }
 
-static unsigned long long prq_hash(FrtQuery *self)
-{
+static unsigned long long prq_hash(FrtQuery *self) {
     return frt_str_hash(rb_id2name(PfxQ(self)->field)) ^ frt_str_hash(PfxQ(self)->prefix);
 }
 
-static int prq_eq(FrtQuery *self, FrtQuery *o)
-{
+static int prq_eq(FrtQuery *self, FrtQuery *o) {
     return (strcmp(PfxQ(self)->prefix, PfxQ(o)->prefix) == 0)
         && (PfxQ(self)->field == PfxQ(o)->field);
 }
 
-FrtQuery *frt_prefixq_new(FrtSymbol field, const char *prefix)
-{
-    FrtQuery *self = frt_q_new(FrtPrefixQuery);
+FrtQuery *frt_prefixq_alloc(void) {
+    return frt_q_new(FrtPrefixQuery);
+}
 
+FrtQuery *frt_prefixq_init(FrtQuery *self, ID field, const char *prefix) {
     PfxQ(self)->field       = field;
     PfxQ(self)->prefix      = frt_estrdup(prefix);
-    FrtMTQMaxTerms(self)       = PREFIX_QUERY_MAX_TERMS;
+    FrtMTQMaxTerms(self)    = PREFIX_QUERY_MAX_TERMS;
 
     self->type              = PREFIX_QUERY;
     self->rewrite           = &prq_rewrite;
@@ -96,3 +94,8 @@ FrtQuery *frt_prefixq_new(FrtSymbol field, const char *prefix)
 
     return self;
 }
+
+FrtQuery *frt_prefixq_new(ID field, const char *prefix) {
+    FrtQuery *self = frt_prefixq_alloc();
+    return frt_prefixq_init(self, field, prefix);
+}

data/ext/isomorfeus_ferret_ext/frt_q_range.c

@@ -2,23 +2,15 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
+#undef close
+
 /*****************************************************************************
  *
- * Range
+ * FrtRange
  *
  *****************************************************************************/
 
-typedef struct Range
-{
-    FrtSymbol field;
-    char *lower_term;
-    char *upper_term;
-    bool include_lower : 1;
-    bool include_upper : 1;
-} Range;
-
-static char *range_to_s(Range *range, FrtSymbol default_field, float boost)
-{
+static char *range_to_s(FrtRange *range, ID default_field, float boost) {
     char *buffer, *b;
     size_t flen, llen, ulen;
     const char *field_name = rb_id2name(range->field);
@@ -68,14 +60,14 @@ static char *range_to_s(Range *range, FrtSymbol default_field, float boost)
     return buffer;
 }
 
-static void range_destroy(Range *range)
+static void range_destroy(FrtRange *range)
 {
     free(range->lower_term);
     free(range->upper_term);
     free(range);
 }
 
-static unsigned long long range_hash(Range *filt)
+static unsigned long long range_hash(FrtRange *filt)
 {
     return filt->include_lower | (filt->include_upper << 1)
         | ((frt_str_hash(rb_id2name(filt->field))
@@ -83,7 +75,7 @@ static unsigned long long range_hash(Range *filt)
             ^ (filt->upper_term ? frt_str_hash(filt->upper_term) : 0)) << 2);
 }
 
-static int range_eq(Range *filt, Range *o)
+static int range_eq(FrtRange *filt, FrtRange *o)
 {
     if ((filt->lower_term && !o->lower_term) || (!filt->lower_term && o->lower_term)) { return false; }
     if ((filt->upper_term && !o->upper_term) || (!filt->upper_term && o->upper_term)) { return false; }
@@ -94,11 +86,8 @@ static int range_eq(Range *filt, Range *o)
             && (filt->include_upper == o->include_upper));
 }
 
-static Range *range_new(FrtSymbol field, const char *lower_term,
-                 const char *upper_term, bool include_lower,
-                 bool include_upper)
-{
-    Range *range;
+static FrtRange *range_new(ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    FrtRange *range;
 
     if (!lower_term && !upper_term) {
         FRT_RAISE(FRT_ARG_ERROR, "Nil bounds for range. A range must include either "
@@ -119,7 +108,7 @@ static Range *range_new(FrtSymbol field, const char *lower_term,
               "\"%s\" < \"%s\"", upper_term, lower_term);
     }
 
-    range = FRT_ALLOC(Range);
+    range = FRT_ALLOC(FrtRange);
 
     range->field = field;
     range->lower_term = lower_term ? frt_estrdup(lower_term) : NULL;
@@ -129,11 +118,8 @@ static Range *range_new(FrtSymbol field, const char *lower_term,
     return range;
 }
 
-static Range *trange_new(FrtSymbol field, const char *lower_term,
-                  const char *upper_term, bool include_lower,
-                  bool include_upper)
-{
-    Range *range;
+static FrtRange *trange_new(ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    FrtRange *range;
     int len;
     double upper_num, lower_num;
 
@@ -173,7 +159,7 @@ static Range *trange_new(FrtSymbol field, const char *lower_term,
         }
     }
 
-    range = FRT_ALLOC(Range);
+    range = FRT_ALLOC(FrtRange);
 
     range->field = field;
     range->lower_term = lower_term ? frt_estrdup(lower_term) : NULL;
@@ -185,27 +171,20 @@ static Range *trange_new(FrtSymbol field, const char *lower_term,
 
 /***************************************************************************
  *
- * RangeFilter
+ * FrtRangeFilter
  *
  ***************************************************************************/
 
-typedef struct RangeFilter
-{
-    FrtFilter super;
-    Range *range;
-} RangeFilter;
+#define RF(filt) ((FrtRangeFilter *)(filt))
 
-#define RF(filt) ((RangeFilter *)(filt))
-
-static void frt_rfilt_destroy_i(FrtFilter *filt)
-{
+static void frt_rfilt_destroy_i(FrtFilter *filt) {
     range_destroy(RF(filt)->range);
     frt_filt_destroy_i(filt);
 }
 
 static char *frt_rfilt_to_s(FrtFilter *filt)
 {
-    char *rstr = range_to_s(RF(filt)->range, (FrtSymbol)NULL, 1.0);
+    char *rstr = range_to_s(RF(filt)->range, (ID)NULL, 1.0);
     char *rfstr = frt_strfmt("RangeFilter< %s >", rstr);
     free(rstr);
     return rfstr;
@@ -214,7 +193,7 @@ static char *frt_rfilt_to_s(FrtFilter *filt)
 static FrtBitVector *frt_rfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir)
 {
     FrtBitVector *bv = frt_bv_new_capa(ir->max_doc(ir));
-    Range *range = RF(filt)->range;
+    FrtRange *range = RF(filt)->range;
     FrtFieldInfo *fi = frt_fis_get_field(ir->fis, range->field);
     /* the field info exists we need to add docs to the bit vector, otherwise
      * we just return an empty bit vector */
@@ -278,13 +257,12 @@ static int frt_rfilt_eq(FrtFilter *filt, FrtFilter *o) {
     return range_eq(RF(filt)->range, RF(o)->range);
 }
 
-FrtFilter *frt_rfilt_new(FrtSymbol field,
-                  const char *lower_term, const char *upper_term,
-                  bool include_lower, bool include_upper)
-{
-    FrtFilter *filt = filt_new(RangeFilter);
-    RF(filt)->range =  range_new(field, lower_term, upper_term,
-                                 include_lower, include_upper);
+FrtFilter *frt_rfilt_alloc(void) {
+    return filt_new(FrtRangeFilter);
+}
+
+FrtFilter *frt_rfilt_init(FrtFilter *filt, ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    RF(filt)->range = range_new(field, lower_term, upper_term, include_lower, include_upper);
     filt->get_bv_i  = &frt_rfilt_get_bv_i;
     filt->hash      = &frt_rfilt_hash;
     filt->eq        = &frt_rfilt_eq;
@@ -293,15 +271,19 @@ FrtFilter *frt_rfilt_new(FrtSymbol field,
     return filt;
 }
 
+FrtFilter *frt_rfilt_new(ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    FrtFilter *filt = frt_rfilt_alloc();
+    return frt_rfilt_init(filt, field, lower_term, upper_term, include_lower, include_upper);
+}
+
 /***************************************************************************
  *
- * RangeFilter
+ * FrtRangeFilter
  *
  ***************************************************************************/
 
-static char *frt_trfilt_to_s(FrtFilter *filt)
-{
-    char *rstr = range_to_s(RF(filt)->range, (FrtSymbol)NULL, 1.0);
+static char *frt_trfilt_to_s(FrtFilter *filt) {
+    char *rstr = range_to_s(RF(filt)->range, (ID)NULL, 1.0);
     char *rfstr = frt_strfmt("TypedRangeFilter< %s >", rstr);
     free(rstr);
     return rfstr;
@@ -333,10 +315,8 @@ do {\
     }\
 } while (te->next(te))
 
-
-static FrtBitVector *frt_trfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir)
-{
-    Range *range = RF(filt)->range;
+static FrtBitVector *frt_trfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir) {
+    FrtRange *range = RF(filt)->range;
     double lnum = 0.0, unum = 0.0;
     int len = 0;
     const char *lt = range->lower_term;
@@ -408,19 +388,17 @@ static FrtBitVector *frt_trfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir)
         }
 
         return bv;
-    }
-    else {
+    } else {
         return frt_rfilt_get_bv_i(filt, ir);
     }
 }
 
-FrtFilter *frt_trfilt_new(FrtSymbol field,
-                   const char *lower_term, const char *upper_term,
-                   bool include_lower, bool include_upper)
-{
-    FrtFilter *filt = filt_new(RangeFilter);
-    RF(filt)->range =  trange_new(field, lower_term, upper_term,
-                                  include_lower, include_upper);
+FrtFilter *frt_trfilt_alloc(void) {
+    return filt_new(FrtRangeFilter);
+}
+
+FrtFilter *frt_trfilt_init(FrtFilter *filt, ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    RF(filt)->range = trange_new(field, lower_term, upper_term, include_lower, include_upper);
 
     filt->get_bv_i  = &frt_trfilt_get_bv_i;
     filt->hash      = &frt_rfilt_hash;
@@ -430,6 +408,11 @@ FrtFilter *frt_trfilt_new(FrtSymbol field,
     return filt;
 }
 
+FrtFilter *frt_trfilt_new(ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    FrtFilter *filt = frt_trfilt_alloc();
+    return frt_trfilt_init(filt, field, lower_term, upper_term, include_lower, include_upper);
+}
+
 /*****************************************************************************
  *
  * RangeQuery
@@ -437,27 +420,18 @@ FrtFilter *frt_trfilt_new(FrtSymbol field,
  *****************************************************************************/
 
 #define RQ(query) ((FrtRangeQuery *)(query))
-typedef struct FrtRangeQuery
-{
-    FrtQuery f;
-    Range *range;
-} FrtRangeQuery;
 
-static char *frt_rq_to_s(FrtQuery *self, FrtSymbol field)
-{
+static char *frt_rq_to_s(FrtQuery *self, ID field) {
     return range_to_s(RQ(self)->range, field, self->boost);
 }
 
-static void frt_rq_destroy(FrtQuery *self)
-{
+static void frt_rq_destroy(FrtQuery *self) {
     range_destroy(RQ(self)->range);
     frt_q_destroy_i(self);
 }
 
-static FrtMatchVector *rq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv,
-                                    FrtTermVector *tv)
-{
-    Range *range = RQ(((FrtConstantScoreQuery *)self)->original)->range;
+static FrtMatchVector *rq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtTermVector *tv) {
+    FrtRange *range = RQ(((FrtConstantScoreQuery *)self)->original)->range;
     if (tv->field == range->field) {
         const int term_cnt = tv->term_cnt;
         int i, j;
@@ -487,12 +461,10 @@ static FrtMatchVector *rq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv,
     return mv;
 }
 
-static FrtQuery *frt_rq_rewrite(FrtQuery *self, FrtIndexReader *ir)
-{
+static FrtQuery *frt_rq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     FrtQuery *csq;
-    Range *r = RQ(self)->range;
-    FrtFilter *filter = frt_rfilt_new(r->field, r->lower_term, r->upper_term,
-                               r->include_lower, r->include_upper);
+    FrtRange *r = RQ(self)->range;
+    FrtFilter *filter = frt_rfilt_new(r->field, r->lower_term, r->upper_term, r->include_lower, r->include_upper);
     (void)ir;
     csq = frt_csq_new_nr(filter);
     ((FrtConstantScoreQuery *)csq)->original = self;
@@ -500,8 +472,7 @@ static FrtQuery *frt_rq_rewrite(FrtQuery *self, FrtIndexReader *ir)
     return (FrtQuery *)csq;
 }
 
-static unsigned long long frt_rq_hash(FrtQuery *self)
-{
+static unsigned long long frt_rq_hash(FrtQuery *self) {
     return range_hash(RQ(self)->range);
 }
 
@@ -509,33 +480,36 @@ static int frt_rq_eq(FrtQuery *self, FrtQuery *o) {
     return range_eq(RQ(self)->range, RQ(o)->range);
 }
 
-FrtQuery *frt_rq_new_less(FrtSymbol field, const char *upper_term, bool include_upper) {
+FrtQuery *frt_rq_new_less(ID field, const char *upper_term, bool include_upper) {
     return frt_rq_new(field, NULL, upper_term, false, include_upper);
 }
 
-FrtQuery *frt_rq_new_more(FrtSymbol field, const char *lower_term, bool include_lower) {
+FrtQuery *frt_rq_new_more(ID field, const char *lower_term, bool include_lower) {
     return frt_rq_new(field, lower_term, NULL, include_lower, false);
 }
 
-FrtQuery *frt_rq_new(FrtSymbol field, const char *lower_term,
-              const char *upper_term, bool include_lower, bool include_upper)
-{
-    FrtQuery *self;
-    Range *range            = range_new(field, lower_term, upper_term,
-                                        include_lower, include_upper);
-    self                    = frt_q_new(FrtRangeQuery);
-    RQ(self)->range         = range;
-
-    self->type              = RANGE_QUERY;
-    self->rewrite           = &frt_rq_rewrite;
-    self->to_s              = &frt_rq_to_s;
-    self->hash              = &frt_rq_hash;
-    self->eq                = &frt_rq_eq;
-    self->destroy_i         = &frt_rq_destroy;
-    self->create_weight_i   = &frt_q_create_weight_unsup;
+FrtQuery *frt_rq_alloc(void) {
+    return frt_q_new(FrtRangeQuery);
+}
+
+FrtQuery *frt_rq_init(FrtQuery *self, ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    FrtRange *range       = range_new(field, lower_term, upper_term, include_lower, include_upper);
+    RQ(self)->range       = range;
+    self->type            = RANGE_QUERY;
+    self->rewrite         = &frt_rq_rewrite;
+    self->to_s            = &frt_rq_to_s;
+    self->hash            = &frt_rq_hash;
+    self->eq              = &frt_rq_eq;
+    self->destroy_i       = &frt_rq_destroy;
+    self->create_weight_i = &frt_q_create_weight_unsup;
     return self;
 }
 
+FrtQuery *frt_rq_new(ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    FrtQuery *self = frt_rq_alloc();
+    return frt_rq_init(self, field, lower_term, upper_term, include_lower, include_upper);
+}
+
 /*****************************************************************************
  *
  * TypedRangeQuery
@@ -559,10 +533,8 @@ for (i = tv->term_cnt - 1; i >= 0; i--) {\
     }\
 }\
 
-static FrtMatchVector *trq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv,
-                                     FrtTermVector *tv)
-{
-    Range *range = RQ(((FrtConstantScoreQuery *)self)->original)->range;
+static FrtMatchVector *trq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtTermVector *tv) {
+    FrtRange *range = RQ(((FrtConstantScoreQuery *)self)->original)->range;
     if (tv->field == range->field) {
         double lnum = 0.0, unum = 0.0;
         int len = 0;
@@ -615,21 +587,17 @@ static FrtMatchVector *trq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv,
                     /* should never happen. Error should have been rb_raised */
                     assert(false);
             }
-
-        }
-        else {
+        } else {
             return rq_get_matchv_i(self, mv, tv);
         }
     }
     return mv;
 }
 
-static FrtQuery *frt_trq_rewrite(FrtQuery *self, FrtIndexReader *ir)
-{
+static FrtQuery *frt_trq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     FrtQuery *csq;
-    Range *r = RQ(self)->range;
-    FrtFilter *filter = frt_trfilt_new(r->field, r->lower_term, r->upper_term,
-                                r->include_lower, r->include_upper);
+    FrtRange *r = RQ(self)->range;
+    FrtFilter *filter = frt_trfilt_new(r->field, r->lower_term, r->upper_term, r->include_lower, r->include_upper);
     (void)ir;
     csq = frt_csq_new_nr(filter);
     ((FrtConstantScoreQuery *)csq)->original = self;
@@ -637,29 +605,32 @@ static FrtQuery *frt_trq_rewrite(FrtQuery *self, FrtIndexReader *ir)
     return (FrtQuery *)csq;
 }
 
-FrtQuery *frt_trq_new_less(FrtSymbol field, const char *upper_term, bool include_upper) {
+FrtQuery *frt_trq_new_less(ID field, const char *upper_term, bool include_upper) {
     return frt_trq_new(field, NULL, upper_term, false, include_upper);
 }
 
-FrtQuery *frt_trq_new_more(FrtSymbol field, const char *lower_term, bool include_lower) {
+FrtQuery *frt_trq_new_more(ID field, const char *lower_term, bool include_lower) {
     return frt_trq_new(field, lower_term, NULL, include_lower, false);
 }
 
-FrtQuery *frt_trq_new(FrtSymbol field, const char *lower_term,
-               const char *upper_term, bool include_lower, bool include_upper)
-{
-    FrtQuery *self;
-    Range *range            = trange_new(field, lower_term, upper_term,
-                                         include_lower, include_upper);
-    self                    = frt_q_new(FrtRangeQuery);
-    RQ(self)->range         = range;
-
-    self->type              = TYPED_RANGE_QUERY;
-    self->rewrite           = &frt_trq_rewrite;
-    self->to_s              = &frt_rq_to_s;
-    self->hash              = &frt_rq_hash;
-    self->eq                = &frt_rq_eq;
-    self->destroy_i         = &frt_rq_destroy;
-    self->create_weight_i   = &frt_q_create_weight_unsup;
+FrtQuery *frt_trq_alloc(void) {
+    return frt_q_new(FrtRangeQuery);
+}
+
+FrtQuery *frt_trq_init(FrtQuery *self, ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    FrtRange *range       = trange_new(field, lower_term, upper_term, include_lower, include_upper);
+    RQ(self)->range       = range;
+    self->type            = TYPED_RANGE_QUERY;
+    self->rewrite         = &frt_trq_rewrite;
+    self->to_s            = &frt_rq_to_s;
+    self->hash            = &frt_rq_hash;
+    self->eq              = &frt_rq_eq;
+    self->destroy_i       = &frt_rq_destroy;
+    self->create_weight_i = &frt_q_create_weight_unsup;
     return self;
 }
+
+FrtQuery *frt_trq_new(ID field, const char *lower_term, const char *upper_term, bool include_lower, bool include_upper) {
+    FrtQuery *self = frt_trq_alloc();
+    return frt_trq_init(self, field, lower_term, upper_term, include_lower, include_upper);
+}