isomorfeus-ferret 0.13.8 → 0.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e6a7a9c17cc344699bee0c8116188f86da73e11fa2a4eed02eea1c4647b6a99
-  data.tar.gz: c94c9a2735b010c02c8d5a793057b94abf8950117153415a731347c21fadf66e
+  metadata.gz: a5603738325c11384e3dcd2d60e8ce34effbbe7b64fdcc319315910fdca6cbae
+  data.tar.gz: f15cc75761f2b0152243bbdc3983d880636fa71d6a2f5fdc4a34443fad28250b
 SHA512:
-  metadata.gz: 549a2d3b09dc535278f6c9735f55a47203166df046e5a75ff55589085336bcf2cb7c25cdf491c07eca68da25682316c4bb15e5079f09df95f8a494558fe22260
-  data.tar.gz: e188f428fd881a0285ece69807f13c07dfd1eee131edcad3e38a713ffa820364992bb9068d5f94f567bd7769c7882441ce8eb67199b95b491528fecdd34503f4
+  metadata.gz: 6ee5491226887aa837b0f71f053881c18be5dd460427aebf5501b17a3c863f9f28d4202848c82825ee110b568fb95a083e1defa4d1a316a6e7d9c35f41a328bc
+  data.tar.gz: 4e74d456a810c14b204e948c49885ef00710b2d79544ba5fc1c81c02bb1509459ad927935f9ef13fa73929d35919b18d4c5c56a4eb00790954da67f874fa591f

data/ext/isomorfeus_ferret_ext/bm_store.c

@@ -6,7 +6,7 @@
 #define N 10
 #define write_byte(os, b) os->buf.buf[os->buf.pos++] = (frt_uchar)b
 
