ferret 0.2.2 → 0.3.0

data/ext/segment_merge_queue.c

@@ -1,6 +1,5 @@
 #include "ferret.h"
 
-ID eq, lt;
 /****************************************************************************
  *
  * SegmentMergeQueue Methods
@@ -11,7 +10,8 @@ static VALUE
 frt_smq_less_than(VALUE self, VALUE rsti1, VALUE rsti2)
 {
   int base1, base2;
-  int cmp = frt_term_compare_to_int(rb_iv_get(rsti1, "@term"), rb_iv_get(rsti2, "@term"));
+  int cmp = frt_term_compare_to_int(rb_iv_get(rsti1, "@term_buffer"),
+                                    rb_iv_get(rsti2, "@term_buffer"));
   if (cmp == 0) {
     base1 = FIX2INT(rb_iv_get(rsti1, "@base"));
     base2 = FIX2INT(rb_iv_get(rsti2, "@base"));
@@ -30,12 +30,8 @@ frt_smq_less_than(VALUE self, VALUE rsti1, VALUE rsti2)
 void
 Init_segment_merge_queue(void)
 {
-  /* IDs */
-  eq = rb_intern("==");
-  lt = rb_intern("<");
-
   /* SegmentMergeQueue */
-	cSegmentMergeQueue = rb_define_class_under(mIndex, "SegmentMergeQueue", cPriorityQueue);
+  cSegmentMergeQueue = rb_define_class_under(mIndex, "SegmentMergeQueue", cPriorityQueue);
 
-	rb_define_method(cSegmentMergeQueue, "less_than", frt_smq_less_than, 2);
+  rb_define_method(cSegmentMergeQueue, "less_than", frt_smq_less_than, 2);
 }

data/ext/segment_term_enum.c

