isomorfeus-ferret 0.12.6 → 0.13.1

data/ext/isomorfeus_ferret_ext/frb_qparser.c

@@ -22,7 +22,6 @@ static VALUE sym_use_typed_range_query;
 extern VALUE frb_get_analyzer(FrtAnalyzer *a);
 extern VALUE frb_get_q(FrtQuery *q);
 extern FrtAnalyzer *frb_get_cwrapped_analyzer(VALUE ranalyzer);
-extern FrtQuery *qp_parse(FrtQParser *self, char *qstr);
 
 /****************************************************************************
  *
@@ -30,22 +29,40 @@ extern FrtQuery *qp_parse(FrtQParser *self, char *qstr);
  *
  ****************************************************************************/
 
-static void
-frb_qp_free(void *p)
-{
-    object_del(p);
+static void frb_qp_free(void *p) {
     frt_qp_destroy((FrtQParser *)p);
 }
 
-static void
-frb_qp_mark(void *p)
-{
-    frb_gc_mark(((FrtQParser *)p)->analyzer);
+static void frb_qp_mark(void *p) {
+    if (((FrtQParser *)p)->analyzer->ranalyzer)
+        rb_gc_mark(((FrtQParser *)p)->analyzer->ranalyzer);
 }
 
-static FrtHashSet *
-frb_get_fields(VALUE rfields, FrtHashSet *other_fields)
-{
+static size_t frb_qp_size(const void *p) {
+    return sizeof(FrtQParser);
+    (void)p;
+}
+
+const rb_data_type_t frb_qp_t = {
+    .wrap_struct_name = "FrbQueryParser",
+    .function = {
+        .dmark = frb_qp_mark,
+        .dfree = frb_qp_free,
+        .dsize = frb_qp_size,
+        .dcompact = NULL,
+        .reserved = {0},
+    },
+    .parent = NULL,
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE frb_qp_alloc(VALUE rclass) {
+    FrtQParser *qp = frt_qp_alloc();
+    return TypedData_Wrap_Struct(rclass, &frb_qp_t, qp);
+}
+
+static FrtHashSet *frb_get_fields(VALUE rfields, FrtHashSet *other_fields) {
     VALUE rval;
     FrtHashSet *fields;
     char *s, *p, *str;
@@ -78,9 +95,7 @@ frb_get_fields(VALUE rfields, FrtHashSet *other_fields)
     return fields;
 }
 
-static void
-hs_safe_merge(FrtHashSet *merger, FrtHashSet *mergee)
-{
+static void hs_safe_merge(FrtHashSet *merger, FrtHashSet *mergee) {
     FrtHashSetEntry *entry = mergee->first;
     for (; entry != NULL; entry = entry->next) {
         frt_hs_add_safe(merger, entry->elem);
@@ -148,9 +163,7 @@ hs_safe_merge(FrtHashSet *merger, FrtHashSet *mergee)
  *                           Note: the default is set to true in the Index
  *                           class.
  */
-static VALUE
-frb_qp_init(int argc, VALUE *argv, VALUE self)
-{
+static VALUE frb_qp_init(int argc, VALUE *argv, VALUE self) {
     VALUE roptions = Qnil;
     VALUE rval;
     FrtAnalyzer *analyzer = NULL;
@@ -158,7 +171,7 @@ frb_qp_init(int argc, VALUE *argv, VALUE self)
     FrtHashSet *all_fields = NULL;
     FrtHashSet *tkz_fields = NULL;
     FrtQParser *qp;
-
+    TypedData_Get_Struct(self, FrtQParser, &frb_qp_t, qp);
     if (rb_scan_args(argc, argv, "01", &roptions) > 0) {
         if (TYPE(roptions) == T_HASH) {
             if (Qnil != (rval = rb_hash_aref(roptions, sym_default_field))) {
@@ -185,12 +198,9 @@ frb_qp_init(int argc, VALUE *argv, VALUE self)
         all_fields = frt_hs_new_ptr(NULL);
     }
     if (!analyzer) {
-        analyzer = frt_mb_standard_analyzer_new(true);
+        analyzer = frt_standard_analyzer_new(true);
     }
-    qp = frt_qp_new(analyzer);
-    //frt_hs_destroy(qp->all_fields);
-    //frt_hs_destroy(qp->def_fields);
-    //frt_hs_destroy(qp->tokenized_fields);
+    qp = frt_qp_init(qp, analyzer);
     if (def_fields) hs_safe_merge(all_fields, def_fields);
     if (tkz_fields) hs_safe_merge(all_fields, tkz_fields);
     qp->all_fields = all_fields;
@@ -231,8 +241,6 @@ frb_qp_init(int argc, VALUE *argv, VALUE self)
             qp->use_typed_range_query = RTEST(rval);
         }
     }
-    Frt_Wrap_Struct(self, frb_qp_mark, frb_qp_free, qp);
-    object_add(qp, self);
     return self;
 }
 
@@ -244,19 +252,17 @@ frb_qp_init(int argc, VALUE *argv, VALUE self)
  *  Parse a query string returning a Query object if parsing was successful.
  *  Will raise a QueryParseException if unsuccessful.
  */
-static VALUE
-frb_qp_parse(VALUE self, VALUE rstr)
-{
+static VALUE frb_qp_parse(VALUE self, VALUE rstr) {
     const char *volatile msg = NULL;
     volatile VALUE rq;
     GET_QP;
     FrtQuery *q;
     rstr = rb_obj_as_string(rstr);
     FRT_TRY
-        q = qp_parse(qp, rs2s(rstr));
+        q = qp_parse(qp, rs2s(rstr), rb_enc_get(rstr));
         rq = frb_get_q(q);
         break;
-    default:
+    FRT_XCATCHALL
         msg = xcontext.msg;
         FRT_HANDLED();
     FRT_XENDTRY
@@ -272,9 +278,7 @@ frb_qp_parse(VALUE self, VALUE rstr)
  *
  *  Returns the list of all fields that the QueryParser knows about.
  */
-static VALUE
-frb_qp_get_fields(VALUE self)
-{
+static VALUE frb_qp_get_fields(VALUE self) {
     GET_QP;
     FrtHashSet *fields = qp->all_fields;
     FrtHashSetEntry *hse;
@@ -293,9 +297,7 @@ frb_qp_get_fields(VALUE self)
  *
  *  Set the list of fields. These fields are expanded for searches on "*".
  */
-static VALUE
-frb_qp_set_fields(VALUE self, VALUE rfields)
-{
+static VALUE frb_qp_set_fields(VALUE self, VALUE rfields) {
     GET_QP;
     FrtHashSet *fields = frb_get_fields(rfields, NULL);
 
@@ -332,9 +334,7 @@ frb_qp_set_fields(VALUE self, VALUE rfields)
  *
  *  Returns the list of all tokenized_fields that the QueryParser knows about.
  */
-static VALUE
-frb_qp_get_tkz_fields(VALUE self)
-{
+static VALUE frb_qp_get_tkz_fields(VALUE self) {
     GET_QP;
     FrtHashSet *fields = qp->tokenized_fields;
     if (fields) {
@@ -346,8 +346,7 @@ frb_qp_get_tkz_fields(VALUE self)
         }
 
         return rfields;
-    }
-    else {
+    } else {
         return Qnil;
     }
 }
@@ -359,9 +358,7 @@ frb_qp_get_tkz_fields(VALUE self)
  *  Set the list of tokenized_fields. These tokenized_fields are tokenized in
  *  the queries. If this is set to Qnil then all fields will be tokenized.
  */
-static VALUE
-frb_qp_set_tkz_fields(VALUE self, VALUE rfields)
-{
+static VALUE frb_qp_set_tkz_fields(VALUE self, VALUE rfields) {
     GET_QP;
     if (qp->tokenized_fields != qp->all_fields) {
         frt_hs_destroy(qp->tokenized_fields);
@@ -389,12 +386,8 @@ extern VALUE cQueryParser = rb_define_module_under(mFerret, "QueryParser");
  *  Exception raised when there is an error parsing the query string passed to
  *  QueryParser.
  */
-void
-Init_QueryParseException(void)
-{
-    cQueryParseException = rb_define_class_under(cQueryParser,
-                                                 "QueryParseException",
-                                                 rb_eStandardError);
+void Init_QueryParseException(void) {
+    cQueryParseException = rb_define_class_under(cQueryParser, "QueryParseException", rb_eStandardError);
 }
 
 /*
@@ -593,9 +586,7 @@ Init_QueryParseException(void)
  *  will iterate over.
  *
  */
-void
-Init_QueryParser(void)
-{
+void Init_QueryParser(void) {
     /* hash keys */
     sym_wild_card_downcase = ID2SYM(rb_intern("wild_card_downcase"));
     sym_fields = ID2SYM(rb_intern("fields"));
@@ -613,17 +604,14 @@ Init_QueryParser(void)
 
     /* QueryParser */
     cQueryParser = rb_define_class_under(mFerret, "QueryParser", rb_cObject);
-    rb_define_alloc_func(cQueryParser, frb_data_alloc);
+    rb_define_alloc_func(cQueryParser, frb_qp_alloc);
 
     rb_define_method(cQueryParser, "initialize", frb_qp_init, -1);
     rb_define_method(cQueryParser, "parse", frb_qp_parse, 1);
     rb_define_method(cQueryParser, "fields", frb_qp_get_fields, 0);
     rb_define_method(cQueryParser, "fields=", frb_qp_set_fields, 1);
-    rb_define_method(cQueryParser, "tokenized_fields",
-                     frb_qp_get_tkz_fields, 0);
-    rb_define_method(cQueryParser, "tokenized_fields=",
-                     frb_qp_set_tkz_fields, 1);
+    rb_define_method(cQueryParser, "tokenized_fields", frb_qp_get_tkz_fields, 0);
+    rb_define_method(cQueryParser, "tokenized_fields=", frb_qp_set_tkz_fields, 1);
 
     Init_QueryParseException();
 }
-