-void my_os_write_voff_t(FrtOutStream *os, register off_t num) {
+void my_os_write_voff_t(FrtOutStream *os, register frt_off_t num) {
     if (!(num&0x7f)) {
         if (os->buf.pos >= FRT_BUFFER_SIZE) {
             frt_os_write_byte(os, (frt_uchar)num);
@@ -48,7 +48,7 @@ void my_os_write_voff_t(FrtOutStream *os, register off_t num) {
 
 static void vint_out(void) {
     int n;
-    off_t i;
+    frt_off_t i;
     FrtOutStream *os;
 
     for (n = 0; n < N; n++) {
@@ -63,7 +63,7 @@ static void vint_out(void) {
 
 static void unrolled_vint_out(void) {
     int n;
-    off_t i;
+    frt_off_t i;
     FrtOutStream *os;
 
     for (n = 0; n < N; n++) {

data/ext/isomorfeus_ferret_ext/bzlib.h

@@ -11,7 +11,7 @@
    bzip2/libbzip2 version 1.0.8 of 13 July 2019
    Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
 
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the
    README file.
 
    This program is released under the terms of the license contained
@@ -25,6 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#define BZ_DEBUG             0
 
 #define BZ_RUN               0
 #define BZ_FLUSH             1
@@ -45,7 +46,7 @@ extern "C" {
 #define BZ_OUTBUFF_FULL      (-8)
 #define BZ_CONFIG_ERROR      (-9)
 
-typedef 
+typedef
    struct {
       char *next_in;
       unsigned int avail_in;
@@ -62,7 +63,7 @@ typedef
       void *(*bzalloc)(void *,int,int);
       void (*bzfree)(void *,void *);
       void *opaque;
-   } 
+   }
    bz_stream;
 
 
@@ -97,34 +98,34 @@ typedef
 
 /*-- Core (low-level) library functions --*/
 
-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
-      bz_stream* strm, 
-      int        blockSize100k, 
-      int        verbosity, 
-      int        workFactor 
+BZ_EXTERN int BZ_API(BZ2_bzCompressInit) (
+      bz_stream* strm,
+      int        blockSize100k,
+      int        verbosity,
+      int        workFactor
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
-      bz_stream* strm, 
-      int action 
+BZ_EXTERN int BZ_API(BZ2_bzCompress) (
+      bz_stream* strm,
+      int action
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
-      bz_stream* strm 
+BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) (
+      bz_stream* strm
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
-      bz_stream *strm, 
-      int       verbosity, 
+BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
+      bz_stream *strm,
+      int       verbosity,
       int       small
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
-      bz_stream* strm 
+BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
+      bz_stream* strm
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 
-      bz_stream *strm 
+BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) (
+      bz_stream *strm
    );
 
 
@@ -136,64 +137,64 @@ BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) (
 
 typedef void BZFILE;
 
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 
-      int*  bzerror,   
-      FILE* f, 
-      int   verbosity, 
+BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) (
+      int*  bzerror,
+      FILE* f,
+      int   verbosity,
       int   small,
-      void* unused,    
-      int   nUnused 
+      void* unused,
+      int   nUnused
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 
-      int*    bzerror, 
-      BZFILE* b 
+BZ_EXTERN void BZ_API(BZ2_bzReadClose) (
+      int*    bzerror,
+      BZFILE* b
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void**  unused,  
-      int*    nUnused 
+BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) (
+      int*    bzerror,
+      BZFILE* b,
+      void**  unused,
+      int*    nUnused
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzRead) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
+BZ_EXTERN int BZ_API(BZ2_bzRead) (
+      int*    bzerror,
+      BZFILE* b,
+      void*   buf,
+      int     len
    );
 
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
-      int*  bzerror,      
-      FILE* f, 
-      int   blockSize100k, 
-      int   verbosity, 
-      int   workFactor 
+BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) (
+      int*  bzerror,
+      FILE* f,
+      int   blockSize100k,
+      int   verbosity,
+      int   workFactor
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
+BZ_EXTERN void BZ_API(BZ2_bzWrite) (
+      int*    bzerror,
+      BZFILE* b,
+      void*   buf,
+      int     len
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in, 
-      unsigned int* nbytes_out 
+BZ_EXTERN void BZ_API(BZ2_bzWriteClose) (
+      int*          bzerror,
+      BZFILE*       b,
+      int           abandon,
+      unsigned int* nbytes_in,
+      unsigned int* nbytes_out
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in_lo32, 
-      unsigned int* nbytes_in_hi32, 
-      unsigned int* nbytes_out_lo32, 
+BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) (
+      int*          bzerror,
+      BZFILE*       b,
+      int           abandon,
+      unsigned int* nbytes_in_lo32,
+      unsigned int* nbytes_in_hi32,
+      unsigned int* nbytes_out_lo32,
       unsigned int* nbytes_out_hi32
    );
 #endif
@@ -201,23 +202,23 @@ BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) (
 
 /*-- Utility functions --*/
 
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
-      char*         dest, 
+BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) (
+      char*         dest,
       unsigned int* destLen,
-      char*         source, 
+      char*         source,
       unsigned int  sourceLen,
-      int           blockSize100k, 
-      int           verbosity, 
-      int           workFactor 
+      int           blockSize100k,
+      int           verbosity,
+      int           workFactor
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 
-      char*         dest, 
+BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) (
+      char*         dest,
       unsigned int* destLen,
-      char*         source, 
+      char*         source,
       unsigned int  sourceLen,
-      int           small, 
-      int           verbosity 
+      int           small,
+      int           verbosity
    );
 
 
@@ -244,17 +245,17 @@ BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
       int        fd,
       const char *mode
    );
-         
+
 BZ_EXTERN int BZ_API(BZ2_bzread) (
-      BZFILE* b, 
-      void* buf, 
-      int len 
+      BZFILE* b,
+      void* buf,
+      int len
    );
 
 BZ_EXTERN int BZ_API(BZ2_bzwrite) (
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
+      BZFILE* b,
+      void*   buf,
+      int     len
    );
 
 BZ_EXTERN int BZ_API(BZ2_bzflush) (
@@ -266,7 +267,7 @@ BZ_EXTERN void BZ_API(BZ2_bzclose) (
    );
 
 BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
-      BZFILE *b, 
+      BZFILE *b,
       int    *errnum
    );
 #endif

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -229,7 +229,7 @@ static VALUE frb_fi_init(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE frb_fi_name(VALUE self) {
     FrtFieldInfo *fi = (FrtFieldInfo *)DATA_PTR(self);
-    return rb_str_new_cstr(rb_id2name(fi->name));
+    return ID2SYM(fi->name);
 }
 
 /*
@@ -536,7 +536,7 @@ frb_fis_add_field(int argc, VALUE *argv, VALUE self)
 {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     FrtFieldInfo *fi;
-    FrtStoreValue store = fis->store;
+    FrtStoreValue store_val = fis->store_val;
     FrtCompressionType compression = fis->compression;
     FrtIndexValue index = fis->index;
     FrtTermVectorValue term_vector = fis->term_vector;
@@ -545,9 +545,9 @@ frb_fis_add_field(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &rname, &roptions);
     if (argc > 1) {
-        frb_fi_get_params(roptions, &store, &compression, &index, &term_vector, &boost);
+        frb_fi_get_params(roptions, &store_val, &compression, &index, &term_vector, &boost);
     }
-    fi = frt_fi_new(frb_field(rname), store, compression, index, term_vector);
+    fi = frt_fi_new(frb_field(rname), store_val, compression, index, term_vector);
     fi->boost = boost;
     frt_fis_add_field(fis, fi);
     return self;
@@ -593,9 +593,7 @@ frb_fis_to_s(VALUE self)
  *
  *  Return the number of fields in the FieldInfos object.
  */
-static VALUE
-frb_fis_size(VALUE self)
-{
+static VALUE frb_fis_size(VALUE self) {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     return INT2FIX(fis->size);
 }
@@ -610,21 +608,19 @@ frb_fis_size(VALUE self)
  *  existing index (or other files for that matter) will be deleted from the
  *  directory and overwritten by the new index.
  */
-static VALUE
-frb_fis_create_index(VALUE self, VALUE rdir)
-{
+static VALUE frb_fis_create_index(VALUE self, VALUE rdir) {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     FrtStore *store = NULL;
     if (TYPE(rdir) == T_DATA) {
         store = DATA_PTR(rdir);
-        FRT_REF(store);
+        frt_index_create(store, fis);
     } else {
         StringValue(rdir);
         frb_create_dir(rdir);
         store = frt_open_fs_store(rs2s(rdir));
+        frt_index_create(store, fis);
+        frt_store_close(store);
     }
-    frt_index_create(store, fis);
-    frt_store_deref(store);
     return self;
 }
 
@@ -663,7 +659,7 @@ frb_fis_get_tk_fields(VALUE self)
     int i;
     for (i = 0; i < fis->size; i++) {
         if (!fi_is_tokenized(fis->fields[i])) continue;
-        rb_ary_push(rfield_names, rb_str_new_cstr(rb_id2name(fis->fields[i]->name)));
+        rb_ary_push(rfield_names, ID2SYM(fis->fields[i]->name));
     }
     return rfield_names;
 }
@@ -1344,6 +1340,8 @@ static VALUE frb_iw_alloc(VALUE rclass) {
     return TypedData_Wrap_Struct(rclass, &frb_index_writer_t, iw);
 }
 
+extern rb_data_type_t frb_store_t;
+
 static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
     VALUE roptions, rval;
     bool create = false;
@@ -1363,12 +1361,11 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
 
             if ((rval = rb_hash_aref(roptions, sym_dir)) != Qnil) {
                 // Check_Type(rval, T_DATA);
-                store = DATA_PTR(rval);
+                TypedData_Get_Struct(rval, FrtStore, &frb_store_t, store);
             } else if ((rval = rb_hash_aref(roptions, sym_path)) != Qnil) {
                 StringValue(rval);
                 frb_create_dir(rval);
                 store = frt_open_fs_store(rs2s(rval));
-                FRT_DEREF(store);
             }
             /* use_compound_file defaults to true */
             config.use_compound_file =
@@ -1393,7 +1390,6 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
         }
         if (NULL == store) {
             store = frt_open_ram_store(NULL);
-            FRT_DEREF(store);
         }
         if (!create && create_if_missing && !store->exists(store, "segments")) {
             create = true;
@@ -1411,7 +1407,7 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
         }
 
         TypedData_Get_Struct(self, FrtIndexWriter, &frb_index_writer_t, iw);
-        iw = frt_iw_open(iw, store, analyzer, &config);
+        frt_iw_open(iw, store, analyzer, &config);
     FRT_XCATCHALL
         ex_code = xcontext.excode;
         msg = xcontext.msg;
@@ -1598,9 +1594,9 @@ void frb_ir_free(void *p) {
 
 void frb_ir_mark(void *p) {
     FrtIndexReader *ir = (FrtIndexReader *)p;
-    FrtMultiReader *mr = (FrtMultiReader *)p;
 
     if (ir->type == FRT_MULTI_READER) {
+        FrtMultiReader *mr = (FrtMultiReader *)p;
         int i;
         for (i = 0; i < mr->r_cnt; i++) {
             if (mr->sub_readers[i]->rir)
@@ -1652,6 +1648,7 @@ static VALUE frb_iw_add_readers(VALUE self, VALUE rreaders) {
     while (i-- > 0) {
         FrtIndexReader *ir;
         TypedData_Get_Struct(RARRAY_PTR(rreaders)[i], FrtIndexReader, &frb_index_reader_t, ir);
+        FRT_REF(ir);
         irs[i] = ir;
     }
     frt_iw_add_readers(iw, irs, RARRAY_LEN(rreaders));
@@ -2157,7 +2154,6 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
     VALUE rfield_num_map = rb_hash_new();
     int ex_code = 0;
     const char *msg = NULL;
-
     FRT_TRY
         if (TYPE(rdir) == T_ARRAY) {
             VALUE rdirs = rdir;
@@ -2170,7 +2166,6 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                     case T_DATA:
                         if (CLASS_OF(rdir) == cIndexReader) {
                             TypedData_Get_Struct(rdir, FrtIndexReader, &frb_index_reader_t, sub_readers[i]);
-                            FRT_REF(sub_readers[i]);
                             continue;
                         } else if (RTEST(rb_obj_is_kind_of(rdir, cDirectory))) {
                             store = DATA_PTR(rdir);
@@ -2185,7 +2180,6 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                     case T_STRING:
                         frb_create_dir(rdir);
                         store = frt_open_fs_store(rs2s(rdir));
-                        FRT_DEREF(store);
                         break;
                     default:
                         FRT_RAISE(FRT_ARG_ERROR, "%s isn't a valid directory "
@@ -2195,6 +2189,7 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                         break;
                 }
                 sub_readers[i] = frt_ir_open(NULL, store);
+                FRT_DEREF(sub_readers[i]);
             }
             TypedData_Get_Struct(self, FrtIndexReader, &frb_index_reader_t, ir);
             ir = frt_mr_open(ir, sub_readers, reader_cnt);
@@ -2206,7 +2201,6 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                 case T_STRING:
                     frb_create_dir(rdir);
                     store = frt_open_fs_store(rs2s(rdir));
-                    FRT_DEREF(store);
                     break;
                 default:
                     FRT_RAISE(FRT_ARG_ERROR, "%s isn't a valid directory argument. "

data/ext/isomorfeus_ferret_ext/frb_search.c

@@ -3606,7 +3606,6 @@ static VALUE frb_sea_init(VALUE self, VALUE obj) {
         frb_create_dir(obj);
         store = frt_open_fs_store(rs2s(obj));
         ir = frt_ir_open(NULL, store);
-        FRT_DEREF(store);
         ir->rir = TypedData_Wrap_Struct(cIndexReader, &frb_index_reader_t, ir);
     } else {
         // Check_Type(obj, T_DATA);
@@ -3616,14 +3615,12 @@ static VALUE frb_sea_init(VALUE self, VALUE obj) {
             ir->rir = TypedData_Wrap_Struct(cIndexReader, &frb_index_reader_t, ir);
         } else if (rb_obj_is_kind_of(obj, cIndexReader) == Qtrue) {
             TypedData_Get_Struct(obj, FrtIndexReader, &frb_index_reader_t, ir);
-            ir->rir = obj;
         } else {
             rb_raise(rb_eArgError, "Unknown type for argument to IndexSearcher.new");
         }
     }
     TypedData_Get_Struct(self, FrtSearcher, &frb_index_searcher_t, sea);
     frt_isea_init(sea, ir);
-    ((FrtIndexSearcher *)sea)->close_ir = false;
     sea->rsea = self;
     return self;
 }
@@ -3710,7 +3707,7 @@ static VALUE frb_ms_init(int argc, VALUE *argv, VALUE self) {
         }
     }
     TypedData_Get_Struct(self, FrtSearcher, &frb_multi_searcher_t, sea);
-    frt_msea_init(sea, searchers, top, false);
+    frt_msea_init(sea, searchers, top);
     sea->rsea = self;
     return self;
 }

data/ext/isomorfeus_ferret_ext/frb_store.c

@@ -185,10 +185,35 @@ static VALUE frb_lock_release(VALUE self) {
  *
  ****************************************************************************/
 
+/*** FrbStore ****************************************************************/
+
+static size_t frb_store_size(const void *p) {
+    return sizeof(FrtStore);
+    (void)p;
+}
+
 void frb_dir_free(void *p) {
-    FrtStore *store = (FrtStore *)p;
-    frb_unwrap_locks(store);
-    frt_store_deref(store);
+    frb_unwrap_locks((FrtStore *)p);
+    frt_store_close((FrtStore *)p);
+}
+
+const rb_data_type_t frb_store_t = {
+    .wrap_struct_name = "FrbStore",
+    .function = {
+        .dmark = NULL,
+        .dfree = frb_dir_free,
+        .dsize = frb_store_size,
+        .dcompact = NULL,
+        .reserved = {0},
+    },
+    .parent = NULL,
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE frb_store_alloc(VALUE rclass) {
+    FrtStore *st = frt_store_alloc();
+    return TypedData_Wrap_Struct(rclass, &frb_store_t, st);
 }
 
 /*
@@ -208,7 +233,7 @@ static VALUE frb_dir_close(VALUE self) {
         ((struct RData *)(self))->dmark = NULL;
         ((struct RData *)(self))->dfree = NULL;
         frb_unwrap_locks(store);
-        frt_store_deref(store);
+        frt_store_close(store);
     }
     return Qnil;
 }
@@ -308,32 +333,6 @@ static VALUE frb_dir_make_lock(VALUE self, VALUE rlock_name) {
     return rlock;
 }
 
-/*** FrbStore ****************************************************************/
-
-static size_t frb_store_size(const void *p) {
-    return sizeof(FrtStore);
-    (void)p;
-}
-
-const rb_data_type_t frb_store_t = {
-    .wrap_struct_name = "FrbStore",
-    .function = {
-        .dmark = NULL,
-        .dfree = frb_dir_free,
-        .dsize = frb_store_size,
-        .dcompact = NULL,
-        .reserved = {0},
-    },
-    .parent = NULL,
-    .data = NULL,
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static VALUE frb_store_alloc(VALUE rclass) {
-    FrtStore *st = frt_store_alloc();
-    return TypedData_Wrap_Struct(rclass, &frb_store_t, st);
-}
-
 /****************************************************************************
  *
  * RAMDirectory Methods
@@ -403,19 +402,18 @@ static VALUE frb_fsdir_new(int argc, VALUE *argv, VALUE klass) {
         frb_create_dir(rpath);
     }
     if (!rb_funcall(rb_cFile, id_is_directory, 1, rpath)) {
-        rb_raise(rb_eIOError, "No directory <%s> found. Use :create => true"
-                 " to create one.", rs2s(rpath));
+        rb_raise(rb_eIOError, "No directory <%s> found. Use :create => true to create one.", rs2s(rpath));
     }
     store = frt_open_fs_store(rs2s(rpath));
     if (create) store->clear_all(store);
-    if ((self = store->rstore) == Qnil) {
+    self = store->rstore;
+    if (self == Qnil || DATA_PTR(self) == NULL) {
         self = TypedData_Wrap_Struct(klass, &frb_store_t, store);
         store->rstore = self;
         rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
     } else {
         int ref_cnt = FIX2INT(rb_ivar_get(self, id_ref_cnt)) + 1;
         rb_ivar_set(self, id_ref_cnt, INT2FIX(ref_cnt));
-        FRT_DEREF(store);
     }
     return self;
 }

data/ext/isomorfeus_ferret_ext/frt_analysis.c

@@ -64,7 +64,7 @@ static inline int get_cp(char *start, char *end, int *cp_len, rb_encoding *enc)
 /*** FrtToken ****************************************************************/
 /*****************************************************************************/
 
-FrtToken *frt_tk_set(FrtToken *tk, char *text, int tlen, off_t start, off_t end, int pos_inc, rb_encoding *encoding) {
+FrtToken *frt_tk_set(FrtToken *tk, char *text, int tlen, frt_off_t start, frt_off_t end, int pos_inc, rb_encoding *encoding) {
     if (tlen >= FRT_MAX_WORD_SIZE) {
         tlen = FRT_MAX_WORD_SIZE - 1; // TODO: this may invalidate mbc's
     }
@@ -92,7 +92,7 @@ static FrtToken *frt_tk_set_ts(FrtToken *tk, char *start, char *end, char *text,
     return frt_tk_set(tk, start, (int)(end - start), (off_t)(start - text), (off_t)(end - text), pos_inc, encoding);
 }
 
-FrtToken *frt_tk_set_no_len(FrtToken *tk, char *text, off_t start, off_t end, int pos_inc, rb_encoding *encoding) {
+FrtToken *frt_tk_set_no_len(FrtToken *tk, char *text, frt_off_t start, frt_off_t end, int pos_inc, rb_encoding *encoding) {
     return frt_tk_set(tk, text, (int)strlen(text), start, end, pos_inc, encoding);
 }
 
@@ -133,7 +133,7 @@ FrtToken *frt_tk_new(void) {
 /*****************************************************************************/
 
 void frt_ts_deref(FrtTokenStream *ts) {
-    if (--ts->ref_cnt <= 0)
+    if (FRT_DEREF(ts) == 0)
         ts->destroy_i(ts);
 }
 
@@ -1089,7 +1089,7 @@ FrtTokenStream *frt_stem_filter_new(FrtTokenStream *sub_ts, const char *algorith
 /*****************************************************************************/
 
 void frt_a_deref(FrtAnalyzer *a) {
-    if (--a->ref_cnt <= 0)
+    if (FRT_DEREF(a) == 0)
         a->destroy_i(a);
 }