@@ -0,0 +1,324 @@
+#include "ferret.h"
+
+/****************************************************************************
+ *
+ * SegmentTermEnum Methods
+ *
+ ****************************************************************************/
+void
+frt_ste_free(void *p)
+{
+  SegmentTermEnum *ste = (SegmentTermEnum *)p;
+  free(ste->ti);
+  free(p);
+}
+void
+frt_ste_mark(void *p)
+{
+  SegmentTermEnum *ste = (SegmentTermEnum *)p;
+  rb_gc_mark(ste->input);
+  rb_gc_mark(ste->field_infos);
+  rb_gc_mark(ste->rtb_curr);
+  rb_gc_mark(ste->rtb_prev);
+}
+
+static VALUE
+frt_ste_alloc(VALUE klass)
+{
+  SegmentTermEnum *ste = ALLOC(SegmentTermEnum);
+  MEMZERO(ste, SegmentTermEnum, 1);
+  return Data_Wrap_Struct(klass, frt_ste_mark, frt_ste_free, ste);
+}
+
+#define GET_STE SegmentTermEnum *ste; Data_Get_Struct(self, SegmentTermEnum, ste)
+static VALUE
+frt_ste_init(VALUE self, VALUE input, VALUE field_infos, VALUE is_index)
+{
+  int first_int;
+  GET_STE;
+  ste->is_index = RTEST(is_index);
+  ste->input = input;
+  Data_Get_Struct(input, IndexBuffer, ste->buf);
+  ste->field_infos = field_infos;
+  ste->position = -1;
+  ste->rtb_curr = rb_class_new_instance(0, NULL, cTermBuffer);
+  Data_Get_Struct(ste->rtb_curr, Term, ste->tb_curr);
+  ste->rtb_prev = rb_class_new_instance(0, NULL, cTermBuffer);
+  Data_Get_Struct(ste->rtb_prev, Term, ste->tb_prev);
+  ste->ti = ALLOC(TermInfo);
+  MEMZERO(ste->ti, TermInfo, 1);
+  ste->index_pointer = 0;
+
+  first_int = FIX2INT(frt_indexin_read_int(input));
+
+  if (first_int >= 0) {
+    // original-format file, without explicit format version number
+    ste->format = 0;
+    ste->size = first_int;
+
+    // back-compatible settings
+    ste->index_interval = 128;
+    ste->skip_interval = 0x7FFFFFFF; // switch off skip_to optimization
+
+  } else {
+    // we have a format version number
+    ste->format = first_int;
+    ste->size = FIX2INT(frt_indexin_read_long(input));  // read the size
+    
+    if (ste->format == -1) {
+      if (!ste->is_index) {
+        ste->index_interval = FIX2INT(frt_indexin_read_int(input));
+        ste->format_m1skip_interval = FIX2INT(frt_indexin_read_int(input));
+      }
+      // switch off skip_to optimization for file format prior to
+      // 1.4rc2 in order to avoid a bug in skip_to implementation
+      // of these versions
+      ste->skip_interval = 0x7FFFFFFF;
+    } else {
+      ste->index_interval = FIX2INT(frt_indexin_read_int(input));
+      ste->skip_interval = FIX2INT(frt_indexin_read_int(input));
+    }
+  }
+  return self;
+}
+
+static VALUE
+frt_ste_init_copy(VALUE self, VALUE rother)
+{
+  SegmentTermEnum *other; 
+  GET_STE;
+  Data_Get_Struct(rother, SegmentTermEnum, other);
+  MEMCPY(ste, other, SegmentTermEnum, 1);
+  ste->rtb_curr = rb_obj_clone(other->rtb_curr);
+  Data_Get_Struct(ste->rtb_curr, Term, ste->tb_curr);
+  ste->rtb_prev = rb_obj_clone(other->rtb_prev);
+  Data_Get_Struct(ste->rtb_prev, Term, ste->tb_prev);
+  ste->input = rb_obj_clone(other->input);
+  Data_Get_Struct(ste->input, IndexBuffer, ste->buf);
+  ste->ti = ALLOC(TermInfo);
+  MEMCPY(ste->ti, other->ti, TermInfo, 1);
+  return self;
+}
+
+static VALUE
+frt_ste_seek(VALUE self, VALUE pointer, VALUE position, VALUE term, VALUE term_info)
+{
+  TermInfo *ti; 
+  GET_STE;
+
+  frt_indexin_seek(ste->input, pointer);
+
+  ste->position = FIX2INT(position);
+  frt_termbuffer_init_copy(ste->rtb_curr, term);
+  free(ste->tb_prev->text);
+  MEMZERO(ste->tb_prev, Term, 1);
+  ste->tb_prev->field = Qnil;
+
+  Data_Get_Struct(term_info, TermInfo, ti);
+  MEMCPY(ste->ti, ti, TermInfo, 1);
+  return Qnil;
+}
+
+static VALUE
+frt_ste_next(VALUE self)
+{
+  IndexBuffer *zzbuf; 
+  TermInfo *ti;
+  GET_STE;
+  ste->position++;
+
+  Data_Get_Struct(ste->input, IndexBuffer, zzbuf);
+
+  if (ste->position >= ste->size) {
+    free(ste->tb_curr->text);
+    MEMZERO(ste->tb_curr, Term, 1);
+    ste->tb_curr->field = Qnil;
+    return Qnil;
+  }
+
+  frt_termbuffer_init_copy(ste->rtb_prev, ste->rtb_curr);
+  frt_termbuffer_read(ste->rtb_curr, ste->input, ste->field_infos);
+  
+  ti = ste->ti;
+  ti->doc_freq = frt_read_vint(ste->input, zzbuf);         // read doc freq
+  ti->freq_pointer += frt_read_vint(ste->input, zzbuf);    // read freq pointer
+  ti->prox_pointer += frt_read_vint(ste->input, zzbuf);    // read prox pointer
+  
+
+  if (ste->format == -1) {
+    // just read skip_offset in order to increment  file pointer
+    // value is never used since skip_to is switched off
+    if (!ste->is_index) {
+      if (ti->doc_freq > ste->format_m1skip_interval)
+        ti->skip_offset = frt_read_vint(ste->input, zzbuf);
+    }
+  } else {
+    if (ti->doc_freq >= ste->skip_interval)
+      ti->skip_offset = frt_read_vint(ste->input, zzbuf);
+  }
+  
+  if (ste->is_index) {
+    ste->index_pointer += frt_read_vint(ste->input, zzbuf); // read index pointer
+  }
+
+  return Qtrue;
+}
+
+static VALUE
+frt_ste_scan_to(VALUE self, VALUE rterm)
+{
+  Term *term;
+  GET_STE;
+  Data_Get_Struct(rterm, Term, term); 
+  while (frt_term_cmp(term, ste->tb_curr) > 0 && frt_ste_next(self) == Qtrue)
+    ;
+  return Qnil;
+}
+
+static VALUE
+frt_ste_get_term(VALUE self)
+{
+  GET_STE;
+  return frt_termbuffer_to_term(ste->rtb_curr);
+}
+
+static VALUE
+frt_ste_get_term_buffer(VALUE self)
+{
+  GET_STE;
+  return ste->rtb_curr;
+}
+
+static VALUE
+frt_ste_get_prev(VALUE self)
+{
+  GET_STE;
+  return frt_termbuffer_to_term(ste->rtb_prev);
+}
+
+static VALUE
+frt_ste_get_term_info(VALUE self)
+{
+  VALUE rti;
+  TermInfo *ti;
+  GET_STE;
+  rti = rb_obj_alloc(cTermInfo);
+  Data_Get_Struct(rti, TermInfo, ti);
+  MEMCPY(ti, ste->ti, TermInfo, 1);
+  return rti;
+}
+
+static VALUE
+frt_ste_set_term_info(VALUE self, VALUE rti)
+{
+  TermInfo *ti; 
+  GET_STE;
+  Data_Get_Struct(rti, TermInfo, ti);
+  MEMCPY(ste->ti, ti, TermInfo, 1);
+  return Qnil;
+}
+
+static VALUE
+frt_ste_get_doc_freq(VALUE self)
+{
+  GET_STE;
+  return INT2FIX(ste->ti->doc_freq);
+}
+
+static VALUE
+frt_ste_get_freq_pointer(VALUE self)
+{
+  GET_STE;
+  return INT2FIX(ste->ti->freq_pointer);
+}
+
+static VALUE
+frt_ste_get_prox_pointer(VALUE self)
+{
+  GET_STE;
+  return INT2FIX(ste->ti->prox_pointer);
+}
+
+static VALUE
+frt_ste_close(VALUE self)
+{
+  GET_STE;
+  return rb_funcall(ste->input, id_close, 0);
+}
+
+static VALUE
+frt_ste_get_field_infos(VALUE self)
+{
+  GET_STE;
+  return ste->field_infos;
+}
+
+static VALUE
+frt_ste_get_size(VALUE self)
+{
+  GET_STE;
+  return INT2FIX(ste->size);
+}
+
+static VALUE
+frt_ste_get_position(VALUE self)
+{
+  GET_STE;
+  return INT2FIX(ste->position);
+}
+
+static VALUE
+frt_ste_get_index_pointer(VALUE self)
+{
+  GET_STE;
+  return INT2FIX(ste->index_pointer);
+}
+
+static VALUE
+frt_ste_get_index_interval(VALUE self)
+{
+  GET_STE;
+  return INT2FIX(ste->index_interval);
+}
+
+static VALUE
+frt_ste_get_skip_interval(VALUE self)
+{
+  GET_STE;
+  return INT2FIX(ste->skip_interval);
+}
+
+/****************************************************************************
+ *
+ * Init Function
+ *
+ ****************************************************************************/
+
+void
+Init_segment_term_enum(void)
+{
+  /* SegmentTermEnum */
+  cSegmentTermEnum = rb_define_class_under(mIndex, "SegmentTermEnum", cTermEnum);
+  rb_define_alloc_func(cSegmentTermEnum, frt_ste_alloc);
+
+  rb_define_method(cSegmentTermEnum, "initialize", frt_ste_init, 3);
+  rb_define_method(cSegmentTermEnum, "initialize_copy", frt_ste_init_copy, 1);
+  rb_define_method(cSegmentTermEnum, "next?", frt_ste_next, 0);
+  rb_define_method(cSegmentTermEnum, "seek", frt_ste_seek, 4);
+  rb_define_method(cSegmentTermEnum, "scan_to", frt_ste_scan_to, 1);
+  rb_define_method(cSegmentTermEnum, "term", frt_ste_get_term, 0);
+  rb_define_method(cSegmentTermEnum, "term_buffer", frt_ste_get_term_buffer, 0);
+  rb_define_method(cSegmentTermEnum, "prev", frt_ste_get_prev, 0);
+  rb_define_method(cSegmentTermEnum, "term_info", frt_ste_get_term_info, 0);
+  rb_define_method(cSegmentTermEnum, "term_info=", frt_ste_set_term_info, 1);
+  rb_define_method(cSegmentTermEnum, "doc_freq", frt_ste_get_doc_freq, 0);
+  rb_define_method(cSegmentTermEnum, "freq_pointer", frt_ste_get_freq_pointer, 0);
+  rb_define_method(cSegmentTermEnum, "prox_pointer", frt_ste_get_prox_pointer, 0);
+  rb_define_method(cSegmentTermEnum, "close", frt_ste_close, 0);
+  rb_define_method(cSegmentTermEnum, "field_infos", frt_ste_get_field_infos, 0);
+  rb_define_method(cSegmentTermEnum, "size", frt_ste_get_size, 0);
+  rb_define_method(cSegmentTermEnum, "position", frt_ste_get_position, 0);
+  rb_define_method(cSegmentTermEnum, "index_pointer", frt_ste_get_index_pointer, 0);
+  rb_define_method(cSegmentTermEnum, "index_interval", frt_ste_get_index_interval, 0);
+  rb_define_method(cSegmentTermEnum, "skip_interval", frt_ste_get_skip_interval, 0);
+}

