ferret 0.11.6 → 0.11.8.4

data/ext/r_index.c

@@ -1,6 +1,10 @@
 #include "ferret.h"
 #include "index.h"
-#include <st.h>
+#ifdef FRT_RUBY_VERSION_1_9
+#  include <ruby/st.h>
+#else
+#  include <st.h>
+#endif
 
 VALUE mIndex;
 
@@ -52,15 +56,17 @@ static VALUE sym_with_positions;
 static VALUE sym_with_offsets;
 static VALUE sym_with_positions_offsets;
 
+static Symbol fsym_content;
+
 static ID id_term;
 static ID id_fields;
 static ID id_fld_num_map;
 static ID id_field_num;
 static ID id_boost;
 
-extern void frt_set_term(VALUE rterm, Term *t);
-extern Analyzer *frt_get_cwrapped_analyzer(VALUE ranalyzer);
-extern VALUE frt_get_analyzer(Analyzer *a);
+extern void frb_set_term(VALUE rterm, Term *t);
+extern Analyzer *frb_get_cwrapped_analyzer(VALUE ranalyzer);
+extern VALUE frb_get_analyzer(Analyzer *a);
 
 /****************************************************************************
  *
@@ -69,17 +75,17 @@ extern VALUE frt_get_analyzer(Analyzer *a);
  ****************************************************************************/
 
 static void
-frt_fi_free(void *p)
+frb_fi_free(void *p)
 {
     object_del(p);
     fi_deref((FieldInfo *)p);
 }
 
 static void