data/ext/similarity.c

@@ -0,0 +1,59 @@
+#include "ferret.h"
+#include <math.h>
+
+/****************************************************************************
+ *
+ * Similarity Methods
+ *
+ ****************************************************************************/
+
+/*
+static VALUE
+frt_sim_c_byte_to_float(VALUE self, VALUE rbyte)
+{
+  int b = FIX2INT(rbyte);
+  if (b == 0)
+    return rb_float_new(0.0);
+  int mantissa = b & 0x07;           // 0x07 =  7 = 0b00000111
+  int exponent = (b >> 3) & 0x1F;    // 0x1f = 31 = 0b00011111
+  int val = (mantissa << 21) | ((exponent + 48) << 24);
+  void *tmp = &val;
+  return rb_float_new(*(float *)tmp);
+}
+*/
+
+static VALUE
+frt_dsim_tf(VALUE self, VALUE freq)
+{
+  return rb_float_new(sqrt(NUM2DBL(freq)));
+}
+
+static VALUE
+frt_dsim_idf(VALUE self, VALUE rdoc_freq, VALUE rnum_docs)
+{
+  int doc_freq;
+  int num_docs = FIX2INT(rnum_docs);
+  if (num_docs == 0) return rb_float_new(0.0);
+
+  doc_freq = FIX2INT(rdoc_freq);
+  return rb_float_new(log((double)num_docs/(double)(doc_freq+1)) + 1.0);
+}
+
+/****************************************************************************
+ *
+ * Init Function
+ *
+ ****************************************************************************/
+
+void
+Init_similarity(void)
+{
+  VALUE cDefaultSimilarity;
+  /* Similarity */
+  cSimilarity = rb_define_class_under(mSearch, "Similarity", rb_cObject);
+  cDefaultSimilarity = rb_define_class_under(mSearch, "DefaultSimilarity", cSimilarity);
+
+  //rb_define_singleton_method(cSimilarity, "byte_to_float", frt_sim_c_byte_to_float, 1);
+  rb_define_method(cDefaultSimilarity, "tf", frt_dsim_tf, 1);
+  rb_define_method(cDefaultSimilarity, "idf", frt_dsim_idf, 2);
+}

data/ext/string_helper.c

@@ -35,8 +35,8 @@ frt_sh_string_difference(VALUE self, VALUE rstr1, VALUE rstr2)
 void
 Init_string_helper(void)
 {
-	/* StringHelper */
+  /* StringHelper */
   mStringHelper = rb_define_module_under(mUtils, "StringHelper");
 
-	rb_define_method(mStringHelper, "string_difference", frt_sh_string_difference, 2);
+  rb_define_method(mStringHelper, "string_difference", frt_sh_string_difference, 2);
 }

data/ext/tags

@@ -19,19 +19,29 @@ DISTCLEANFILES	Makefile	/^DISTCLEANFILES = $/;"	m
 DLDFLAGS	Makefile	/^DLDFLAGS =   $/;"	m
 DLLIB	Makefile	/^DLLIB = $(TARGET).so$/;"	m
 EXEEXT	Makefile	/^EXEEXT = $/;"	m
+GET_MY_BUF	index_io.c	31;"	d	file:
+GET_STE	segment_term_enum.c	33;"	d	file:
+GET_TB	term_buffer.c	43;"	d	file:
+GET_TERM	term.c	34;"	d	file:
+GET_TI	terminfo.c	24;"	d	file:
 INSTALL	Makefile	/^INSTALL = \/usr\/bin\/install -c$/;"	m
 INSTALL_DATA	Makefile	/^INSTALL_DATA = $(INSTALL) -m 644$/;"	m
 INSTALL_PROG	Makefile	/^INSTALL_PROG = $(INSTALL) -m 0755$/;"	m
 IndexBuffer	ferret.h	/^typedef struct IndexBuffer {$/;"	s
 IndexBuffer	ferret.h	/^} IndexBuffer;$/;"	t
-Init_extensions	ferret.c	/^Init_extensions(void)$/;"	f
+Init_ferret_ext	ferret.c	/^Init_ferret_ext(void)$/;"	f
 Init_indexio	index_io.c	/^Init_indexio(void)$/;"	f
 Init_priority_queue	priority_queue.c	/^Init_priority_queue(void)$/;"	f
 Init_ram_directory	ram_directory.c	/^Init_ram_directory(void)$/;"	f
 Init_segment_merge_queue	segment_merge_queue.c	/^Init_segment_merge_queue(void)$/;"	f