-frt_fi_get_params(VALUE roptions,
-                  enum StoreValues *store,
-                  enum IndexValues *index,
-                  enum TermVectorValues *term_vector,
+frb_fi_get_params(VALUE roptions,
+                  StoreValue *store,
+                  IndexValue *index,
+                  TermVectorValue *term_vector,
                   float *boost)
 {
     VALUE v;
@@ -151,14 +157,14 @@ frt_fi_get_params(VALUE roptions,
 }
 
 static VALUE
-frt_get_field_info(FieldInfo *fi)
+frb_get_field_info(FieldInfo *fi)
 {
 
     VALUE rfi = Qnil;
     if (fi) {
         rfi = object_get(fi);
         if (rfi == Qnil) {
-            rfi = Data_Wrap_Struct(cFieldInfo, NULL, &frt_fi_free, fi);
+            rfi = Data_Wrap_Struct(cFieldInfo, NULL, &frb_fi_free, fi);
             REF(fi);
             object_add(fi, rfi);
         }
@@ -176,22 +182,22 @@ frt_get_field_info(FieldInfo *fi)
  *  information on these properties. 
  */
 static VALUE
-frt_fi_init(int argc, VALUE *argv, VALUE self)
+frb_fi_init(int argc, VALUE *argv, VALUE self)
 {
     VALUE roptions, rname;
     FieldInfo *fi;
-    enum StoreValues store = STORE_YES;
-    enum IndexValues index = INDEX_YES;
-    enum TermVectorValues term_vector = TERM_VECTOR_WITH_POSITIONS_OFFSETS;
+    StoreValue store = STORE_YES;
+    IndexValue index = INDEX_YES;
+    TermVectorValue term_vector = TERM_VECTOR_WITH_POSITIONS_OFFSETS;
     float boost = 1.0f;
 
     rb_scan_args(argc, argv, "11", &rname, &roptions);
     if (argc > 1) {
-        frt_fi_get_params(roptions, &store, &index, &term_vector, &boost);
+        frb_fi_get_params(roptions, &store, &index, &term_vector, &boost);
     }
-    fi = fi_new(frt_field(rname), store, index, term_vector);
+    fi = fi_new(frb_field(rname), store, index, term_vector);
     fi->boost = boost;
-    Frt_Wrap_Struct(self, NULL, &frt_fi_free, fi);
+    Frt_Wrap_Struct(self, NULL, &frb_fi_free, fi);
     object_add(fi, self);
     return self;
 }
@@ -203,10 +209,10 @@ frt_fi_init(int argc, VALUE *argv, VALUE self)
  *  Return the name of the field
  */
 static VALUE
-frt_fi_name(VALUE self)
+frb_fi_name(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
-    return ID2SYM(rb_intern(fi->name));
+    return ID2SYM(fi->name);
 }
 
 /*
@@ -216,7 +222,7 @@ frt_fi_name(VALUE self)
  *  Return true if the field is stored in the index.
  */
 static VALUE
-frt_fi_is_stored(VALUE self)
+frb_fi_is_stored(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_is_stored(fi) ? Qtrue : Qfalse;
@@ -229,7 +235,7 @@ frt_fi_is_stored(VALUE self)
  *  Return true if the field is stored in the index in compressed format.
  */
 static VALUE
-frt_fi_is_compressed(VALUE self)
+frb_fi_is_compressed(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_is_compressed(fi) ? Qtrue : Qfalse;
@@ -242,7 +248,7 @@ frt_fi_is_compressed(VALUE self)
  *  Return true if the field is indexed, ie searchable in the index.
  */
 static VALUE
-frt_fi_is_indexed(VALUE self)
+frb_fi_is_indexed(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_is_indexed(fi) ? Qtrue : Qfalse;
@@ -260,7 +266,7 @@ frt_fi_is_indexed(VALUE self)
  *  A field can only be tokenized if it is indexed.
  */
 static VALUE
-frt_fi_is_tokenized(VALUE self)
+frb_fi_is_tokenized(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_is_tokenized(fi) ? Qtrue : Qfalse;
@@ -278,7 +284,7 @@ frt_fi_is_tokenized(VALUE self)
  *  large number of documents.
  */
 static VALUE
-frt_fi_omit_norms(VALUE self)
+frb_fi_omit_norms(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_omit_norms(fi) ? Qtrue : Qfalse;
@@ -291,7 +297,7 @@ frt_fi_omit_norms(VALUE self)
  *  Return true if the term-vectors are stored for this field.
  */
 static VALUE
-frt_fi_store_term_vector(VALUE self)
+frb_fi_store_term_vector(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_store_term_vector(fi) ? Qtrue : Qfalse;
@@ -304,7 +310,7 @@ frt_fi_store_term_vector(VALUE self)
  *  Return true if positions are stored with the term-vectors for this field.
  */
 static VALUE
-frt_fi_store_positions(VALUE self)
+frb_fi_store_positions(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_store_positions(fi) ? Qtrue : Qfalse;
@@ -317,7 +323,7 @@ frt_fi_store_positions(VALUE self)
  *  Return true if offsets are stored with the term-vectors for this field.
  */
 static VALUE
-frt_fi_store_offsets(VALUE self)
+frb_fi_store_offsets(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_store_offsets(fi) ? Qtrue : Qfalse;
@@ -332,7 +338,7 @@ frt_fi_store_offsets(VALUE self)
  *    fi.indexed? and not fi.omit_norms?
  */
 static VALUE
-frt_fi_has_norms(VALUE self)
+frb_fi_has_norms(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return fi_has_norms(fi) ? Qtrue : Qfalse;
@@ -345,7 +351,7 @@ frt_fi_has_norms(VALUE self)
  *  Return the default boost for this field
  */
 static VALUE
-frt_fi_boost(VALUE self)
+frb_fi_boost(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     return rb_float_new((double)fi->boost);
@@ -358,7 +364,7 @@ frt_fi_boost(VALUE self)
  *  Return a string representation of the FieldInfo object.
  */
 static VALUE
-frt_fi_to_s(VALUE self)
+frb_fi_to_s(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
     char *fi_s = fi_to_s(fi);
@@ -374,32 +380,32 @@ frt_fi_to_s(VALUE self)
  ****************************************************************************/
 
 static void
-frt_fis_free(void *p)
+frb_fis_free(void *p)
 {
     object_del(p);
     fis_deref((FieldInfos *)p);
 }
 
 static void
-frt_fis_mark(void *p)
+frb_fis_mark(void *p)
 {
     int i;
     FieldInfos *fis = (FieldInfos *)p;
 
     for (i = 0; i < fis->size; i++) {
-        frt_gc_mark(fis->fields[i]);
+        frb_gc_mark(fis->fields[i]);
     }
 }
 
 static VALUE
-frt_get_field_infos(FieldInfos *fis)
+frb_get_field_infos(FieldInfos *fis)
 {
 
     VALUE rfis = Qnil;
     if (fis) {
         rfis = object_get(fis);
         if (rfis == Qnil) {
-            rfis = Data_Wrap_Struct(cFieldInfos, &frt_fis_mark, &frt_fis_free,
+            rfis = Data_Wrap_Struct(cFieldInfos, &frb_fis_mark, &frb_fis_free,
                                     fis);
             REF(fis);
             object_add(fis, rfis);
@@ -417,21 +423,21 @@ frt_get_field_infos(FieldInfos *fis)
  *  property values.
  */
 static VALUE
-frt_fis_init(int argc, VALUE *argv, VALUE self)
+frb_fis_init(int argc, VALUE *argv, VALUE self)
 {
     VALUE roptions;
     FieldInfos *fis;
-    enum StoreValues store = STORE_YES;
-    enum IndexValues index = INDEX_YES;
-    enum TermVectorValues term_vector = TERM_VECTOR_WITH_POSITIONS_OFFSETS;
+    StoreValue store = STORE_YES;
+    IndexValue index = INDEX_YES;
+    TermVectorValue term_vector = TERM_VECTOR_WITH_POSITIONS_OFFSETS;
     float boost;
 
     rb_scan_args(argc, argv, "01", &roptions);
     if (argc > 0) {
-        frt_fi_get_params(roptions, &store, &index, &term_vector, &boost);
+        frb_fi_get_params(roptions, &store, &index, &term_vector, &boost);
     }
     fis = fis_new(store, index, term_vector);
-    Frt_Wrap_Struct(self, &frt_fis_mark, &frt_fis_free, fis);
+    Frt_Wrap_Struct(self, &frb_fis_mark, &frb_fis_free, fis);
     object_add(fis, self);
     return self;
 }
@@ -444,14 +450,14 @@ frt_fis_init(int argc, VALUE *argv, VALUE self)
  *  object.
  */
 static VALUE
-frt_fis_to_a(VALUE self)
+frb_fis_to_a(VALUE self)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
     VALUE rary = rb_ary_new();
     int i;
 
     for (i = 0; i < fis->size; i++) {
-        rb_ary_push(rary, frt_get_field_info(fis->fields[i]));
+        rb_ary_push(rary, frb_get_field_info(fis->fields[i]));
     }
     return rary;
 }
@@ -469,7 +475,7 @@ frt_fis_to_a(VALUE self)
  *    fi = fis[2]
  */
 static VALUE
-frt_fis_get(VALUE self, VALUE ridx)
+frb_fis_get(VALUE self, VALUE ridx)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
     VALUE rfi = Qnil;
@@ -479,17 +485,20 @@ frt_fis_get(VALUE self, VALUE ridx)
             if (index < 0) index += fis->size;
             if (index < 0 || index >= fis->size) {
                 rb_raise(rb_eArgError, "index of %d is out of range (0..%d)\n",
-                         index, fis->size);
+                         index, fis->size - 1);
             }
-            rfi = frt_get_field_info(fis->fields[index]);
+            rfi = frb_get_field_info(fis->fields[index]);
             break;
                        }
         case T_SYMBOL:
-            rfi = frt_get_field_info(fis_get_field(fis, frt_field(ridx)));
+        case T_STRING:
+            rfi = frb_get_field_info(fis_get_field(fis, frb_field(ridx)));
             break;
+            /*
         case T_STRING:
-            rfi = frt_get_field_info(fis_get_field(fis, StringValuePtr(ridx)));
+            rfi = frb_get_field_info(fis_get_field(fis, StringValuePtr(ridx)));
             break;
+            */
         default:
             rb_raise(rb_eArgError, "Can't index FieldInfos with %s",
                      rs2s(rb_obj_as_string(ridx)));
@@ -507,10 +516,10 @@ frt_fis_get(VALUE self, VALUE ridx)
  *  possible.
  */
 static VALUE
-frt_fis_add(VALUE self, VALUE rfi)
+frb_fis_add(VALUE self, VALUE rfi)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
-    FieldInfo *fi = (FieldInfo *)frt_rb_data_ptr(rfi);
+    FieldInfo *fi = (FieldInfo *)frb_rb_data_ptr(rfi);
     fis_add_field(fis, fi);
     REF(fi);
     return self;
@@ -524,21 +533,21 @@ frt_fis_add(VALUE self, VALUE rfi)
  *  of the available properties.
  */
 static VALUE
-frt_fis_add_field(int argc, VALUE *argv, VALUE self)
+frb_fis_add_field(int argc, VALUE *argv, VALUE self)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
     FieldInfo *fi;
-    enum StoreValues store = fis->store;
-    enum IndexValues index = fis->index;
-    enum TermVectorValues term_vector = fis->term_vector;
+    StoreValue store = fis->store;
+    IndexValue index = fis->index;
+    TermVectorValue term_vector = fis->term_vector;
     float boost = 1.0f;
     VALUE rname, roptions;
 
     rb_scan_args(argc, argv, "11", &rname, &roptions);
     if (argc > 1) {
-        frt_fi_get_params(roptions, &store, &index, &term_vector, &boost);
+        frb_fi_get_params(roptions, &store, &index, &term_vector, &boost);
     }
-    fi = fi_new(frt_field(rname), store, index, term_vector);
+    fi = fi_new(frb_field(rname), store, index, term_vector);
     fi->boost = boost;
     fis_add_field(fis, fi);
     return self;
@@ -551,13 +560,13 @@ frt_fis_add_field(int argc, VALUE *argv, VALUE self)
  *  Iterate through the FieldInfo objects.
  */
 static VALUE
-frt_fis_each(VALUE self)
+frb_fis_each(VALUE self)
 {
     int i;
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
 
     for (i = 0; i < fis->size; i++) {
-        rb_yield(frt_get_field_info(fis->fields[i]));
+        rb_yield(frb_get_field_info(fis->fields[i]));
     }
     return self;
 }
@@ -569,7 +578,7 @@ frt_fis_each(VALUE self)
  *  Return a string representation of the FieldInfos object.
  */
 static VALUE
-frt_fis_to_s(VALUE self)
+frb_fis_to_s(VALUE self)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
     char *fis_s = fis_to_s(fis);
@@ -585,7 +594,7 @@ frt_fis_to_s(VALUE self)
  *  Return the number of fields in the FieldInfos object.
  */
 static VALUE
-frt_fis_size(VALUE self)
+frb_fis_size(VALUE self)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
     return INT2FIX(fis->size);
@@ -602,7 +611,7 @@ frt_fis_size(VALUE self)
  *  directory and overwritten by the new index.
  */
 static VALUE
-frt_fis_create_index(VALUE self, VALUE rdir)
+frb_fis_create_index(VALUE self, VALUE rdir)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
     Store *store = NULL;
@@ -611,7 +620,7 @@ frt_fis_create_index(VALUE self, VALUE rdir)
         REF(store);
     } else {
         StringValue(rdir);
-        frt_create_dir(rdir);
+        frb_create_dir(rdir);
         store = open_fs_store(rs2s(rdir));
     }
     index_create(store, fis);
@@ -622,18 +631,19 @@ frt_fis_create_index(VALUE self, VALUE rdir)
 /*
  *  call-seq:
  *     fis.fields -> symbol array
+ *     fis.field_names -> symbol array
  *
  *  Return a list of the field names (as symbols) of all the fields in the
  *  index.
  */
 static VALUE
-frt_fis_get_fields(VALUE self)
+frb_fis_get_fields(VALUE self)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
     VALUE rfield_names = rb_ary_new();
     int i;
     for (i = 0; i < fis->size; i++) {
-        rb_ary_push(rfield_names, ID2SYM(rb_intern(fis->fields[i]->name)));
+        rb_ary_push(rfield_names, FSYM2SYM(fis->fields[i]->name));
     }
     return rfield_names;
 }
@@ -646,14 +656,14 @@ frt_fis_get_fields(VALUE self)
  *  in the index.
  */
 static VALUE
-frt_fis_get_tk_fields(VALUE self)
+frb_fis_get_tk_fields(VALUE self)
 {
     FieldInfos *fis = (FieldInfos *)DATA_PTR(self);
     VALUE rfield_names = rb_ary_new();
     int i;
     for (i = 0; i < fis->size; i++) {
         if (!fi_is_tokenized(fis->fields[i])) continue;
-        rb_ary_push(rfield_names, ID2SYM(rb_intern(fis->fields[i]->name)));
+        rb_ary_push(rfield_names, FSYM2SYM(fis->fields[i]->name));
     }
     return rfield_names;
 }
@@ -665,14 +675,14 @@ frt_fis_get_tk_fields(VALUE self)
  ****************************************************************************/
 
 static void
-frt_te_free(void *p)
+frb_te_free(void *p)
 {
     TermEnum *te = (TermEnum *)p;
     te->close(te);
 }
 
 static VALUE
-frt_te_get_set_term(VALUE self, const char *term)
+frb_te_get_set_term(VALUE self, const char *term)
 {
     TermEnum *te = (TermEnum *)DATA_PTR(self);
     VALUE str = term ? rb_str_new(term, te->curr_term_len) : Qnil;
@@ -681,12 +691,12 @@ frt_te_get_set_term(VALUE self, const char *term)
 }
 
 static VALUE
-frt_get_te(VALUE rir, TermEnum *te)
+frb_get_te(VALUE rir, TermEnum *te)
 {
     VALUE self = Qnil;
     if (te != NULL) {
-        self = Data_Wrap_Struct(cTermEnum, NULL, &frt_te_free, te);
-        frt_te_get_set_term(self, te->curr_term);
+        self = Data_Wrap_Struct(cTermEnum, NULL, &frb_te_free, te);
+        frb_te_get_set_term(self, te->curr_term);
         rb_ivar_set(self, id_fld_num_map, rb_ivar_get(rir, id_fld_num_map));
     }
     return self;
@@ -699,10 +709,10 @@ frt_get_te(VALUE rir, TermEnum *te)
  *  Returns the next term in the enumeration or nil otherwise.
  */
 static VALUE
-frt_te_next(VALUE self)
+frb_te_next(VALUE self)
 {
     TermEnum *te = (TermEnum *)DATA_PTR(self);
-    return frt_te_get_set_term(self, te->next(te));
+    return frb_te_get_set_term(self, te->next(te));
 }
 
 /*
@@ -713,7 +723,7 @@ frt_te_next(VALUE self)
  *  be called after a successful call to TermEnum#next.
  */
 static VALUE
-frt_te_term(VALUE self)
+frb_te_term(VALUE self)
 {
     return rb_ivar_get(self, id_term);
 }
@@ -727,7 +737,7 @@ frt_te_term(VALUE self)
  *  should only be called after a successful call to TermEnum#next.
  */
 static VALUE
-frt_te_doc_freq(VALUE self)
+frb_te_doc_freq(VALUE self)
 {
     TermEnum *te = (TermEnum *)DATA_PTR(self);
     return INT2FIX(te->curr_ti.doc_freq);
@@ -745,10 +755,10 @@ frt_te_doc_freq(VALUE self)
  *  Returns the first term greater than or equal to +target+
  */
 static VALUE
-frt_te_skip_to(VALUE self, VALUE rterm)
+frb_te_skip_to(VALUE self, VALUE rterm)
 {
     TermEnum *te = (TermEnum *)DATA_PTR(self);
-    return frt_te_get_set_term(self, te->skip_to(te, frt_field(rterm)));
+    return frb_te_get_set_term(self, te->skip_to(te, rs2s(rterm)));
 }
 
 /*
@@ -759,15 +769,14 @@ frt_te_skip_to(VALUE self, VALUE rterm)
  *  document frequency. 
  */
 static VALUE
-frt_te_each(VALUE self)
+frb_te_each(VALUE self)
 {
     TermEnum *te = (TermEnum *)DATA_PTR(self);
     char *term;
     int term_cnt = 0;
     VALUE vals = rb_ary_new2(2);
-    RARRAY(vals)->len = 2;
-    rb_mem_clear(RARRAY(vals)->ptr, 2);
-
+    rb_ary_store(vals, 0, Qnil);
+    rb_ary_store(vals, 1, Qnil);
 
     /* each is being called so there will be no current term */
     rb_ivar_set(self, id_term, Qnil);
@@ -775,8 +784,8 @@ frt_te_each(VALUE self)
     
     while (NULL != (term = te->next(te))) {
         term_cnt++;
-        RARRAY(vals)->ptr[0] = rb_str_new(term, te->curr_term_len);
-        RARRAY(vals)->ptr[1] = INT2FIX(te->curr_ti.doc_freq);
+        RARRAY_PTR(vals)[0] = rb_str_new(term, te->curr_term_len);
+        RARRAY_PTR(vals)[1] = INT2FIX(te->curr_ti.doc_freq);
         rb_yield(vals);
     }
     return INT2FIX(term_cnt);
@@ -794,7 +803,7 @@ frt_te_each(VALUE self)
  *    end
  */
 static VALUE
-frt_te_set_field(VALUE self, VALUE rfield)
+frb_te_set_field(VALUE self, VALUE rfield)
 {
     TermEnum *te = (TermEnum *)DATA_PTR(self);
     int field_num = 0;
@@ -806,7 +815,7 @@ frt_te_set_field(VALUE self, VALUE rfield)
     } else {
         Check_Type(rfield, T_SYMBOL);
         rb_raise(rb_eArgError, "field %s doesn't exist in the index",
-                 frt_field(rfield));
+                 (char *)frb_field(rfield));
     }
     te->set_field(te, field_num);
 
@@ -836,7 +845,7 @@ frt_te_set_field(VALUE self, VALUE rfield)
  *    # ]
  */
 static VALUE
-frt_te_to_json(int argc, VALUE *argv, VALUE self)
+frb_te_to_json(int argc, VALUE *argv, VALUE self)
 {
     TermEnum *te = (TermEnum *)DATA_PTR(self);
     VALUE rjson;
@@ -900,16 +909,16 @@ frt_te_to_json(int argc, VALUE *argv, VALUE self)
  ****************************************************************************/
 
 static void
-frt_tde_free(void *p)
+frb_tde_free(void *p)
 {
     TermDocEnum *tde = (TermDocEnum *)p;
     tde->close(tde);
 }
 
 static VALUE
-frt_get_tde(VALUE rir, TermDocEnum *tde)
+frb_get_tde(VALUE rir, TermDocEnum *tde)
 {
-    VALUE self = Data_Wrap_Struct(cTermDocEnum, NULL, &frt_tde_free, tde);
+    VALUE self = Data_Wrap_Struct(cTermDocEnum, NULL, &frb_tde_free, tde);
     rb_ivar_set(self, id_fld_num_map, rb_ivar_get(rir, id_fld_num_map));
     return self;
 }
@@ -923,7 +932,7 @@ frt_get_tde(VALUE rir, TermDocEnum *tde)
  *  this particular term.
  */
 static VALUE
-frt_tde_seek(VALUE self, VALUE rfield, VALUE rterm)
+frb_tde_seek(VALUE self, VALUE rfield, VALUE rterm)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     char *term;
@@ -935,7 +944,7 @@ frt_tde_seek(VALUE self, VALUE rfield, VALUE rterm)
         field_num = FIX2INT(rfnum);
     } else {
         rb_raise(rb_eArgError, "field %s doesn't exist in the index",
-                 frt_field(rfield));
+                 (char *)frb_field(rfield));
     }
     tde->seek(tde, field_num, term);
     return self;
@@ -954,10 +963,10 @@ frt_tde_seek(VALUE self, VALUE rfield, VALUE rterm)
  *  a large performance improvement.
  */
 static VALUE
-frt_tde_seek_te(VALUE self, VALUE rterm_enum)
+frb_tde_seek_te(VALUE self, VALUE rterm_enum)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
-    TermEnum *te = (TermEnum *)frt_rb_data_ptr(rterm_enum);
+    TermEnum *te = (TermEnum *)frb_rb_data_ptr(rterm_enum);
     tde->seek_te(tde, te);
     return self;
 }
@@ -969,7 +978,7 @@ frt_tde_seek_te(VALUE self, VALUE rterm_enum)
  *  Returns the current document number pointed to by the +term_doc_enum+.
  */
 static VALUE
-frt_tde_doc(VALUE self)
+frb_tde_doc(VALUE self)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     return INT2FIX(tde->doc_num(tde));
@@ -983,7 +992,7 @@ frt_tde_doc(VALUE self)
  *  +term_doc_enum+.
  */
 static VALUE
-frt_tde_freq(VALUE self)
+frb_tde_freq(VALUE self)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     return INT2FIX(tde->freq(tde));
@@ -997,7 +1006,7 @@ frt_tde_freq(VALUE self)
  *  there is another document or +false+ otherwise.
  */
 static VALUE
-frt_tde_next(VALUE self)
+frb_tde_next(VALUE self)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     return tde->next(tde) ? Qtrue : Qfalse;
@@ -1011,7 +1020,7 @@ frt_tde_next(VALUE self)
  *  there is another document or +false+ otherwise.
  */
 static VALUE
-frt_tde_next_position(VALUE self)
+frb_tde_next_position(VALUE self)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     int pos;
@@ -1035,18 +1044,18 @@ frt_tde_next_position(VALUE self)
  *  call +#each+ again then you should call +#seek+ again too.
  */
 static VALUE
-frt_tde_each(VALUE self)
+frb_tde_each(VALUE self)
 {
     int doc_cnt = 0;
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     VALUE vals = rb_ary_new2(2);
-    RARRAY(vals)->len = 2;
-    rb_mem_clear(RARRAY(vals)->ptr, 2);
+    rb_ary_store(vals, 0, Qnil);
+    rb_ary_store(vals, 1, Qnil);
 
     while (tde->next(tde)) {
         doc_cnt++;
-        RARRAY(vals)->ptr[0] = INT2FIX(tde->doc_num(tde));
-        RARRAY(vals)->ptr[1] = INT2FIX(tde->freq(tde));
+        RARRAY_PTR(vals)[0] = INT2FIX(tde->doc_num(tde));
+        RARRAY_PTR(vals)[1] = INT2FIX(tde->freq(tde));
         rb_yield(vals);
 
     }
@@ -1079,7 +1088,7 @@ frt_tde_each(VALUE self)
  *    # ]
  */
 static VALUE
-frt_tde_to_json(int argc, VALUE *argv, VALUE self)
+frb_tde_to_json(int argc, VALUE *argv, VALUE self)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     VALUE rjson;
@@ -1153,7 +1162,7 @@ frt_tde_to_json(int argc, VALUE *argv, VALUE self)
  *    end
  */
 static VALUE
-frt_tde_each_position(VALUE self)
+frb_tde_each_position(VALUE self)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     int pos;
@@ -1176,7 +1185,7 @@ frt_tde_each_position(VALUE self)
  *  a document >= +target+.
  */
 static VALUE
-frt_tde_skip_to(VALUE self, VALUE rtarget)
+frb_tde_skip_to(VALUE self, VALUE rtarget)
 {
     TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self);
     return tde->skip_to(tde, FIX2INT(rtarget)) ? Qtrue : Qfalse;
@@ -1189,11 +1198,11 @@ frt_tde_skip_to(VALUE self, VALUE rtarget)
  ****************************************************************************/
 
 static VALUE
-frt_get_tv_offsets(Offset *offset)
+frb_get_tv_offsets(Offset *offset)
 {
     return rb_struct_new(cTVOffsets,
-                         ULL2NUM((unsigned long long)offset->start),
-                         ULL2NUM((unsigned long long)offset->end),
+                         ULL2NUM((u64)offset->start),
+                         ULL2NUM((u64)offset->end),
                          NULL);
 }
 
@@ -1204,7 +1213,7 @@ frt_get_tv_offsets(Offset *offset)
  ****************************************************************************/
 
 static VALUE
-frt_get_tv_term(TVTerm *tv_term)
+frb_get_tv_term(TVTerm *tv_term)
 {
     int i;
     const int freq = tv_term->freq;
@@ -1212,16 +1221,13 @@ frt_get_tv_term(TVTerm *tv_term)
     VALUE rpositions = Qnil;
     rtext = rb_str_new2(tv_term->text);
     if (tv_term->positions) {
-        VALUE *rpos;
         int *positions = tv_term->positions;
         rpositions = rb_ary_new2(freq);
-        rpos = RARRAY(rpositions)->ptr;
         for (i = 0; i < freq; i++) {
-            rpos[i] = INT2FIX(positions[i]);
+          rb_ary_store(rpositions, i, INT2FIX(positions[i]));
         }
-        RARRAY(rpositions)->len = freq;
     }
-    return rb_struct_new(cTVTerm, rtext, rpositions, NULL);
+    return rb_struct_new(cTVTerm, rtext, INT2FIX(freq), rpositions, NULL);
 }
 
 /****************************************************************************
@@ -1231,31 +1237,26 @@ frt_get_tv_term(TVTerm *tv_term)
  ****************************************************************************/
 
 static VALUE
-frt_get_tv(TermVector *tv)
+frb_get_tv(TermVector *tv)
 {
     int i;
     TVTerm *terms = tv->terms;
     const int t_cnt = tv->term_cnt;
     const int o_cnt = tv->offset_cnt;
-    VALUE rfield, rterms, *rts;
+    VALUE rfield, rterms;
     VALUE roffsets = Qnil;
-    rfield = ID2SYM(rb_intern(tv->field));
+    rfield = FSYM2SYM(tv->field);
 
     rterms = rb_ary_new2(t_cnt);
-    rts = RARRAY(rterms)->ptr;
     for (i = 0; i < t_cnt; i++) {
-        rts[i] = frt_get_tv_term(&terms[i]);
-        RARRAY(rterms)->len++;
+      rb_ary_store(rterms, i, frb_get_tv_term(&terms[i]));
     }
 
     if (tv->offsets) {
-        VALUE *ros;
         Offset *offsets = tv->offsets;
         roffsets = rb_ary_new2(o_cnt);
-        ros = RARRAY(roffsets)->ptr;
         for (i = 0; i < o_cnt; i++) {
-            ros[i] = frt_get_tv_offsets(&offsets[i]);
-            RARRAY(roffsets)->len++;
+          rb_ary_store(roffsets, i, frb_get_tv_offsets(&offsets[i]));
         }
     }
 
@@ -1269,18 +1270,18 @@ frt_get_tv(TermVector *tv)
  ****************************************************************************/
 
 void
-frt_iw_free(void *p)
+frb_iw_free(void *p)
 {
     iw_close((IndexWriter *)p);
 }
 
 void
-frt_iw_mark(void *p)
+frb_iw_mark(void *p)
 {
     IndexWriter *iw = (IndexWriter *)p;
-    frt_gc_mark(iw->analyzer);
-    frt_gc_mark(iw->store);
-    frt_gc_mark(iw->fis);
+    frb_gc_mark(iw->analyzer);
+    frb_gc_mark(iw->store);
+    frb_gc_mark(iw->fis);
 }
 
 /*
@@ -1292,7 +1293,7 @@ frt_iw_mark(void *p)
  *  automatically if not called explicitly.
  */
 static VALUE
-frt_iw_close(VALUE self)
+frb_iw_close(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     Frt_Unwrap_Struct(self);
@@ -1325,7 +1326,7 @@ frt_iw_close(VALUE self)
  * See IndexWriter for more options.
  */
 static VALUE
-frt_iw_init(int argc, VALUE *argv, VALUE self)
+frb_iw_init(int argc, VALUE *argv, VALUE self)
 {
     VALUE roptions, rval;
     bool create = false;
@@ -1344,7 +1345,7 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
             store = DATA_PTR(rval);
         } else if ((rval = rb_hash_aref(roptions, sym_path)) != Qnil) {
             StringValue(rval);
-            frt_create_dir(rval);
+            frb_create_dir(rval);
             store = open_fs_store(rs2s(rval));
             DEREF(store);
         }
@@ -1361,7 +1362,7 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
             : true;
 
         if ((rval = rb_hash_aref(roptions, sym_analyzer)) != Qnil) {
-            analyzer = frt_get_cwrapped_analyzer(rval);
+            analyzer = frb_get_cwrapped_analyzer(rval);
         }
 
         create = RTEST(rb_hash_aref(roptions, sym_create));
@@ -1399,11 +1400,11 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
 
     iw = iw_open(store, analyzer, &config);
 
-    Frt_Wrap_Struct(self, &frt_iw_mark, &frt_iw_free, iw);
+    Frt_Wrap_Struct(self, &frb_iw_mark, &frb_iw_free, iw);
 
     if (rb_block_given_p()) {
         rb_yield(self);
-        frt_iw_close(self);
+        frb_iw_close(self);
         return Qnil;
     } else {
         return self;
@@ -1418,35 +1419,22 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
  *  taken into account until the IndexWriter has been committed.
  */
 static VALUE
-frt_iw_get_doc_count(VALUE self)
+frb_iw_get_doc_count(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw_doc_count(iw));
 }
 
 static int
-frt_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
+frb_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
 {
     if (key == Qundef) {
         return ST_CONTINUE;
     } else {
         Document *doc = (Document *)arg;
-        char *field;
+        Symbol field = frb_field(key);
         VALUE val;
         DocField *df;
-        switch (TYPE(key)) {
-            case T_STRING:
-                field = rs2s(key);
-                break;
-            case T_SYMBOL:
-                field = rb_id2name(SYM2ID(key));
-                break;
-            default:
-                rb_raise(rb_eArgError,
-                         "%s cannot be a key to a field. Field keys must "
-                         " be symbols.", rs2s(rb_obj_as_string(key)));
-                break;
-        }
         if (NULL == (df = doc_get_field(doc, field))) {
             df = df_new(field);
         }
@@ -1458,19 +1446,19 @@ frt_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
                 {
                     int i;
                     df->destroy_data = true;
-                    for (i = 0; i < RARRAY(value)->len; i++) {
-                        val = rb_obj_as_string(RARRAY(value)->ptr[i]);
-                        df_add_data_len(df, nstrdup(val), RSTRING(val)->len);
+                    for (i = 0; i < RARRAY_LEN(value); i++) {
+                        val = rb_obj_as_string(RARRAY_PTR(value)[i]);
+                        df_add_data_len(df, rstrdup(val), RSTRING_LEN(val));
                     }
                 }
                 break;
             case T_STRING:
-                df_add_data_len(df, rs2s(value), RSTRING(value)->len);
+                df_add_data_len(df, rs2s(value), RSTRING_LEN(value));
                 break;
             default:
                 val = rb_obj_as_string(value);
                 df->destroy_data = true;
-                df_add_data_len(df, nstrdup(val), RSTRING(val)->len);
+                df_add_data_len(df, rstrdup(val), RSTRING_LEN(val));
                 break;
         }
         doc_add_field(doc, df);
@@ -1479,7 +1467,7 @@ frt_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
 }
 
 static Document *
-frt_get_doc(VALUE rdoc)
+frb_get_doc(VALUE rdoc)
 {
     VALUE val;
     Document *doc = doc_new();
@@ -1491,33 +1479,34 @@ frt_get_doc(VALUE rdoc)
 
     switch (TYPE(rdoc)) {
         case T_HASH:
-            rb_hash_foreach(rdoc, frt_hash_to_doc_i, (VALUE)doc);
+            rb_hash_foreach(rdoc, frb_hash_to_doc_i, (VALUE)doc);
             break;
         case T_ARRAY:
             {
                 int i;
-                df = df_new("content");
+                df = df_new(fsym_content);
                 df->destroy_data = true;
-                for (i = 0; i < RARRAY(rdoc)->len; i++) {
-                    val = rb_obj_as_string(RARRAY(rdoc)->ptr[i]);
-                    df_add_data_len(df, nstrdup(val), RSTRING(val)->len);
+                for (i = 0; i < RARRAY_LEN(rdoc); i++) {
+                    val = rb_obj_as_string(RARRAY_PTR(rdoc)[i]);
+                    df_add_data_len(df, rstrdup(val), RSTRING_LEN(val));
                 }
                 doc_add_field(doc, df);
             }
             break;
         case T_SYMBOL:
-            df = df_add_data(df_new("content"), rb_id2name(SYM2ID(rdoc)));
+            /* TODO: clean up this ugly cast */
+            df = df_add_data(df_new(fsym_content), (char *)rb_id2name(SYM2ID(rdoc)));
             doc_add_field(doc, df);
             break;
         case T_STRING:
-            df = df_add_data_len(df_new("content"), rs2s(rdoc),
-                                 RSTRING(rdoc)->len);
+            df = df_add_data_len(df_new(fsym_content), rs2s(rdoc),
+                                 RSTRING_LEN(rdoc));
             doc_add_field(doc, df);
             break;
         default:
             val = rb_obj_as_string(rdoc);
-            df = df_add_data_len(df_new("content"), nstrdup(val),
-                                 RSTRING(val)->len);
+            df = df_add_data_len(df_new(fsym_content), rstrdup(val),
+                                 RSTRING_LEN(val));
             df->destroy_data = true;
             doc_add_field(doc, df);
             break;
@@ -1534,10 +1523,10 @@ frt_get_doc(VALUE rdoc)
  *  hash object.
  */
 static VALUE
-frt_iw_add_doc(VALUE self, VALUE rdoc)
+frb_iw_add_doc(VALUE self, VALUE rdoc)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
-    Document *doc = frt_get_doc(rdoc);
+    Document *doc = frb_get_doc(rdoc);
     iw_add_doc(iw, doc);
     doc_destroy(doc);
     return self;
@@ -1556,7 +1545,7 @@ frt_iw_add_doc(VALUE self, VALUE rdoc)
  *  process).
  */
 static VALUE
-frt_iw_optimize(VALUE self)
+frb_iw_optimize(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw_optimize(iw);
@@ -1572,7 +1561,7 @@ frt_iw_optimize(VALUE self)
  *  with an IndexWriter.
  */
 static VALUE
-frt_iw_commit(VALUE self)
+frb_iw_commit(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw_commit(iw);
@@ -1590,39 +1579,52 @@ frt_iw_commit(VALUE self)
  *  index.
  */
 static VALUE
-frt_iw_add_readers(VALUE self, VALUE rreaders)
+frb_iw_add_readers(VALUE self, VALUE rreaders)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     int i;
     IndexReader **irs;
     Check_Type(rreaders, T_ARRAY);
 
-    irs = ALLOC_N(IndexReader *, RARRAY(rreaders)->len);
-    i = RARRAY(rreaders)->len;
+    irs = ALLOC_N(IndexReader *, RARRAY_LEN(rreaders));
+    i = RARRAY_LEN(rreaders);
     while (i-- > 0) {
         IndexReader *ir;
-        Data_Get_Struct(RARRAY(rreaders)->ptr[i], IndexReader, ir);
+        Data_Get_Struct(RARRAY_PTR(rreaders)[i], IndexReader, ir);
         irs[i] = ir;
     }
-    iw_add_readers(iw, irs, RARRAY(rreaders)->len);
+    iw_add_readers(iw, irs, RARRAY_LEN(rreaders));
     free(irs);
     return self;
 }
 
 /*
  *  call-seq:
- *     iw.delete(field, term) -> iw
+ *     iw.delete(field, term)  -> iw
+ *     iw.delete(field, terms) -> iw
  *
- *  Delete all documents in the index with the term +term+ in the field
- *  +field+. You should usually have a unique document id which you use with
- *  this method, rather then deleting all documents with the word "the" in
- *  them. You may however use this method to delete spam.
+ *  Delete all documents in the index with the given +term+ or +terms+ in the
+ *  field +field+. You should usually have a unique document id which you use
+ *  with this method, rather then deleting all documents with the word "the"
+ *  in them. There are of course exceptions to this rule. For example, you may
+ *  want to delete all documents with the term "viagra" when deleting spam.
  */
 static VALUE
-frt_iw_delete(VALUE self, VALUE rfield, VALUE rterm)
+frb_iw_delete(VALUE self, VALUE rfield, VALUE rterm)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
-    iw_delete_term(iw, frt_field(rfield), StringValuePtr(rterm));
+    if (TYPE(rterm) == T_ARRAY) {
+        const int term_cnt = RARRAY_LEN(rterm);
+        int i;
+        char **terms = ALLOC_N(char *, term_cnt);
+        for (i = 0; i < term_cnt; i++) {
+            terms[i] = StringValuePtr(RARRAY_PTR(rterm)[i]);
+        }
+        iw_delete_terms(iw, frb_field(rfield), terms, term_cnt);
+        free(terms);
+    } else {
+        iw_delete_term(iw, frb_field(rfield), StringValuePtr(rterm));
+    }
     return self;
 }
 
@@ -1634,10 +1636,10 @@ frt_iw_delete(VALUE self, VALUE rfield, VALUE rterm)
  *  to dynamically add new fields to the index with specific properties.
  */
 static VALUE
-frt_iw_field_infos(VALUE self)
+frb_iw_field_infos(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
-    return frt_get_field_infos(iw->fis);
+    return frb_get_field_infos(iw->fis);
 }
 
 /*
@@ -1648,10 +1650,10 @@ frt_iw_field_infos(VALUE self)
  *  to use the same analyzer in a QueryParser.
  */
 static VALUE
-frt_iw_get_analyzer(VALUE self)
+frb_iw_get_analyzer(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
-    return frt_get_analyzer(iw->analyzer);
+    return frb_get_analyzer(iw->analyzer);
 }
 
 /*
@@ -1663,12 +1665,12 @@ frt_iw_get_analyzer(VALUE self)
  *  same analyzer will be used for all documents during search.
  */
 static VALUE
-frt_iw_set_analyzer(VALUE self, VALUE ranalyzer)
+frb_iw_set_analyzer(VALUE self, VALUE ranalyzer)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
 
     a_deref(iw->analyzer);
-    iw->analyzer = frt_get_cwrapped_analyzer(ranalyzer);
+    iw->analyzer = frb_get_cwrapped_analyzer(ranalyzer);
     return ranalyzer;
 }
 
@@ -1679,7 +1681,7 @@ frt_iw_set_analyzer(VALUE self, VALUE ranalyzer)
  *  Returns the current version of the index writer.
  */
 static VALUE
-frt_iw_version(VALUE self)
+frb_iw_version(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return ULL2NUM(iw->sis->version);
@@ -1692,7 +1694,7 @@ frt_iw_version(VALUE self)
  *  Return the current value of chunk_size
  */
 static VALUE
-frt_iw_get_chunk_size(VALUE self)
+frb_iw_get_chunk_size(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.chunk_size);
@@ -1705,7 +1707,7 @@ frt_iw_get_chunk_size(VALUE self)
  *  Set the chunk_size parameter
  */
 static VALUE
-frt_iw_set_chunk_size(VALUE self, VALUE rval)
+frb_iw_set_chunk_size(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.chunk_size = FIX2INT(rval);
@@ -1719,7 +1721,7 @@ frt_iw_set_chunk_size(VALUE self, VALUE rval)
  *  Return the current value of max_buffer_memory
  */
 static VALUE
-frt_iw_get_max_buffer_memory(VALUE self)
+frb_iw_get_max_buffer_memory(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.max_buffer_memory);
@@ -1732,7 +1734,7 @@ frt_iw_get_max_buffer_memory(VALUE self)
  *  Set the max_buffer_memory parameter
  */
 static VALUE
-frt_iw_set_max_buffer_memory(VALUE self, VALUE rval)
+frb_iw_set_max_buffer_memory(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.max_buffer_memory = FIX2INT(rval);
@@ -1746,7 +1748,7 @@ frt_iw_set_max_buffer_memory(VALUE self, VALUE rval)
  *  Return the current value of term_index_interval
  */
 static VALUE
-frt_iw_get_index_interval(VALUE self)
+frb_iw_get_index_interval(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.index_interval);
@@ -1759,7 +1761,7 @@ frt_iw_get_index_interval(VALUE self)
  *  Set the term_index_interval parameter
  */
 static VALUE
-frt_iw_set_index_interval(VALUE self, VALUE rval)
+frb_iw_set_index_interval(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.index_interval = FIX2INT(rval);
@@ -1773,7 +1775,7 @@ frt_iw_set_index_interval(VALUE self, VALUE rval)
  *  Return the current value of doc_skip_interval
  */
 static VALUE
-frt_iw_get_skip_interval(VALUE self)
+frb_iw_get_skip_interval(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.skip_interval);
@@ -1786,7 +1788,7 @@ frt_iw_get_skip_interval(VALUE self)
  *  Set the doc_skip_interval parameter
  */
 static VALUE
-frt_iw_set_skip_interval(VALUE self, VALUE rval)
+frb_iw_set_skip_interval(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.skip_interval = FIX2INT(rval);
@@ -1800,7 +1802,7 @@ frt_iw_set_skip_interval(VALUE self, VALUE rval)
  *  Return the current value of merge_factor
  */
 static VALUE
-frt_iw_get_merge_factor(VALUE self)
+frb_iw_get_merge_factor(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.merge_factor);
@@ -1813,7 +1815,7 @@ frt_iw_get_merge_factor(VALUE self)
  *  Set the merge_factor parameter
  */
 static VALUE
-frt_iw_set_merge_factor(VALUE self, VALUE rval)
+frb_iw_set_merge_factor(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.merge_factor = FIX2INT(rval);
@@ -1827,7 +1829,7 @@ frt_iw_set_merge_factor(VALUE self, VALUE rval)
  *  Return the current value of max_buffered_docs
  */
 static VALUE
-frt_iw_get_max_buffered_docs(VALUE self)
+frb_iw_get_max_buffered_docs(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.max_buffered_docs);
@@ -1840,7 +1842,7 @@ frt_iw_get_max_buffered_docs(VALUE self)
  *  Set the max_buffered_docs parameter
  */
 static VALUE
-frt_iw_set_max_buffered_docs(VALUE self, VALUE rval)
+frb_iw_set_max_buffered_docs(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.max_buffered_docs = FIX2INT(rval);
@@ -1854,7 +1856,7 @@ frt_iw_set_max_buffered_docs(VALUE self, VALUE rval)
  *  Return the current value of max_merge_docs
  */
 static VALUE
-frt_iw_get_max_merge_docs(VALUE self)
+frb_iw_get_max_merge_docs(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.max_merge_docs);
@@ -1867,7 +1869,7 @@ frt_iw_get_max_merge_docs(VALUE self)
  *  Set the max_merge_docs parameter
  */
 static VALUE
-frt_iw_set_max_merge_docs(VALUE self, VALUE rval)
+frb_iw_set_max_merge_docs(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.max_merge_docs = FIX2INT(rval);
@@ -1881,7 +1883,7 @@ frt_iw_set_max_merge_docs(VALUE self, VALUE rval)
  *  Return the current value of max_field_length
  */
 static VALUE
-frt_iw_get_max_field_length(VALUE self)
+frb_iw_get_max_field_length(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.max_field_length);
@@ -1894,7 +1896,7 @@ frt_iw_get_max_field_length(VALUE self)
  *  Set the max_field_length parameter
  */
 static VALUE
-frt_iw_set_max_field_length(VALUE self, VALUE rval)
+frb_iw_set_max_field_length(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.max_field_length = FIX2INT(rval);
@@ -1908,7 +1910,7 @@ frt_iw_set_max_field_length(VALUE self, VALUE rval)
  *  Return the current value of use_compound_file
  */
 static VALUE
-frt_iw_get_use_compound_file(VALUE self)
+frb_iw_get_use_compound_file(VALUE self)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     return iw->config.use_compound_file ? Qtrue : Qfalse;
@@ -1921,7 +1923,7 @@ frt_iw_get_use_compound_file(VALUE self)
  *  Set the use_compound_file parameter
  */
 static VALUE
-frt_iw_set_use_compound_file(VALUE self, VALUE rval)
+frb_iw_set_use_compound_file(VALUE self, VALUE rval)
 {
     IndexWriter *iw = (IndexWriter *)DATA_PTR(self);
     iw->config.use_compound_file = RTEST(rval);
@@ -1935,13 +1937,13 @@ frt_iw_set_use_compound_file(VALUE self, VALUE rval)
  ****************************************************************************/
 
 static void
-frt_lzd_date_free(void *p)
+frb_lzd_date_free(void *p)
 {
     lazy_doc_close((LazyDoc *)p);
 }
 
 static VALUE
-frt_lazy_df_load(VALUE self, VALUE rkey, LazyDocField *lazy_df)
+frb_lazy_df_load(VALUE self, VALUE rkey, LazyDocField *lazy_df)
 {
     VALUE rdata = Qnil;
     if (lazy_df) {
@@ -1953,9 +1955,7 @@ frt_lazy_df_load(VALUE self, VALUE rkey, LazyDocField *lazy_df)
             rdata = rb_ary_new2(lazy_df->size);
             for (i = 0; i < lazy_df->size; i++) {
                 char *data = lazy_df_get_data(lazy_df, i);
-                RARRAY(rdata)->ptr[i] =
-                    rb_str_new(data, lazy_df->data[i].length);
-                RARRAY(rdata)->len++;
+                rb_ary_store(rdata, i, rb_str_new(data, lazy_df->data[i].length));
             }
         }
         rb_hash_aset(self, rkey, rdata);
@@ -1971,25 +1971,13 @@ frt_lazy_df_load(VALUE self, VALUE rkey, LazyDocField *lazy_df)
  *  really need to call it yourself.
  */
 static VALUE
-frt_lzd_default(VALUE self, VALUE rkey)
+frb_lzd_default(VALUE self, VALUE rkey)
 {
     LazyDoc *lazy_doc = (LazyDoc *)DATA_PTR(rb_ivar_get(self, id_data));
-    char *field = NULL;
-    switch (TYPE(rkey)) {
-        case T_STRING:
-            field = rs2s(rkey);
-            rkey = ID2SYM(rb_intern(field));
-            break;
-        case T_SYMBOL:
-            field = frt_field(rkey);
-            break;
-        default:
-            rb_raise(rb_eArgError,
-                     "%s cannot be a key to a field. Field keys must "
-                     " be symbols.", rs2s(rb_obj_as_string(rkey)));
-            break;
-    }
-    return frt_lazy_df_load(self, rkey, h_get(lazy_doc->field_dict, field));
+    Symbol field = frb_field(rkey);
+    VALUE rfield = FSYM2SYM(field);
+
+    return frb_lazy_df_load(self, rfield, lazy_doc_get(lazy_doc, field));
 }
 
 /*
@@ -2001,7 +1989,7 @@ frt_lzd_default(VALUE self, VALUE rkey)
  *  Try to access any other field an nil will be returned.
  */
 static VALUE
-frt_lzd_fields(VALUE self)
+frb_lzd_fields(VALUE self)
 {
     return rb_ivar_get(self, id_fields);
 }
@@ -2013,19 +2001,19 @@ frt_lzd_fields(VALUE self)
  *  Load all unloaded fields in the document from the index.
  */
 static VALUE
-frt_lzd_load(VALUE self)
+frb_lzd_load(VALUE self)
 {
     LazyDoc *lazy_doc = (LazyDoc *)DATA_PTR(rb_ivar_get(self, id_data));
     int i;
     for (i = 0; i < lazy_doc->size; i++) {
         LazyDocField *lazy_df = lazy_doc->fields[i];
-        frt_lazy_df_load(self, ID2SYM(rb_intern(lazy_df->name)), lazy_df);
+        frb_lazy_df_load(self, FSYM2SYM(lazy_df->name), lazy_df);
     }
     return self;
 }
 
 VALUE
-frt_get_lazy_doc(LazyDoc *lazy_doc)
+frb_get_lazy_doc(LazyDoc *lazy_doc)
 {
     int i;
     VALUE rfields = rb_ary_new2(lazy_doc->size);
@@ -2034,12 +2022,11 @@ frt_get_lazy_doc(LazyDoc *lazy_doc)
     self = rb_hash_new();
     OBJSETUP(self, cLazyDoc, T_HASH);
 
-    rdata = Data_Wrap_Struct(cLazyDocData, NULL, &frt_lzd_date_free, lazy_doc);
+    rdata = Data_Wrap_Struct(cLazyDocData, NULL, &frb_lzd_date_free, lazy_doc);
     rb_ivar_set(self, id_data, rdata);
 
     for (i = 0; i < lazy_doc->size; i++) {
-        RARRAY(rfields)->ptr[i] = ID2SYM(rb_intern(lazy_doc->fields[i]->name));
-        RARRAY(rfields)->len++;
+      rb_ary_store(rfields, i, FSYM2SYM(lazy_doc->fields[i]->name));
     }
     rb_ivar_set(self, id_fields, rfields);
 
@@ -2053,28 +2040,28 @@ frt_get_lazy_doc(LazyDoc *lazy_doc)
  ****************************************************************************/
 
 void
-frt_ir_free(void *p)
+frb_ir_free(void *p)
 {
     object_del(p);
     ir_close((IndexReader *)p);
 }
 
 void
-frt_ir_mark(void *p)
+frb_ir_mark(void *p)
 {
     IndexReader *ir = (IndexReader *)p;
-    frt_gc_mark(ir->store);
+    frb_gc_mark(ir->store);
 }
 
-static VALUE frt_ir_close(VALUE self);
+static VALUE frb_ir_close(VALUE self);
 
 void
-frt_mr_mark(void *p)
+frb_mr_mark(void *p)
 {
     MultiReader *mr = (MultiReader *)p;
     int i;
     for (i = 0; i < mr->r_cnt; i++) {
-        frt_gc_mark(mr->sub_readers[i]);
+        frb_gc_mark(mr->sub_readers[i]);
     }
 }
 
@@ -2105,7 +2092,7 @@ frt_mr_mark(void *p)
  *    iw = IndexReader.new(["/path/to/index1", "/path/to/index2"])
  */
 static VALUE
-frt_ir_init(VALUE self, VALUE rdir)
+frb_ir_init(VALUE self, VALUE rdir)
 {
     Store *store = NULL;
     IndexReader *ir;
@@ -2115,11 +2102,11 @@ frt_ir_init(VALUE self, VALUE rdir)
 
     if (TYPE(rdir) == T_ARRAY) {
         VALUE rdirs = rdir;
-        const int reader_cnt = RARRAY(rdir)->len;
+        const int reader_cnt = RARRAY_LEN(rdir);
         IndexReader **sub_readers = ALLOC_N(IndexReader *, reader_cnt);
         int i;
         for (i = 0; i < reader_cnt; i++) {
-            rdir = RARRAY(rdirs)->ptr[i];
+            rdir = RARRAY_PTR(rdirs)[i];
             switch (TYPE(rdir)) {
                 case T_DATA:
                     if (CLASS_OF(rdir) == cIndexReader) {
@@ -2137,7 +2124,7 @@ frt_ir_init(VALUE self, VALUE rdir)
                     }
                     break;
                 case T_STRING:
-                    frt_create_dir(rdir);
+                    frb_create_dir(rdir);
                     store = open_fs_store(rs2s(rdir));
                     DEREF(store);
                     break;
@@ -2151,14 +2138,14 @@ frt_ir_init(VALUE self, VALUE rdir)
             sub_readers[i] = ir_open(store);
         }
         ir = mr_open(sub_readers, reader_cnt);
-        Frt_Wrap_Struct(self, &frt_mr_mark, &frt_ir_free, ir);
+        Frt_Wrap_Struct(self, &frb_mr_mark, &frb_ir_free, ir);
     } else {
         switch (TYPE(rdir)) {
             case T_DATA:
                 store = DATA_PTR(rdir);
                 break;
             case T_STRING:
-                frt_create_dir(rdir);
+                frb_create_dir(rdir);
                 store = open_fs_store(rs2s(rdir));
                 DEREF(store);
                 break;
@@ -2169,7 +2156,7 @@ frt_ir_init(VALUE self, VALUE rdir)
                 break;
         }
         ir = ir_open(store);
-        Frt_Wrap_Struct(self, &frt_ir_mark, &frt_ir_free, ir);
+        Frt_Wrap_Struct(self, &frb_ir_mark, &frb_ir_free, ir);
     }
     object_add(ir, self);
 
@@ -2177,7 +2164,7 @@ frt_ir_init(VALUE self, VALUE rdir)
     for (i = 0; i < fis->size; i++) {
         FieldInfo *fi = fis->fields[i];
         rb_hash_aset(rfield_num_map,
-                     ID2SYM(rb_intern(fi->name)),
+                     FSYM2SYM(fi->name),
                      INT2FIX(fi->number));
     }
     rb_ivar_set(self, id_fld_num_map, rfield_num_map);
@@ -2194,10 +2181,10 @@ frt_ir_init(VALUE self, VALUE rdir)
  *  encoded float value.
  */
 static VALUE
-frt_ir_set_norm(VALUE self, VALUE rdoc_id, VALUE rfield, VALUE rval)
+frb_ir_set_norm(VALUE self, VALUE rdoc_id, VALUE rfield, VALUE rval)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    ir_set_norm(ir, FIX2INT(rdoc_id), frt_field(rfield), (uchar)NUM2CHR(rval));
+    ir_set_norm(ir, FIX2INT(rdoc_id), frb_field(rfield), (uchar)NUM2CHR(rval));
     return self;
 }
 
@@ -2210,11 +2197,11 @@ frt_ir_set_norm(VALUE self, VALUE rdoc_id, VALUE rfield, VALUE rval)
  *  could have null bytes.
  */
 static VALUE
-frt_ir_norms(VALUE self, VALUE rfield)
+frb_ir_norms(VALUE self, VALUE rfield)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     uchar *norms;
-    norms = ir_get_norms(ir, frt_field(rfield));
+    norms = ir_get_norms(ir, frb_field(rfield));
     if (norms) {
         return rb_str_new((char *)norms, ir->max_doc(ir));
     } else {
@@ -2229,20 +2216,20 @@ frt_ir_norms(VALUE self, VALUE rfield)
  *  Expert: Get the norm values into a string +buffer+ starting at +offset+.
  */
 static VALUE
-frt_ir_get_norms_into(VALUE self, VALUE rfield, VALUE rnorms, VALUE roffset)
+frb_ir_get_norms_into(VALUE self, VALUE rfield, VALUE rnorms, VALUE roffset)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     int offset;
     offset = FIX2INT(roffset);
     Check_Type(rnorms, T_STRING);
-    if (RSTRING(rnorms)->len < offset + ir->max_doc(ir)) {
-        rb_raise(rb_eArgError, "supplied a string of length:%d to "
+    if (RSTRING_LEN(rnorms) < offset + ir->max_doc(ir)) {
+        rb_raise(rb_eArgError, "supplied a string of length:%ld to "
                  "IndexReader#get_norms_into but needed a string of length "
                  "offset:%d + maxdoc:%d",
-                 RSTRING(rnorms)->len, offset, ir->max_doc(ir));
+                 RSTRING_LEN(rnorms), offset, ir->max_doc(ir));
     }
 
-    ir_get_norms_into(ir, frt_field(rfield),
+    ir_get_norms_into(ir, frb_field(rfield),
                       (uchar *)rs2s(rnorms) + offset);
     return rnorms;
 }
@@ -2255,7 +2242,7 @@ frt_ir_get_norms_into(VALUE self, VALUE rfield, VALUE rnorms, VALUE roffset)
  *  will use open a Commit lock.
  */
 static VALUE
-frt_ir_commit(VALUE self)
+frb_ir_commit(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     ir_commit(ir);
@@ -2273,7 +2260,7 @@ frt_ir_commit(VALUE self)
  *  errors.
  */
 static VALUE
-frt_ir_close(VALUE self)
+frb_ir_close(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     object_del(ir);
@@ -2290,7 +2277,7 @@ frt_ir_close(VALUE self)
  *  IndexReader or committed by any other IndexReader.
  */
 static VALUE
-frt_ir_has_deletions(VALUE self)
+frb_ir_has_deletions(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     return ir->has_deletions(ir) ? Qtrue : Qfalse;
@@ -2305,7 +2292,7 @@ frt_ir_has_deletions(VALUE self)
  *  returned by search methods.
  */
 static VALUE
-frt_ir_delete(VALUE self, VALUE rdoc_id)
+frb_ir_delete(VALUE self, VALUE rdoc_id)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     ir_delete_doc(ir, FIX2INT(rdoc_id));
@@ -2319,7 +2306,7 @@ frt_ir_delete(VALUE self, VALUE rdoc_id)
  *  Returns true if the document at +doc_id+ has been deleted.
  */
 static VALUE
-frt_ir_is_deleted(VALUE self, VALUE rdoc_id)
+frb_ir_is_deleted(VALUE self, VALUE rdoc_id)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     return ir->is_deleted(ir, FIX2INT(rdoc_id)) ? Qtrue : Qfalse;
@@ -2335,7 +2322,7 @@ frt_ir_is_deleted(VALUE self, VALUE rdoc_id)
  *  in the index.
  */
 static VALUE
-frt_ir_max_doc(VALUE self)
+frb_ir_max_doc(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     return INT2FIX(ir->max_doc(ir));
@@ -2350,7 +2337,7 @@ frt_ir_max_doc(VALUE self)
  *  deleted from the index.
  */
 static VALUE
-frt_ir_num_docs(VALUE self)
+frb_ir_num_docs(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     return INT2FIX(ir->num_docs(ir));
@@ -2366,7 +2353,7 @@ frt_ir_num_docs(VALUE self)
  *  effect on these documents.
  */
 static VALUE
-frt_ir_undelete_all(VALUE self)
+frb_ir_undelete_all(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     ir_undelete_all(ir);
@@ -2374,7 +2361,7 @@ frt_ir_undelete_all(VALUE self)
 }
 
 static VALUE
-frt_get_doc_range(IndexReader *ir, int pos, int len, int max)
+frb_get_doc_range(IndexReader *ir, int pos, int len, int max)
 {
     VALUE ary;
     int i;
@@ -2382,8 +2369,7 @@ frt_get_doc_range(IndexReader *ir, int pos, int len, int max)
     len = max - pos;
     ary = rb_ary_new2(len);
     for (i = 0; i < len; i++) {
-        RARRAY(ary)->ptr[i] = frt_get_lazy_doc(ir->get_lazy_doc(ir, i + pos));
-        RARRAY(ary)->len++;
+      rb_ary_store(ary, i, frb_get_lazy_doc(ir->get_lazy_doc(ir, i + pos)));
     }
     return ary;
 }
@@ -2398,7 +2384,7 @@ frt_get_doc_range(IndexReader *ir, int pos, int len, int max)
  *  which are returned by the Searchers search methods.
  */
 static VALUE
-frt_ir_get_doc(int argc, VALUE *argv, VALUE self)
+frb_ir_get_doc(int argc, VALUE *argv, VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     VALUE arg1, arg2;
@@ -2410,29 +2396,29 @@ frt_ir_get_doc(int argc, VALUE *argv, VALUE self)
             pos = FIX2INT(arg1);
             pos = (pos < 0) ? (max + pos) : pos;
             if (pos < 0 || pos >= max) {
-                rb_raise(rb_eArgError, ":%d is out of range [%d..%d] for "
-                         "IndexReader#[]", pos, 0, max,
-                         rb_id2name(SYM2ID(argv)));
+                rb_raise(rb_eArgError, "index %ld is out of range [%d..%ld] for "
+                         "IndexReader#[]", pos, 0, max);
             }
-            return frt_get_lazy_doc(ir->get_lazy_doc(ir, pos));
+            return frb_get_lazy_doc(ir->get_lazy_doc(ir, pos));
         }
 
         /* check if idx is Range */
+        /* FIXME: test this with dodgy values */
         switch (rb_range_beg_len(arg1, &pos, &len, max, 0)) {
             case Qfalse:
                 rb_raise(rb_eArgError, ":%s isn't a valid argument for "
                          "IndexReader.get_document(index)",
-                         rb_id2name(SYM2ID(argv)));
+                         rb_id2name(SYM2ID(arg1)));
             case Qnil:
                 return Qnil;
             default:
-                return frt_get_doc_range(ir, pos, len, max);
+                return frb_get_doc_range(ir, pos, len, max);
         }
     }
     else {
         pos = FIX2LONG(arg1);
         len = FIX2LONG(arg2);
-        return frt_get_doc_range(ir, pos, len, max);
+        return frb_get_doc_range(ir, pos, len, max);
     }
 }
 
@@ -2445,7 +2431,7 @@ frt_ir_get_doc(int argc, VALUE *argv, VALUE self)
  *  index to search the latest documents added to the index.
  */
 static VALUE
-frt_ir_is_latest(VALUE self)
+frb_ir_is_latest(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     return ir_is_latest(ir) ? Qtrue : Qfalse;
@@ -2456,17 +2442,17 @@ frt_ir_is_latest(VALUE self)
  *     index_reader.term_vector(doc_id, field) -> TermVector
  *
  *  Return the TermVector for the field +field+ in the document at +doc_id+ in
- *  the index. Return nil of no such term_vector exists. See TermVector.
+ *  the index. Return nil if no such term_vector exists. See TermVector.
  */
 static VALUE
-frt_ir_term_vector(VALUE self, VALUE rdoc_id, VALUE rfield)
+frb_ir_term_vector(VALUE self, VALUE rdoc_id, VALUE rfield)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     TermVector *tv;
     VALUE rtv;
-    tv = ir->term_vector(ir, FIX2INT(rdoc_id), frt_field(rfield));
+    tv = ir->term_vector(ir, FIX2INT(rdoc_id), frb_field(rfield));
     if (tv) {
-        rtv = frt_get_tv(tv);
+        rtv = frb_get_tv(tv);
         tv_destroy(tv);
         return rtv;
     }
@@ -2476,9 +2462,9 @@ frt_ir_term_vector(VALUE self, VALUE rdoc_id, VALUE rfield)
 }
 
 static void
-frt_add_each_tv(void *key, void *value, void *rtvs)
+frb_add_each_tv(void *key, void *value, void *rtvs)
 {
-    rb_hash_aset((VALUE)rtvs, ID2SYM(rb_intern(key)), frt_get_tv(value));
+    rb_hash_aset((VALUE)rtvs, ID2SYM((ID)key), frb_get_tv(value));
 }
 
 /*
@@ -2490,12 +2476,12 @@ frt_add_each_tv(void *key, void *value, void *rtvs)
  *  and they are referenced by field names (as symbols).
  */
 static VALUE
-frt_ir_term_vectors(VALUE self, VALUE rdoc_id)
+frb_ir_term_vectors(VALUE self, VALUE rdoc_id)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    HashTable *tvs = ir->term_vectors(ir, FIX2INT(rdoc_id));
+    Hash *tvs = ir->term_vectors(ir, FIX2INT(rdoc_id));
     VALUE rtvs = rb_hash_new();
-    h_each(tvs, &frt_add_each_tv, (void *)rtvs);
+    h_each(tvs, &frb_add_each_tv, (void *)rtvs);
     h_destroy(tvs);
 
     return rtvs;
@@ -2510,10 +2496,10 @@ frt_ir_term_vectors(VALUE self, VALUE rdoc_id)
  *  See TermDocEnum for more info.
  */
 static VALUE
-frt_ir_term_docs(VALUE self)
+frb_ir_term_docs(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    return frt_get_tde(self, ir->term_docs(ir));
+    return frb_get_tde(self, ir->term_docs(ir));
 }
 
 /*
@@ -2524,11 +2510,11 @@ frt_ir_term_docs(VALUE self)
  *  term +term+ in the field +field+. See TermDocEnum for more info.
  */
 static VALUE
-frt_ir_term_docs_for(VALUE self, VALUE rfield, VALUE rterm)
+frb_ir_term_docs_for(VALUE self, VALUE rfield, VALUE rterm)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    return frt_get_tde(self, ir_term_docs_for(ir,
-                                              frt_field(rfield),
+    return frb_get_tde(self, ir_term_docs_for(ir,
+                                              frb_field(rfield),
                                               StringValuePtr(rterm)));
 }
 
@@ -2541,10 +2527,10 @@ frt_ir_term_docs_for(VALUE self, VALUE rfield, VALUE rterm)
  *  more info.
  */
 static VALUE
-frt_ir_term_positions(VALUE self)
+frb_ir_term_positions(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    return frt_get_tde(self, ir->term_positions(ir));
+    return frb_get_tde(self, ir->term_positions(ir));
 }
 
 /*
@@ -2556,11 +2542,11 @@ frt_ir_term_positions(VALUE self)
  *  TermDocEnum for more info.
  */
 static VALUE
-frt_ir_t_pos_for(VALUE self, VALUE rfield, VALUE rterm)
+frb_ir_t_pos_for(VALUE self, VALUE rfield, VALUE rterm)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    return frt_get_tde(self, ir_term_positions_for(ir,
-                                                   frt_field(rfield),
+    return frb_get_tde(self, ir_term_positions_for(ir,
+                                                   frb_field(rfield),
                                                    StringValuePtr(rterm)));
 }
 
@@ -2572,11 +2558,11 @@ frt_ir_t_pos_for(VALUE self, VALUE rfield, VALUE rterm)
  *  field +field+.
  */
 static VALUE
-frt_ir_doc_freq(VALUE self, VALUE rfield, VALUE rterm)
+frb_ir_doc_freq(VALUE self, VALUE rfield, VALUE rterm)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     return INT2FIX(ir_doc_freq(ir,
-                               frt_field(rfield),
+                               frb_field(rfield),
                                StringValuePtr(rterm)));
 }
 
@@ -2588,10 +2574,10 @@ frt_ir_doc_freq(VALUE self, VALUE rfield, VALUE rterm)
  *  terms in the field +field+ in the index.
  */
 static VALUE
-frt_ir_terms(VALUE self, VALUE rfield)
+frb_ir_terms(VALUE self, VALUE rfield)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    return frt_get_te(self, ir_terms(ir, frt_field(rfield)));
+    return frb_get_te(self, ir_terms(ir, frb_field(rfield)));
 }
 
 /*
@@ -2602,11 +2588,11 @@ frt_ir_terms(VALUE self, VALUE rfield)
  *  at term +term+.
  */
 static VALUE
-frt_ir_terms_from(VALUE self, VALUE rfield, VALUE rterm)
+frb_ir_terms_from(VALUE self, VALUE rfield, VALUE rterm)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    return frt_get_te(self, ir_terms_from(ir,
-                                          frt_field(rfield),
+    return frb_get_te(self, ir_terms_from(ir,
+                                          frb_field(rfield),
                                           StringValuePtr(rterm)));
 }
 
@@ -2617,10 +2603,10 @@ frt_ir_terms_from(VALUE self, VALUE rfield, VALUE rterm)
  *  Same return a count of the number of terms in the field
  */
 static VALUE
-frt_ir_term_count(VALUE self, VALUE rfield)
+frb_ir_term_count(VALUE self, VALUE rfield)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    TermEnum *te = ir_terms(ir, frt_field(rfield));
+    TermEnum *te = ir_terms(ir, frb_field(rfield));
     int count = 0;
     while (te->next(te)) {
         count++;
@@ -2639,14 +2625,14 @@ frt_ir_term_count(VALUE self, VALUE rfield)
  *  gathered from the FieldInfos object.
  */
 static VALUE
-frt_ir_fields(VALUE self)
+frb_ir_fields(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     FieldInfos *fis = ir->fis;
     VALUE rfield_names = rb_ary_new();
     int i;
     for (i = 0; i < fis->size; i++) {
-        rb_ary_push(rfield_names, ID2SYM(rb_intern(fis->fields[i]->name)));
+        rb_ary_push(rfield_names, FSYM2SYM(fis->fields[i]->name));
     }
     return rfield_names;
 }
@@ -2658,10 +2644,10 @@ frt_ir_fields(VALUE self)
  *  Get the FieldInfos object for this IndexReader.
  */
 static VALUE
-frt_ir_field_infos(VALUE self)
+frb_ir_field_infos(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
-    return frt_get_field_infos(ir->fis);
+    return frb_get_field_infos(ir->fis);
 }
 
 /*
@@ -2674,7 +2660,7 @@ frt_ir_field_infos(VALUE self)
  *  of field names can also be gathered from the FieldInfos object.
  */
 static VALUE
-frt_ir_tk_fields(VALUE self)
+frb_ir_tk_fields(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     FieldInfos *fis = ir->fis;
@@ -2682,7 +2668,7 @@ frt_ir_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, ID2SYM(rb_intern(fis->fields[i]->name)));
+        rb_ary_push(rfield_names, FSYM2SYM(fis->fields[i]->name));
     }
     return rfield_names;
 }
@@ -2694,7 +2680,7 @@ frt_ir_tk_fields(VALUE self)
  *  Returns the current version of the index reader.
  */
 static VALUE
-frt_ir_version(VALUE self)
+frb_ir_version(VALUE self)
 {
     IndexReader *ir = (IndexReader *)DATA_PTR(self);
     return ULL2NUM(ir->sis->version);
@@ -2850,24 +2836,24 @@ Init_FieldInfo(void)
     sym_with_positions_offsets = ID2SYM(rb_intern("with_positions_offsets"));
 
     cFieldInfo = rb_define_class_under(mIndex, "FieldInfo", rb_cObject);
-    rb_define_alloc_func(cFieldInfo, frt_data_alloc);
-
-    rb_define_method(cFieldInfo, "initialize",  frt_fi_init, -1);
-    rb_define_method(cFieldInfo, "name",        frt_fi_name, 0);
-    rb_define_method(cFieldInfo, "stored?",     frt_fi_is_stored, 0);
-    rb_define_method(cFieldInfo, "compressed?", frt_fi_is_compressed, 0);
-    rb_define_method(cFieldInfo, "indexed?",    frt_fi_is_indexed, 0);
-    rb_define_method(cFieldInfo, "tokenized?",  frt_fi_is_tokenized, 0);
-    rb_define_method(cFieldInfo, "omit_norms?", frt_fi_omit_norms, 0);
+    rb_define_alloc_func(cFieldInfo, frb_data_alloc);
+
+    rb_define_method(cFieldInfo, "initialize",  frb_fi_init, -1);
+    rb_define_method(cFieldInfo, "name",        frb_fi_name, 0);
+    rb_define_method(cFieldInfo, "stored?",     frb_fi_is_stored, 0);
+    rb_define_method(cFieldInfo, "compressed?", frb_fi_is_compressed, 0);
+    rb_define_method(cFieldInfo, "indexed?",    frb_fi_is_indexed, 0);
+    rb_define_method(cFieldInfo, "tokenized?",  frb_fi_is_tokenized, 0);
+    rb_define_method(cFieldInfo, "omit_norms?", frb_fi_omit_norms, 0);
     rb_define_method(cFieldInfo, "store_term_vector?",
-                                                frt_fi_store_term_vector, 0);
+                                                frb_fi_store_term_vector, 0);
     rb_define_method(cFieldInfo, "store_positions?",
-                                                frt_fi_store_positions, 0);
+                                                frb_fi_store_positions, 0);
     rb_define_method(cFieldInfo, "store_offsets?",
-                                                frt_fi_store_offsets, 0);
-    rb_define_method(cFieldInfo, "has_norms?",  frt_fi_has_norms, 0);
-    rb_define_method(cFieldInfo, "boost",       frt_fi_boost, 0);
-    rb_define_method(cFieldInfo, "to_s",        frt_fi_to_s, 0);
+                                                frb_fi_store_offsets, 0);
+    rb_define_method(cFieldInfo, "has_norms?",  frb_fi_has_norms, 0);
+    rb_define_method(cFieldInfo, "boost",       frb_fi_boost, 0);
+    rb_define_method(cFieldInfo, "to_s",        frb_fi_to_s, 0);
 }
 
 /*
@@ -2916,21 +2902,21 @@ Init_FieldInfos(void)
     Init_FieldInfo();
 
     cFieldInfos = rb_define_class_under(mIndex, "FieldInfos", rb_cObject);
-    rb_define_alloc_func(cFieldInfos, frt_data_alloc);
-
-    rb_define_method(cFieldInfos, "initialize", frt_fis_init, -1);
-    rb_define_method(cFieldInfos, "to_a",       frt_fis_to_a, 0);
-    rb_define_method(cFieldInfos, "[]",         frt_fis_get, 1);
-    rb_define_method(cFieldInfos, "add",        frt_fis_add, 1);
-    rb_define_method(cFieldInfos, "<<",         frt_fis_add, 1);
-    rb_define_method(cFieldInfos, "add_field",  frt_fis_add_field, -1);
-    rb_define_method(cFieldInfos, "each",       frt_fis_each, 0);
-    rb_define_method(cFieldInfos, "to_s",       frt_fis_to_s, 0);
-    rb_define_method(cFieldInfos, "size",       frt_fis_size, 0);
+    rb_define_alloc_func(cFieldInfos, frb_data_alloc);
+
+    rb_define_method(cFieldInfos, "initialize", frb_fis_init, -1);
+    rb_define_method(cFieldInfos, "to_a",       frb_fis_to_a, 0);
+    rb_define_method(cFieldInfos, "[]",         frb_fis_get, 1);
+    rb_define_method(cFieldInfos, "add",        frb_fis_add, 1);
+    rb_define_method(cFieldInfos, "<<",         frb_fis_add, 1);
+    rb_define_method(cFieldInfos, "add_field",  frb_fis_add_field, -1);
+    rb_define_method(cFieldInfos, "each",       frb_fis_each, 0);
+    rb_define_method(cFieldInfos, "to_s",       frb_fis_to_s, 0);
+    rb_define_method(cFieldInfos, "size",       frb_fis_size, 0);
     rb_define_method(cFieldInfos, "create_index",
-                                                frt_fis_create_index, 1);
-    rb_define_method(cFieldInfos, "fields",     frt_fis_get_fields, 0);
-    rb_define_method(cFieldInfos, "tokenized_fields", frt_fis_get_tk_fields, 0);
+                                                frb_fis_create_index, 1);
+    rb_define_method(cFieldInfos, "fields",     frb_fis_get_fields, 0);
+    rb_define_method(cFieldInfos, "tokenized_fields", frb_fis_get_tk_fields, 0);
 }
 
 /*
@@ -2960,16 +2946,16 @@ Init_TermEnum(void)
     id_term = rb_intern("@term");
 
     cTermEnum = rb_define_class_under(mIndex, "TermEnum", rb_cObject);
-    rb_define_alloc_func(cTermEnum, frt_data_alloc);
+    rb_define_alloc_func(cTermEnum, frb_data_alloc);
 
-    rb_define_method(cTermEnum, "next?",    frt_te_next, 0);
-    rb_define_method(cTermEnum, "term",     frt_te_term, 0);
-    rb_define_method(cTermEnum, "doc_freq", frt_te_doc_freq, 0);
-    rb_define_method(cTermEnum, "skip_to",  frt_te_skip_to, 1);
-    rb_define_method(cTermEnum, "each",     frt_te_each, 0);
-    rb_define_method(cTermEnum, "field=",   frt_te_set_field, 1);
-    rb_define_method(cTermEnum, "set_field",frt_te_set_field, 1);
-    rb_define_method(cTermEnum, "to_json",  frt_te_to_json, -1);
+    rb_define_method(cTermEnum, "next?",    frb_te_next, 0);
+    rb_define_method(cTermEnum, "term",     frb_te_term, 0);
+    rb_define_method(cTermEnum, "doc_freq", frb_te_doc_freq, 0);
+    rb_define_method(cTermEnum, "skip_to",  frb_te_skip_to, 1);
+    rb_define_method(cTermEnum, "each",     frb_te_each, 0);
+    rb_define_method(cTermEnum, "field=",   frb_te_set_field, 1);
+    rb_define_method(cTermEnum, "set_field",frb_te_set_field, 1);
+    rb_define_method(cTermEnum, "to_json",  frb_te_to_json, -1);
 }
 
 /*
@@ -3011,17 +2997,17 @@ Init_TermDocEnum(void)
     id_field_num = rb_intern("@field_num");
 
     cTermDocEnum = rb_define_class_under(mIndex, "TermDocEnum", rb_cObject);
-    rb_define_alloc_func(cTermDocEnum, frt_data_alloc);
-    rb_define_method(cTermDocEnum, "seek",           frt_tde_seek, 2);
-    rb_define_method(cTermDocEnum, "seek_term_enum", frt_tde_seek_te, 1);
-    rb_define_method(cTermDocEnum, "doc",            frt_tde_doc, 0);
-    rb_define_method(cTermDocEnum, "freq",           frt_tde_freq, 0);
-    rb_define_method(cTermDocEnum, "next?",          frt_tde_next, 0);
-    rb_define_method(cTermDocEnum, "next_position",  frt_tde_next_position, 0);
-    rb_define_method(cTermDocEnum, "each",           frt_tde_each, 0);
-    rb_define_method(cTermDocEnum, "each_position",  frt_tde_each_position, 0);
-    rb_define_method(cTermDocEnum, "skip_to",        frt_tde_skip_to, 1);
-    rb_define_method(cTermDocEnum, "to_json",        frt_tde_to_json, -1);
+    rb_define_alloc_func(cTermDocEnum, frb_data_alloc);
+    rb_define_method(cTermDocEnum, "seek",           frb_tde_seek, 2);
+    rb_define_method(cTermDocEnum, "seek_term_enum", frb_tde_seek_te, 1);
+    rb_define_method(cTermDocEnum, "doc",            frb_tde_doc, 0);
+    rb_define_method(cTermDocEnum, "freq",           frb_tde_freq, 0);
+    rb_define_method(cTermDocEnum, "next?",          frb_tde_next, 0);
+    rb_define_method(cTermDocEnum, "next_position",  frb_tde_next_position, 0);
+    rb_define_method(cTermDocEnum, "each",           frb_tde_each, 0);
+    rb_define_method(cTermDocEnum, "each_position",  frb_tde_each_position, 0);
+    rb_define_method(cTermDocEnum, "skip_to",        frb_tde_skip_to, 1);
+    rb_define_method(cTermDocEnum, "to_json",        frb_tde_to_json, -1);
 }
 
 /* rdochack
@@ -3078,7 +3064,7 @@ Init_TVTerm(void)
     /* rdochack
     cTVTerm = rb_define_class_under(cTermVector, "TVTerm", rb_cObject);
     */
-    cTVTerm = rb_struct_define(tv_term_class, "text", "positions", NULL);
+    cTVTerm = rb_struct_define(tv_term_class, "text", "freq", "positions", NULL);
     rb_set_class_path(cTVTerm, cTermVector, tv_term_class);
     rb_const_set(mIndex, rb_intern(tv_term_class), cTVTerm);
 }
@@ -3097,7 +3083,7 @@ Init_TVTerm(void)
  *
  *  == Example
  *
- *    tv = index_reader.term_vector(:content)
+ *    tv = index_reader.term_vector(doc_id, :content)
  *    tv_term = tv.find {|tvt| tvt.term = "fox"}
  *
  *    # get the term frequency
@@ -3262,7 +3248,7 @@ Init_IndexWriter(void)
     sym_use_compound_file   = ID2SYM(rb_intern("use_compound_file"));
 
     cIndexWriter = rb_define_class_under(mIndex, "IndexWriter", rb_cObject);
-    rb_define_alloc_func(cIndexWriter, frt_data_alloc);
+    rb_define_alloc_func(cIndexWriter, frb_data_alloc);
 
     rb_define_const(cIndexWriter, "WRITE_LOCK_TIMEOUT", INT2FIX(1));
     rb_define_const(cIndexWriter, "COMMIT_LOCK_TIMEOUT", INT2FIX(10));
@@ -3289,64 +3275,64 @@ Init_IndexWriter(void)
     rb_define_const(cIndexWriter, "DEFAULT_USE_COMPOUND_FILE",
                     default_config.use_compound_file ? Qtrue : Qfalse);
 
-    rb_define_method(cIndexWriter, "initialize",    frt_iw_init, -1);
-    rb_define_method(cIndexWriter, "doc_count",     frt_iw_get_doc_count, 0);
-    rb_define_method(cIndexWriter, "close",         frt_iw_close, 0);
-    rb_define_method(cIndexWriter, "add_document",  frt_iw_add_doc, 1);
-    rb_define_method(cIndexWriter, "<<",            frt_iw_add_doc, 1);
-    rb_define_method(cIndexWriter, "optimize",      frt_iw_optimize, 0);
-    rb_define_method(cIndexWriter, "commit",        frt_iw_commit, 0);
-    rb_define_method(cIndexWriter, "add_readers",   frt_iw_add_readers, 1);
-    rb_define_method(cIndexWriter, "delete",        frt_iw_delete, 2);
-    rb_define_method(cIndexWriter, "field_infos",   frt_iw_field_infos, 0);
-    rb_define_method(cIndexWriter, "analyzer",      frt_iw_get_analyzer, 0);
-    rb_define_method(cIndexWriter, "analyzer=",     frt_iw_set_analyzer, 1);
-    rb_define_method(cIndexWriter, "version",       frt_iw_version, 0);
+    rb_define_method(cIndexWriter, "initialize",    frb_iw_init, -1);
+    rb_define_method(cIndexWriter, "doc_count",     frb_iw_get_doc_count, 0);
+    rb_define_method(cIndexWriter, "close",         frb_iw_close, 0);
+    rb_define_method(cIndexWriter, "add_document",  frb_iw_add_doc, 1);
+    rb_define_method(cIndexWriter, "<<",            frb_iw_add_doc, 1);
+    rb_define_method(cIndexWriter, "optimize",      frb_iw_optimize, 0);
+    rb_define_method(cIndexWriter, "commit",        frb_iw_commit, 0);
+    rb_define_method(cIndexWriter, "add_readers",   frb_iw_add_readers, 1);
+    rb_define_method(cIndexWriter, "delete",        frb_iw_delete, 2);
+    rb_define_method(cIndexWriter, "field_infos",   frb_iw_field_infos, 0);
+    rb_define_method(cIndexWriter, "analyzer",      frb_iw_get_analyzer, 0);
+    rb_define_method(cIndexWriter, "analyzer=",     frb_iw_set_analyzer, 1);
+    rb_define_method(cIndexWriter, "version",       frb_iw_version, 0);
 
     rb_define_method(cIndexWriter, "chunk_size", 
-                     frt_iw_get_chunk_size, 0);
+                     frb_iw_get_chunk_size, 0);
     rb_define_method(cIndexWriter, "chunk_size=",
-                     frt_iw_set_chunk_size, 1);
+                     frb_iw_set_chunk_size, 1);
 
     rb_define_method(cIndexWriter, "max_buffer_memory", 
-                     frt_iw_get_max_buffer_memory, 0);
+                     frb_iw_get_max_buffer_memory, 0);
     rb_define_method(cIndexWriter, "max_buffer_memory=",
-                     frt_iw_set_max_buffer_memory, 1);
+                     frb_iw_set_max_buffer_memory, 1);
 
     rb_define_method(cIndexWriter, "term_index_interval",
-                     frt_iw_get_index_interval, 0);
+                     frb_iw_get_index_interval, 0);
     rb_define_method(cIndexWriter, "term_index_interval=",
-                     frt_iw_set_index_interval, 1);
+                     frb_iw_set_index_interval, 1);
 
     rb_define_method(cIndexWriter, "doc_skip_interval",
-                     frt_iw_get_skip_interval, 0);
+                     frb_iw_get_skip_interval, 0);
     rb_define_method(cIndexWriter, "doc_skip_interval=",
-                     frt_iw_set_skip_interval, 1);
+                     frb_iw_set_skip_interval, 1);
 
     rb_define_method(cIndexWriter, "merge_factor", 
-                     frt_iw_get_merge_factor, 0);
+                     frb_iw_get_merge_factor, 0);
     rb_define_method(cIndexWriter, "merge_factor=",
-                     frt_iw_set_merge_factor, 1);
+                     frb_iw_set_merge_factor, 1);
 
     rb_define_method(cIndexWriter, "max_buffered_docs", 
-                     frt_iw_get_max_buffered_docs, 0);
+                     frb_iw_get_max_buffered_docs, 0);
     rb_define_method(cIndexWriter, "max_buffered_docs=",
-                     frt_iw_set_max_buffered_docs, 1);
+                     frb_iw_set_max_buffered_docs, 1);
 
     rb_define_method(cIndexWriter, "max_merge_docs",
-                     frt_iw_get_max_merge_docs, 0);
+                     frb_iw_get_max_merge_docs, 0);
     rb_define_method(cIndexWriter, "max_merge_docs=",
-                     frt_iw_set_max_merge_docs, 1);
+                     frb_iw_set_max_merge_docs, 1);
 
     rb_define_method(cIndexWriter, "max_field_length",
-                     frt_iw_get_max_field_length, 0);
+                     frb_iw_get_max_field_length, 0);
     rb_define_method(cIndexWriter, "max_field_length=",
-                     frt_iw_set_max_field_length, 1);
+                     frb_iw_set_max_field_length, 1);
 
     rb_define_method(cIndexWriter, "use_compound_file",
-                     frt_iw_get_use_compound_file, 0);
+                     frb_iw_get_use_compound_file, 0);
     rb_define_method(cIndexWriter, "use_compound_file=",
-                     frt_iw_set_use_compound_file, 1);
+                     frb_iw_set_use_compound_file, 1);
 
 }
 
@@ -3387,12 +3373,12 @@ Init_LazyDoc(void)
 
 
     cLazyDoc = rb_define_class_under(mIndex, "LazyDoc", rb_cHash);
-    rb_define_method(cLazyDoc, "default",   frt_lzd_default, 1);
-    rb_define_method(cLazyDoc, "load",      frt_lzd_load, 0);
-    rb_define_method(cLazyDoc, "fields",    frt_lzd_fields, 0);
+    rb_define_method(cLazyDoc, "default",   frb_lzd_default, 1);
+    rb_define_method(cLazyDoc, "load",      frb_lzd_load, 0);
+    rb_define_method(cLazyDoc, "fields",    frb_lzd_fields, 0);
 
     cLazyDocData = rb_define_class_under(cLazyDoc, "LazyDocData", rb_cObject);
-    rb_define_alloc_func(cLazyDocData, frt_data_alloc);
+    rb_define_alloc_func(cLazyDocData, frb_data_alloc);
 }
 
 /*
@@ -3409,37 +3395,37 @@ void
 Init_IndexReader(void)
 {
     cIndexReader = rb_define_class_under(mIndex, "IndexReader", rb_cObject);
-    rb_define_alloc_func(cIndexReader, frt_data_alloc);
-    rb_define_method(cIndexReader, "initialize",    frt_ir_init, 1);
-    rb_define_method(cIndexReader, "set_norm",      frt_ir_set_norm, 3);
-    rb_define_method(cIndexReader, "norms",         frt_ir_norms, 1);
-    rb_define_method(cIndexReader, "get_norms_into",frt_ir_get_norms_into, 3);
-    rb_define_method(cIndexReader, "commit",        frt_ir_commit, 0);
-    rb_define_method(cIndexReader, "close",         frt_ir_close, 0);
-    rb_define_method(cIndexReader, "has_deletions?",frt_ir_has_deletions, 0);
-    rb_define_method(cIndexReader, "delete",        frt_ir_delete, 1);
-    rb_define_method(cIndexReader, "deleted?",      frt_ir_is_deleted, 1);
-    rb_define_method(cIndexReader, "max_doc",       frt_ir_max_doc, 0);
-    rb_define_method(cIndexReader, "num_docs",      frt_ir_num_docs, 0);
-    rb_define_method(cIndexReader, "undelete_all",  frt_ir_undelete_all, 0);
-    rb_define_method(cIndexReader, "latest?",       frt_ir_is_latest, 0);
-    rb_define_method(cIndexReader, "get_document",  frt_ir_get_doc, -1);
-    rb_define_method(cIndexReader, "[]",            frt_ir_get_doc, -1);
-    rb_define_method(cIndexReader, "term_vector",   frt_ir_term_vector, 2);
-    rb_define_method(cIndexReader, "term_vectors",  frt_ir_term_vectors, 1);
-    rb_define_method(cIndexReader, "term_docs",     frt_ir_term_docs, 0);
-    rb_define_method(cIndexReader, "term_positions",frt_ir_term_positions, 0);
-    rb_define_method(cIndexReader, "term_docs_for", frt_ir_term_docs_for, 2);
-    rb_define_method(cIndexReader, "term_positions_for", frt_ir_t_pos_for, 2);
-    rb_define_method(cIndexReader, "doc_freq",      frt_ir_doc_freq, 2);
-    rb_define_method(cIndexReader, "terms",         frt_ir_terms, 1);
-    rb_define_method(cIndexReader, "terms_from",    frt_ir_terms_from, 2);
-    rb_define_method(cIndexReader, "term_count",    frt_ir_term_count, 1);
-    rb_define_method(cIndexReader, "fields",        frt_ir_fields, 0);
-    rb_define_method(cIndexReader, "field_names",   frt_ir_fields, 0);
-    rb_define_method(cIndexReader, "field_infos",   frt_ir_field_infos, 0);
-    rb_define_method(cIndexReader, "tokenized_fields", frt_ir_tk_fields, 0);
-    rb_define_method(cIndexReader, "version",       frt_ir_version, 0);
+    rb_define_alloc_func(cIndexReader, frb_data_alloc);
+    rb_define_method(cIndexReader, "initialize",    frb_ir_init, 1);
+    rb_define_method(cIndexReader, "set_norm",      frb_ir_set_norm, 3);
+    rb_define_method(cIndexReader, "norms",         frb_ir_norms, 1);
+    rb_define_method(cIndexReader, "get_norms_into",frb_ir_get_norms_into, 3);
+    rb_define_method(cIndexReader, "commit",        frb_ir_commit, 0);
+    rb_define_method(cIndexReader, "close",         frb_ir_close, 0);
+    rb_define_method(cIndexReader, "has_deletions?",frb_ir_has_deletions, 0);
+    rb_define_method(cIndexReader, "delete",        frb_ir_delete, 1);
+    rb_define_method(cIndexReader, "deleted?",      frb_ir_is_deleted, 1);
+    rb_define_method(cIndexReader, "max_doc",       frb_ir_max_doc, 0);
+    rb_define_method(cIndexReader, "num_docs",      frb_ir_num_docs, 0);
+    rb_define_method(cIndexReader, "undelete_all",  frb_ir_undelete_all, 0);
+    rb_define_method(cIndexReader, "latest?",       frb_ir_is_latest, 0);
+    rb_define_method(cIndexReader, "get_document",  frb_ir_get_doc, -1);
+    rb_define_method(cIndexReader, "[]",            frb_ir_get_doc, -1);
+    rb_define_method(cIndexReader, "term_vector",   frb_ir_term_vector, 2);
+    rb_define_method(cIndexReader, "term_vectors",  frb_ir_term_vectors, 1);
+    rb_define_method(cIndexReader, "term_docs",     frb_ir_term_docs, 0);
+    rb_define_method(cIndexReader, "term_positions",frb_ir_term_positions, 0);
+    rb_define_method(cIndexReader, "term_docs_for", frb_ir_term_docs_for, 2);
+    rb_define_method(cIndexReader, "term_positions_for", frb_ir_t_pos_for, 2);
+    rb_define_method(cIndexReader, "doc_freq",      frb_ir_doc_freq, 2);
+    rb_define_method(cIndexReader, "terms",         frb_ir_terms, 1);
+    rb_define_method(cIndexReader, "terms_from",    frb_ir_terms_from, 2);
+    rb_define_method(cIndexReader, "term_count",    frb_ir_term_count, 1);
+    rb_define_method(cIndexReader, "fields",        frb_ir_fields, 0);
+    rb_define_method(cIndexReader, "field_names",   frb_ir_fields, 0);
+    rb_define_method(cIndexReader, "field_infos",   frb_ir_field_infos, 0);
+    rb_define_method(cIndexReader, "tokenized_fields", frb_ir_tk_fields, 0);
+    rb_define_method(cIndexReader, "version",       frb_ir_version, 0);
 }
 
 /* rdoc hack
@@ -3472,6 +3458,7 @@ Init_Index(void)
     sym_boost     = ID2SYM(rb_intern("boost"));
     sym_analyzer  = ID2SYM(rb_intern("analyzer"));
     sym_close_dir = ID2SYM(rb_intern("close_dir"));
+    fsym_content  = I("content");
 
     Init_TermVector();
     Init_TermEnum();