+Init_segment_term_enum	segment_term_enum.c	/^Init_segment_term_enum(void)$/;"	f
+Init_similarity	similarity.c	/^Init_similarity(void)$/;"	f
 Init_string_helper	string_helper.c	/^Init_string_helper(void)$/;"	f
 Init_term	term.c	/^Init_term(void)$/;"	f
 Init_term_buffer	term_buffer.c	/^Init_term_buffer(void) {$/;"	f
+Init_term_info	terminfo.c	/^Init_term_info(void)$/;"	f
+Init_term_infos_reader	term_infos_reader.c	/^Init_term_infos_reader(void)$/;"	f
+Init_token	token.c	/^Init_token(void)$/;"	f
 LDSHARED	Makefile	/^LDSHARED = $(CC) -shared$/;"	m
 LIBPATH	Makefile	/^LIBPATH =  -L"$(libdir)"$/;"	m
 LIBRUBY	Makefile	/^LIBRUBY = $(LIBRUBY_SO)$/;"	m
@@ -41,7 +51,7 @@ LIBRUBY_A	Makefile	/^LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a$/;"	m
 LIBS	Makefile	/^LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lcrypt -lm   -lc$/;"	m
 LOCAL_LIBS	Makefile	/^LOCAL_LIBS = $/;"	m
 MAKEDIRS	Makefile	/^MAKEDIRS = mkdir -p$/;"	m
-OBJS	Makefile	/^OBJS = index_io.o term_buffer.o ram_directory.o priority_queue.o string_helper.o segment_merge_queue.o ferret.o term.o util.o$/;"	m
+OBJS	Makefile	/^OBJS = index_io.o term_buffer.o ram_directory.o priority_queue.o string_helper.o segment_merge_queue.o ferret.o term.o util.o token.o segment_term_enum.o terminfo.o term_infos_reader.o similarity.o$/;"	m
 PriorityQueue	ferret.h	/^typedef struct PriorityQueue {$/;"	s
 PriorityQueue	ferret.h	/^} PriorityQueue;$/;"	t
 RAMFile	ferret.h	/^typedef struct RAMFile {$/;"	s
@@ -54,64 +64,77 @@ RUBYLIBDIR	Makefile	/^RUBYLIBDIR    = $(sitelibdir)$(target_prefix)$/;"	m
 RUBY_INSTALL_NAME	Makefile	/^RUBY_INSTALL_NAME = ruby1.8$/;"	m
 RUBY_SO_NAME	Makefile	/^RUBY_SO_NAME = ruby1.8$/;"	m
 SHELL	Makefile	/^SHELL = \/bin\/sh$/;"	m
-SRCS	Makefile	/^SRCS = index_io.c term_buffer.c ram_directory.c priority_queue.c string_helper.c segment_merge_queue.c ferret.c term.c util.c$/;"	m
+SRCS	Makefile	/^SRCS = index_io.c term_buffer.c ram_directory.c priority_queue.c string_helper.c segment_merge_queue.c ferret.c term.c util.c token.c segment_term_enum.c terminfo.c term_infos_reader.c similarity.c$/;"	m
 STATIC_LIB	Makefile	/^STATIC_LIB = $/;"	m
-TARGET	Makefile	/^TARGET = extensions$/;"	m
+SegmentTermEnum	ferret.h	/^typedef struct SegmentTermEnum {$/;"	s
+SegmentTermEnum	ferret.h	/^} SegmentTermEnum;$/;"	t
+TARGET	Makefile	/^TARGET = ferret_ext$/;"	m
 TARGET_SO	Makefile	/^TARGET_SO     = $(DLLIB)$/;"	m
 Term	ferret.h	/^typedef struct Term {$/;"	s
 Term	ferret.h	/^} Term;$/;"	t
-TermBuffer	ferret.h	/^typedef struct TermBuffer {$/;"	s
-TermBuffer	ferret.h	/^} TermBuffer;$/;"	t
+TermInfo	ferret.h	/^typedef struct TermInfo {$/;"	s
+TermInfo	ferret.h	/^} TermInfo;$/;"	t
 VPATH	Makefile	/^VPATH = $(srcdir):$(topdir):$(hdrdir)$/;"	m
 __FERRET_H_	ferret.h	2;"	d
 arch	Makefile	/^arch = i486-linux$/;"	m
 archdir	Makefile	/^archdir = $(rubylibdir)\/$(arch)$/;"	m
 bindir	Makefile	/^bindir = $(exec_prefix)\/bin$/;"	m
+buf	ferret.h	/^  IndexBuffer *buf;$/;"	m	struct:SegmentTermEnum
 bufcnt	ferret.h	/^  int   bufcnt;$/;"	m	struct:RAMFile
 buffer	ferret.h	/^  byte_t *buffer;$/;"	m	struct:IndexBuffer
 buffers	ferret.h	/^  void  **buffers;$/;"	m	struct:RAMFile
 byte_t	ferret.h	/^typedef unsigned char byte_t;$/;"	t
-cBufferedIndexIn	ferret.h	/^VALUE cBufferedIndexIn;$/;"	v
-cBufferedIndexOut	ferret.h	/^VALUE cBufferedIndexOut;$/;"	v
-cFSIndexIn	ferret.h	/^VALUE cFSIndexIn;$/;"	v
-cFSIndexOut	ferret.h	/^VALUE cFSIndexOut;$/;"	v
-cIndexIn	ferret.h	/^VALUE cIndexIn;$/;"	v
-cIndexOut	ferret.h	/^VALUE cIndexOut;$/;"	v
-cPriorityQueue	ferret.h	/^VALUE cPriorityQueue;$/;"	v
-cRAMDirectory	ferret.h	/^VALUE cRAMDirectory;$/;"	v
-cRAMIndexIn	ferret.h	/^VALUE cRAMIndexIn;$/;"	v
-cRAMIndexOut	ferret.h	/^VALUE cRAMIndexOut;$/;"	v
-cSegmentMergeQueue	ferret.h	/^VALUE cSegmentMergeQueue;$/;"	v
-cTerm	ferret.h	/^VALUE cTerm;$/;"	v
-cTermBuffer	ferret.h	/^VALUE cTermBuffer;$/;"	v
+cBufferedIndexIn	ferret.c	/^VALUE cBufferedIndexIn;$/;"	v
+cBufferedIndexOut	ferret.c	/^VALUE cBufferedIndexOut;$/;"	v
+cDefaultSimilarity	ferret.c	/^VALUE cDefaultSimilarity;$/;"	v
+cFSIndexIn	ferret.c	/^VALUE cFSIndexIn;$/;"	v
+cFSIndexOut	ferret.c	/^VALUE cFSIndexOut;$/;"	v
+cIndexIn	ferret.c	/^VALUE cIndexIn;$/;"	v
+cIndexOut	ferret.c	/^VALUE cIndexOut;$/;"	v
+cPriorityQueue	ferret.c	/^VALUE cPriorityQueue;$/;"	v
+cRAMDirectory	ferret.c	/^VALUE cRAMDirectory;$/;"	v
+cRAMIndexIn	ferret.c	/^VALUE cRAMIndexIn;$/;"	v
+cRAMIndexOut	ferret.c	/^VALUE cRAMIndexOut;$/;"	v
+cSegmentMergeQueue	ferret.c	/^VALUE cSegmentMergeQueue;$/;"	v
+cSegmentTermEnum	ferret.c	/^VALUE cSegmentTermEnum;$/;"	v
+cSimilarity	ferret.c	/^VALUE cSimilarity;$/;"	v
+cTerm	ferret.c	/^VALUE cTerm;$/;"	v
+cTermBuffer	ferret.c	/^VALUE cTermBuffer;$/;"	v
+cTermEnum	ferret.c	/^VALUE cTermEnum;$/;"	v
+cTermInfo	ferret.c	/^VALUE cTermInfo;$/;"	v
+cTermInfosReader	ferret.c	/^VALUE cTermInfosReader;$/;"	v
+cToken	ferret.c	/^VALUE cToken;$/;"	v
 datadir	Makefile	/^datadir = $(prefix)\/share$/;"	m
-eq	segment_merge_queue.c	/^ID eq, lt;$/;"	v
+doc_freq	ferret.h	/^  int doc_freq;$/;"	m	struct:TermInfo
 exec_prefix	Makefile	/^exec_prefix = $(prefix)$/;"	m
 extout	Makefile	/^extout = $/;"	m
 extout_prefix	Makefile	/^extout_prefix = $/;"	m
-field	ferret.h	/^	char *field;$/;"	m	struct:Term
-field	ferret.h	/^	char *field;$/;"	m	struct:TermBuffer
-field_name	term_buffer.c	/^ID field_name;$/;"	v
-flen	ferret.h	/^	int  flen;$/;"	m	struct:Term
-flen	ferret.h	/^	int flen;$/;"	m	struct:TermBuffer
-flush	ram_directory.c	/^ID flush, seek;$/;"	v
+field	ferret.h	/^	VALUE field;$/;"	m	struct:Term
+field_infos	ferret.h	/^  VALUE field_infos;$/;"	m	struct:SegmentTermEnum
+flush	ram_directory.c	/^ID flush, seek, id_file, id_pointer;$/;"	v
+format	ferret.h	/^  int format;$/;"	m	struct:SegmentTermEnum
+format_m1skip_interval	ferret.h	/^  int format_m1skip_interval;$/;"	m	struct:SegmentTermEnum
+freq_pointer	ferret.h	/^  long freq_pointer;$/;"	m	struct:TermInfo
+frt_dsim_idf	similarity.c	/^frt_dsim_idf(VALUE self, VALUE rdoc_freq, VALUE rnum_docs)$/;"	f	file:
+frt_dsim_tf	similarity.c	/^frt_dsim_tf(VALUE self, VALUE freq)$/;"	f	file:
 frt_extend_buffer_if_necessary	ram_directory.c	/^frt_extend_buffer_if_necessary(RAMFile *rf, int bufnum)$/;"	f
 frt_flush_buffer	index_io.c	/^ID frt_length, frt_flush_buffer, frt_read_internal, frt_seek_internal; $/;"	v
 frt_hash	util.c	/^frt_hash(register char *p, register int len)$/;"	f
+frt_id_index_terms	term_infos_reader.c	/^static ID frt_id_index_terms;$/;"	v	file:
 frt_indexbuffer_alloc	index_io.c	/^frt_indexbuffer_alloc(VALUE klass)$/;"	f	file:
 frt_indexbuffer_free	index_io.c	/^frt_indexbuffer_free(void *p)$/;"	f
 frt_indexin_init_copy	index_io.c	/^frt_indexin_init_copy(VALUE self, VALUE orig)$/;"	f	file:
 frt_indexin_pos	index_io.c	/^frt_indexin_pos(VALUE self)$/;"	f	file:
 frt_indexin_read_byte	index_io.c	/^frt_indexin_read_byte(VALUE self)$/;"	f	file:
 frt_indexin_read_bytes	index_io.c	/^frt_indexin_read_bytes(VALUE self, VALUE rbuf, VALUE roffset, VALUE rlen)$/;"	f	file:
-frt_indexin_read_int	index_io.c	/^frt_indexin_read_int(VALUE self)$/;"	f	file:
-frt_indexin_read_long	index_io.c	/^frt_indexin_read_long(VALUE self)$/;"	f	file:
+frt_indexin_read_int	index_io.c	/^frt_indexin_read_int(VALUE self)$/;"	f
+frt_indexin_read_long	index_io.c	/^frt_indexin_read_long(VALUE self)$/;"	f
 frt_indexin_read_string	index_io.c	/^frt_indexin_read_string(VALUE self)$/;"	f	file:
 frt_indexin_read_uint	index_io.c	/^frt_indexin_read_uint(VALUE self)$/;"	f	file:
 frt_indexin_read_ulong	index_io.c	/^frt_indexin_read_ulong(VALUE self)$/;"	f	file:
 frt_indexin_read_vint	index_io.c	/^frt_indexin_read_vint(VALUE self)$/;"	f	file:
 frt_indexin_refill	index_io.c	/^frt_indexin_refill(VALUE self)$/;"	f	file:
-frt_indexin_seek	index_io.c	/^frt_indexin_seek(VALUE self, VALUE rpos)$/;"	f	file:
+frt_indexin_seek	index_io.c	/^frt_indexin_seek(VALUE self, VALUE rpos)$/;"	f
 frt_indexout_flush	index_io.c	/^frt_indexout_flush(VALUE self)$/;"	f	file:
 frt_indexout_pos	index_io.c	/^frt_indexout_pos(VALUE self)$/;"	f	file:
 frt_indexout_seek	index_io.c	/^frt_indexout_seek(VALUE self, VALUE pos)$/;"	f	file:
@@ -125,7 +148,6 @@ frt_indexout_write_uint	index_io.c	/^frt_indexout_write_uint(VALUE self, VALUE r
 frt_indexout_write_ulong	index_io.c	/^frt_indexout_write_ulong(VALUE self, VALUE rulong)$/;"	f	file:
 frt_indexout_write_vint	index_io.c	/^frt_indexout_write_vint(VALUE self, VALUE rulong)$/;"	f	file:
 frt_length	index_io.c	/^ID frt_length, frt_flush_buffer, frt_read_internal, frt_seek_internal; $/;"	v
-frt_newobj	ferret.h	/^ID frt_newobj;$/;"	v
 frt_priq_adjust_top	priority_queue.c	/^frt_priq_adjust_top(VALUE self)$/;"	f	file:
 frt_priq_alloc	priority_queue.c	/^frt_priq_alloc(VALUE klass)$/;"	f	file:
 frt_priq_clear	priority_queue.c	/^frt_priq_clear(VALUE self)$/;"	f	file:
@@ -136,11 +158,11 @@ frt_priq_pop	priority_queue.c	/^frt_priq_pop(VALUE self)$/;"	f	file:
 frt_priq_push	priority_queue.c	/^frt_priq_push(VALUE self, VALUE e)$/;"	f	file:
 frt_priq_size	priority_queue.c	/^frt_priq_size(VALUE self)$/;"	f	file:
 frt_priq_top	priority_queue.c	/^frt_priq_top(VALUE self)$/;"	f	file:
-frt_read_byte	index_io.c	/^frt_read_byte(VALUE self)$/;"	f
+frt_read_byte	index_io.c	/^frt_read_byte(VALUE self, IndexBuffer *my_buf)$/;"	f	file:
 frt_read_bytes	index_io.c	/^frt_read_bytes(VALUE self, VALUE rbuffer, int offset, int len)$/;"	f	file:
 frt_read_chars	index_io.c	/^frt_read_chars(VALUE self, char* buffer, int off, int len) $/;"	f
 frt_read_internal	index_io.c	/^ID frt_length, frt_flush_buffer, frt_read_internal, frt_seek_internal; $/;"	v
-frt_read_vint	index_io.c	/^frt_read_vint(VALUE self)$/;"	f
+frt_read_vint	index_io.c	/^frt_read_vint(VALUE self, IndexBuffer *my_buf)$/;"	f
 frt_rf_alloc	ram_directory.c	/^frt_rf_alloc(VALUE klass)$/;"	f	file:
 frt_rf_extend	ram_directory.c	/^frt_rf_extend(RAMFile *rf)$/;"	f
 frt_rf_free	ram_directory.c	/^frt_rf_free(void *p)$/;"	f
@@ -162,38 +184,111 @@ frt_seek_internal	index_io.c	/^ID frt_length, frt_flush_buffer, frt_read_interna
 frt_sh_string_difference	string_helper.c	/^frt_sh_string_difference(VALUE self, VALUE rstr1, VALUE rstr2)$/;"	f	file:
 frt_sh_string_difference_int	string_helper.c	/^frt_sh_string_difference_int(VALUE self, VALUE rstr1, VALUE rstr2)$/;"	f
 frt_smq_less_than	segment_merge_queue.c	/^frt_smq_less_than(VALUE self, VALUE rsti1, VALUE rsti2)$/;"	f	file:
+frt_ste_alloc	segment_term_enum.c	/^frt_ste_alloc(VALUE klass)$/;"	f	file:
+frt_ste_close	segment_term_enum.c	/^frt_ste_close(VALUE self)$/;"	f	file:
+frt_ste_free	segment_term_enum.c	/^frt_ste_free(void *p)$/;"	f
+frt_ste_get_doc_freq	segment_term_enum.c	/^frt_ste_get_doc_freq(VALUE self)$/;"	f	file:
+frt_ste_get_field_infos	segment_term_enum.c	/^frt_ste_get_field_infos(VALUE self)$/;"	f	file:
+frt_ste_get_freq_pointer	segment_term_enum.c	/^frt_ste_get_freq_pointer(VALUE self)$/;"	f	file:
+frt_ste_get_index_interval	segment_term_enum.c	/^frt_ste_get_index_interval(VALUE self)$/;"	f	file:
+frt_ste_get_index_pointer	segment_term_enum.c	/^frt_ste_get_index_pointer(VALUE self)$/;"	f	file:
+frt_ste_get_position	segment_term_enum.c	/^frt_ste_get_position(VALUE self)$/;"	f	file:
+frt_ste_get_prev	segment_term_enum.c	/^frt_ste_get_prev(VALUE self)$/;"	f	file:
+frt_ste_get_prox_pointer	segment_term_enum.c	/^frt_ste_get_prox_pointer(VALUE self)$/;"	f	file:
+frt_ste_get_size	segment_term_enum.c	/^frt_ste_get_size(VALUE self)$/;"	f	file:
+frt_ste_get_skip_interval	segment_term_enum.c	/^frt_ste_get_skip_interval(VALUE self)$/;"	f	file:
+frt_ste_get_term	segment_term_enum.c	/^frt_ste_get_term(VALUE self)$/;"	f	file:
+frt_ste_get_term_buffer	segment_term_enum.c	/^frt_ste_get_term_buffer(VALUE self)$/;"	f	file:
+frt_ste_get_term_info	segment_term_enum.c	/^frt_ste_get_term_info(VALUE self)$/;"	f	file:
+frt_ste_init	segment_term_enum.c	/^frt_ste_init(VALUE self, VALUE input, VALUE field_infos, VALUE is_index)$/;"	f	file:
+frt_ste_init_copy	segment_term_enum.c	/^frt_ste_init_copy(VALUE self, VALUE rother)$/;"	f	file:
+frt_ste_mark	segment_term_enum.c	/^frt_ste_mark(void *p)$/;"	f
+frt_ste_next	segment_term_enum.c	/^frt_ste_next(VALUE self)$/;"	f	file:
+frt_ste_scan_to	segment_term_enum.c	/^frt_ste_scan_to(VALUE self, VALUE rterm)$/;"	f	file:
+frt_ste_seek	segment_term_enum.c	/^frt_ste_seek(VALUE self, VALUE pointer, VALUE position, VALUE term, VALUE term_info)$/;"	f	file:
+frt_ste_set_term_info	segment_term_enum.c	/^frt_ste_set_term_info(VALUE self, VALUE rti)$/;"	f	file:
 frt_term_alloc	term.c	/^frt_term_alloc(VALUE klass)$/;"	f	file:
+frt_term_cmp	term.c	/^frt_term_cmp(Term *t1, Term *t2)$/;"	f
 frt_term_compare_to	term.c	/^frt_term_compare_to(VALUE self, VALUE other)$/;"	f	file:
 frt_term_compare_to_int	term.c	/^frt_term_compare_to_int(VALUE self, VALUE rother)$/;"	f
+frt_term_eq	term.c	/^frt_term_eq(VALUE self, VALUE rother)$/;"	f
 frt_term_free	term.c	/^frt_term_free(void *p)$/;"	f
+frt_term_ge	term.c	/^frt_term_ge(VALUE self, VALUE rother)$/;"	f
 frt_term_get_field	term.c	/^frt_term_get_field(VALUE self)$/;"	f	file:
 frt_term_get_text	term.c	/^frt_term_get_text(VALUE self)$/;"	f	file:
+frt_term_gt	term.c	/^frt_term_gt(VALUE self, VALUE rother)$/;"	f
 frt_term_hash	term.c	/^frt_term_hash(VALUE self)$/;"	f	file:
 frt_term_init	term.c	/^frt_term_init(VALUE self, VALUE rfield, VALUE rtext)$/;"	f	file:
+frt_term_le	term.c	/^frt_term_le(VALUE self, VALUE rother)$/;"	f
+frt_term_lt	term.c	/^frt_term_lt(VALUE self, VALUE rother)$/;"	f
+frt_term_mark	term.c	/^frt_term_mark(void *p)$/;"	f
 frt_term_set	term.c	/^frt_term_set(VALUE self, VALUE rfield, VALUE rtext)$/;"	f
+frt_term_set_field	term.c	/^frt_term_set_field(VALUE self, VALUE rfield)$/;"	f	file:
+frt_term_set_text	term.c	/^frt_term_set_text(VALUE self, VALUE rtext)$/;"	f	file:
 frt_term_to_s	term.c	/^frt_term_to_s(VALUE self)$/;"	f
 frt_termbuffer_alloc	term_buffer.c	/^frt_termbuffer_alloc(VALUE klass)$/;"	f	file:
 frt_termbuffer_compare_to	term_buffer.c	/^frt_termbuffer_compare_to(VALUE self, VALUE rother)$/;"	f	file:
 frt_termbuffer_compare_to_int	term_buffer.c	/^frt_termbuffer_compare_to_int(VALUE self, VALUE rother)$/;"	f
+frt_termbuffer_eq	term_buffer.c	/^frt_termbuffer_eq(VALUE self, VALUE rother)$/;"	f
 frt_termbuffer_free	term_buffer.c	/^frt_termbuffer_free(void *p)$/;"	f
+frt_termbuffer_ge	term_buffer.c	/^frt_termbuffer_ge(VALUE self, VALUE rother)$/;"	f
 frt_termbuffer_get_field_name	term_buffer.c	/^frt_termbuffer_get_field_name(VALUE self)$/;"	f	file:
 frt_termbuffer_get_text	term_buffer.c	/^frt_termbuffer_get_text(VALUE self)$/;"	f	file:
 frt_termbuffer_get_text_length	term_buffer.c	/^frt_termbuffer_get_text_length(VALUE self)$/;"	f	file:
+frt_termbuffer_gt	term_buffer.c	/^frt_termbuffer_gt(VALUE self, VALUE rother)$/;"	f
 frt_termbuffer_hash	term_buffer.c	/^frt_termbuffer_hash(VALUE self)$/;"	f	file:
 frt_termbuffer_init	term_buffer.c	/^frt_termbuffer_init(VALUE self)$/;"	f	file:
-frt_termbuffer_init_copy	term_buffer.c	/^frt_termbuffer_init_copy(VALUE self, VALUE rother)$/;"	f	file:
-frt_termbuffer_read	term_buffer.c	/^frt_termbuffer_read(VALUE self, VALUE input, VALUE info)$/;"	f	file:
+frt_termbuffer_init_copy	term_buffer.c	/^frt_termbuffer_init_copy(VALUE self, VALUE rother)$/;"	f
+frt_termbuffer_le	term_buffer.c	/^frt_termbuffer_le(VALUE self, VALUE rother)$/;"	f
+frt_termbuffer_lt	term_buffer.c	/^frt_termbuffer_lt(VALUE self, VALUE rother)$/;"	f
+frt_termbuffer_mark	term_buffer.c	/^frt_termbuffer_mark(void *p)$/;"	f
+frt_termbuffer_read	term_buffer.c	/^frt_termbuffer_read(VALUE self, VALUE rinput, VALUE rfield_infos)$/;"	f
 frt_termbuffer_reset	term_buffer.c	/^frt_termbuffer_reset(VALUE self)$/;"	f	file:
-frt_termbuffer_set_term	term_buffer.c	/^frt_termbuffer_set_term(VALUE self, VALUE rterm)$/;"	f	file:
-frt_termbuffer_to_term	term_buffer.c	/^frt_termbuffer_to_term(VALUE self)$/;"	f	file:
+frt_termbuffer_to_term	term_buffer.c	/^frt_termbuffer_to_term(VALUE self)$/;"	f
+frt_ti_alloc	terminfo.c	/^frt_ti_alloc(VALUE klass)$/;"	f	file:
+frt_ti_eql	terminfo.c	/^frt_ti_eql(VALUE self, VALUE rother)$/;"	f	file:
+frt_ti_free	terminfo.c	/^frt_ti_free(void *p)$/;"	f
+frt_ti_get_df	terminfo.c	/^frt_ti_get_df(VALUE self)$/;"	f	file:
+frt_ti_get_fp	terminfo.c	/^frt_ti_get_fp(VALUE self)$/;"	f	file:
+frt_ti_get_pp	terminfo.c	/^frt_ti_get_pp(VALUE self)$/;"	f	file:
+frt_ti_get_so	terminfo.c	/^frt_ti_get_so(VALUE self)$/;"	f	file:
+frt_ti_init	terminfo.c	/^frt_ti_init(int argc, VALUE *argv, VALUE self)$/;"	f	file:
+frt_ti_init_copy	terminfo.c	/^frt_ti_init_copy(VALUE self, VALUE rother)$/;"	f	file:
+frt_ti_set	terminfo.c	/^frt_ti_set(int argc, VALUE *argv, VALUE self)$/;"	f
+frt_ti_set_df	terminfo.c	/^frt_ti_set_df(VALUE self, VALUE val)$/;"	f	file:
+frt_ti_set_fp	terminfo.c	/^frt_ti_set_fp(VALUE self, VALUE val)$/;"	f	file:
+frt_ti_set_pp	terminfo.c	/^frt_ti_set_pp(VALUE self, VALUE val)$/;"	f	file:
+frt_ti_set_so	terminfo.c	/^frt_ti_set_so(VALUE self, VALUE val)$/;"	f	file:
+frt_tir_get_index_offset	term_infos_reader.c	/^frt_tir_get_index_offset(VALUE self, VALUE rterm)$/;"	f	file:
+frt_token_eql	token.c	/^frt_token_eql(VALUE self, VALUE other)$/;"	f	file:
+frt_token_init	token.c	/^frt_token_init(int argc, VALUE *argv, VALUE self)$/;"	f	file:
+frt_token_pos_inc	token.c	/^frt_token_pos_inc (VALUE self, VALUE pI)$/;"	f	file:
 frt_write_byte	index_io.c	/^frt_write_byte(VALUE self, byte_t b)$/;"	f	file:
 frt_write_bytes	index_io.c	/^frt_write_bytes(VALUE self, byte_t *buf, int len)$/;"	f
 frt_write_chars	index_io.c	/^frt_write_chars(VALUE self, VALUE rbuf, int start, int length)$/;"	f	file:
 frt_write_vint	index_io.c	/^frt_write_vint(VALUE self, register unsigned long long i)$/;"	f	file:
 hdrdir	Makefile	/^hdrdir = $(topdir)$/;"	m
 heap	ferret.h	/^	VALUE *heap;$/;"	m	struct:PriorityQueue
+id_close	ferret.c	/^ID id_close;$/;"	v
+id_field_array	term_buffer.c	/^ID id_field_array;$/;"	v
+id_field_name	term_buffer.c	/^ID id_field_name;$/;"	v
+id_file	ram_directory.c	/^ID flush, seek, id_file, id_pointer;$/;"	v
+id_iv_size	ferret.c	/^ID id_iv_size;$/;"	v
+id_new	ferret.c	/^ID id_new;$/;"	v
+id_pointer	ram_directory.c	/^ID flush, seek, id_file, id_pointer;$/;"	v
+id_size	ferret.c	/^ID id_size;$/;"	v
+id_tk_end_offset	token.c	/^ID id_tk_text, id_tk_pos_inc, id_tk_start_offset, id_tk_end_offset, id_tk_type;$/;"	v
+id_tk_pos_inc	token.c	/^ID id_tk_text, id_tk_pos_inc, id_tk_start_offset, id_tk_end_offset, id_tk_type;$/;"	v
+id_tk_pos_inc_set	token.c	/^ID id_tk_pos_inc_set;$/;"	v
+id_tk_start_offset	token.c	/^ID id_tk_text, id_tk_pos_inc, id_tk_start_offset, id_tk_end_offset, id_tk_type;$/;"	v
+id_tk_text	token.c	/^ID id_tk_text, id_tk_pos_inc, id_tk_start_offset, id_tk_end_offset, id_tk_type;$/;"	v
+id_tk_type	token.c	/^ID id_tk_text, id_tk_pos_inc, id_tk_start_offset, id_tk_end_offset, id_tk_type;$/;"	v
 includedir	Makefile	/^includedir = $(prefix)\/include$/;"	m
+index_interval	ferret.h	/^  int index_interval;$/;"	m	struct:SegmentTermEnum
+index_pointer	ferret.h	/^  int index_pointer;$/;"	m	struct:SegmentTermEnum
 infodir	Makefile	/^infodir = $(prefix)\/info$/;"	m
+input	ferret.h	/^  VALUE input;$/;"	m	struct:SegmentTermEnum
+is_index	ferret.h	/^  int is_index;$/;"	m	struct:SegmentTermEnum
 len	ferret.h	/^	int len;$/;"	m	struct:PriorityQueue
 len	ferret.h	/^  int len;$/;"	m	struct:IndexBuffer
 length	ferret.h	/^  int   length;$/;"	m	struct:RAMFile
@@ -202,39 +297,48 @@ libdir	Makefile	/^libdir = $(exec_prefix)\/lib$/;"	m
 libexecdir	Makefile	/^libexecdir = $(exec_prefix)\/libexec$/;"	m
 libpath	Makefile	/^libpath = $(libdir)$/;"	m
 localstatedir	Makefile	/^localstatedir = $(DESTDIR)\/var$/;"	m
-lt	segment_merge_queue.c	/^ID eq, lt;$/;"	v
-mFerret	ferret.h	/^VALUE mFerret;$/;"	v
-mIndex	ferret.h	/^VALUE mIndex;$/;"	v
-mStore	ferret.h	/^VALUE mStore;$/;"	v
-mStringHelper	ferret.h	/^VALUE mStringHelper;$/;"	v
-mUtils	ferret.h	/^VALUE mUtils;$/;"	v
+mAnalysis	ferret.c	/^VALUE mAnalysis;$/;"	v
+mFerret	ferret.c	/^VALUE mFerret;$/;"	v
+mIndex	ferret.c	/^VALUE mIndex;$/;"	v
+mSearch	ferret.c	/^VALUE mSearch;$/;"	v
+mStore	ferret.c	/^VALUE mStore;$/;"	v
+mStringHelper	ferret.c	/^VALUE mStringHelper;$/;"	v
+mUtils	ferret.c	/^VALUE mUtils;$/;"	v
 mandir	Makefile	/^mandir = $(datadir)\/man$/;"	m
 mtime	ferret.h	/^  VALUE mtime;$/;"	m	struct:RAMFile
 name	ferret.h	/^  char  *name;$/;"	m	struct:RAMFile
 oldincludedir	Makefile	/^oldincludedir = $(DESTDIR)\/usr\/include$/;"	m
 pos	ferret.h	/^  int pos;$/;"	m	struct:IndexBuffer
+position	ferret.h	/^  int position;$/;"	m	struct:SegmentTermEnum
 prefix	Makefile	/^prefix = $(DESTDIR)\/usr$/;"	m
 preload	Makefile	/^preload = $/;"	m
 priq_down	priority_queue.c	/^priq_down(PriorityQueue *priq, VALUE self, VALUE rary)$/;"	f
 priq_up	priority_queue.c	/^priq_up(PriorityQueue *priq, VALUE self, VALUE rary)$/;"	f
+prox_pointer	ferret.h	/^  long prox_pointer;$/;"	m	struct:TermInfo
 put_heap	priority_queue.c	/^ID less_than, put_heap;$/;"	v
+rtb_curr	ferret.h	/^  VALUE rtb_curr;$/;"	m	struct:SegmentTermEnum
+rtb_prev	ferret.h	/^  VALUE rtb_prev;$/;"	m	struct:SegmentTermEnum
 ruby	Makefile	/^ruby = \/usr\/bin\/ruby1.8$/;"	m
 ruby_version	Makefile	/^ruby_version = 1.8$/;"	m
 rubylibdir	Makefile	/^rubylibdir = $(libdir)\/ruby\/$(ruby_version)$/;"	m
 sbindir	Makefile	/^sbindir = $(exec_prefix)\/sbin$/;"	m
-seek	ram_directory.c	/^ID flush, seek;$/;"	v
+seek	ram_directory.c	/^ID flush, seek, id_file, id_pointer;$/;"	v
 sharedstatedir	Makefile	/^sharedstatedir = $(prefix)\/com$/;"	m
 sitearch	Makefile	/^sitearch = i486-linux$/;"	m
 sitearchdir	Makefile	/^sitearchdir = $(sitelibdir)\/$(sitearch)$/;"	m
 sitedir	Makefile	/^sitedir = $(DESTDIR)\/usr\/local\/lib\/site_ruby$/;"	m
 sitelibdir	Makefile	/^sitelibdir = $(sitedir)\/$(ruby_version)$/;"	m
 size	ferret.h	/^	int size;$/;"	m	struct:PriorityQueue
+size	ferret.h	/^  int size;$/;"	m	struct:SegmentTermEnum
+skip_interval	ferret.h	/^  int skip_interval;$/;"	m	struct:SegmentTermEnum
+skip_offset	ferret.h	/^  int skip_offset;$/;"	m	struct:TermInfo
 srcdir	Makefile	/^srcdir = .$/;"	m
 start	ferret.h	/^  long start;$/;"	m	struct:IndexBuffer
 sysconfdir	Makefile	/^sysconfdir = $(DESTDIR)\/etc$/;"	m
-target_prefix	Makefile	/^target_prefix = \/ferret$/;"	m
+target_prefix	Makefile	/^target_prefix = $/;"	m
+tb_curr	ferret.h	/^  Term *tb_curr;$/;"	m	struct:SegmentTermEnum
+tb_prev	ferret.h	/^  Term *tb_prev;$/;"	m	struct:SegmentTermEnum
 text	ferret.h	/^	char *text;$/;"	m	struct:Term
-text	ferret.h	/^	char *text;$/;"	m	struct:TermBuffer
+ti	ferret.h	/^  TermInfo *ti;$/;"	m	struct:SegmentTermEnum
 tlen	ferret.h	/^	int  tlen;$/;"	m	struct:Term
-tlen	ferret.h	/^	int tlen;$/;"	m	struct:TermBuffer
 topdir	Makefile	/^topdir = \/usr\/lib\/ruby\/1.8\/i486-linux$/;"	m