ferret 0.11.6 → 0.11.8.4

data/ext/r_store.c

@@ -15,11 +15,11 @@ VALUE cFSDirectory;
  ****************************************************************************/
 
 void
-frt_unwrap_locks(Store *store)
+frb_unwrap_locks(Store *store)
 {
-    int i;
-    for (i = 0; i < store->locks->size; i++) {
-        void *lock = store->locks->elems[i];
+    HashSetEntry *hse = store->locks->first;
+    for (; hse; hse = hse->next) {
+        void *lock = hse->elem;
         VALUE rlock = object_get(lock);
         if (rlock != Qnil) {
             object_del(lock);
@@ -29,7 +29,7 @@ frt_unwrap_locks(Store *store)
 }
 
 void
-frt_lock_free(void *p)
+frb_lock_free(void *p)
 {
     Lock *lock = (Lock *)p;
     object_del(p);
@@ -37,10 +37,10 @@ frt_lock_free(void *p)
 }
 
 void
-frt_lock_mark(void *p)
+frb_lock_mark(void *p)
 {
     Lock *lock = (Lock *)p;
-    frt_gc_mark(lock->store);
+    frb_gc_mark(lock->store);
 }
 
 #define GET_LOCK(lock, self) Data_Get_Struct(self, Lock, lock)
@@ -64,7 +64,7 @@ frt_lock_mark(void *p)
  *            Lock::LockError otherwise.
  */
 static VALUE
-frt_lock_obtain(int argc, VALUE *argv, VALUE self)
+frb_lock_obtain(int argc, VALUE *argv, VALUE self)
 {
     VALUE rtimeout;
     int timeout = 1;
@@ -96,7 +96,7 @@ frt_lock_obtain(int argc, VALUE *argv, VALUE self)
  *            Lock::LockError otherwise.
  */
 static VALUE
-frt_lock_while_locked(int argc, VALUE *argv, VALUE self)
+frb_lock_while_locked(int argc, VALUE *argv, VALUE self)
 {
     VALUE rtimeout;
     int timeout = 1;
@@ -120,7 +120,7 @@ frt_lock_while_locked(int argc, VALUE *argv, VALUE self)
  *  Returns true if the lock has been obtained.
  */
 static VALUE
-frt_lock_is_locked(VALUE self)
+frb_lock_is_locked(VALUE self)
 {
     Lock *lock;
     GET_LOCK(lock, self);
@@ -135,7 +135,7 @@ frt_lock_is_locked(VALUE self)
  *  the lock.
  */
 static VALUE
-frt_lock_release(VALUE self)
+frb_lock_release(VALUE self)
 {
     Lock *lock;
     GET_LOCK(lock, self);
@@ -150,9 +150,9 @@ frt_lock_release(VALUE self)
  ****************************************************************************/
 
 void
-frt_dir_free(Store *store)
+frb_dir_free(Store *store)
 {
-    frt_unwrap_locks(store);
+    frb_unwrap_locks(store);
     object_del(store);
     store_deref(store);
 }
@@ -166,7 +166,7 @@ frt_dir_free(Store *store)
  *  behaviour may change in future.
  */
 static VALUE
-frt_dir_close(VALUE self)
+frb_dir_close(VALUE self)
 {
     Store *store = DATA_PTR(self);
     int ref_cnt = FIX2INT(rb_ivar_get(self, id_ref_cnt)) - 1;
@@ -174,7 +174,7 @@ frt_dir_close(VALUE self)
     if (ref_cnt < 0) {
         Frt_Unwrap_Struct(self);
         object_del(store);
-        frt_unwrap_locks(store);
+        frb_unwrap_locks(store);
         store_deref(store);
     }
     return Qnil;
@@ -187,7 +187,7 @@ frt_dir_close(VALUE self)
  *  Return true if a file with the name +file_name+ exists in the directory.
  */
 static VALUE
-frt_dir_exists(VALUE self, VALUE rfname)
+frb_dir_exists(VALUE self, VALUE rfname)
 {
     Store *store = DATA_PTR(self);
     StringValue(rfname);
@@ -201,7 +201,7 @@ frt_dir_exists(VALUE self, VALUE rfname)
  *  Create an empty file in the directory with the name +file_name+.
  */
 static VALUE
-frt_dir_touch(VALUE self, VALUE rfname)
+frb_dir_touch(VALUE self, VALUE rfname)
 {
     Store *store = DATA_PTR(self);
     StringValue(rfname);
@@ -216,7 +216,7 @@ frt_dir_touch(VALUE self, VALUE rfname)
  *  Remove file +file_name+ from the directory. Returns true if successful.
  */
 static VALUE
-frt_dir_delete(VALUE self, VALUE rfname)
+frb_dir_delete(VALUE self, VALUE rfname)
 {
     Store *store = DATA_PTR(self);
     StringValue(rfname);
@@ -230,7 +230,7 @@ frt_dir_delete(VALUE self, VALUE rfname)
  *  Return a count of the number of files in the directory.
  */
 static VALUE
-frt_dir_file_count(VALUE self)
+frb_dir_file_count(VALUE self)
 {
     Store *store = DATA_PTR(self);
     return INT2FIX(store->count(store));
@@ -243,7 +243,7 @@ frt_dir_file_count(VALUE self)
  *  Delete all files in the directory. It gives you a clean slate.
  */
 static VALUE
-frt_dir_refresh(VALUE self)
+frb_dir_refresh(VALUE self)
 {
     Store *store = DATA_PTR(self);
     store->clear_all(store);
@@ -258,7 +258,7 @@ frt_dir_refresh(VALUE self)
  *  doesn't exist or there is some other type of IOError.
  */
 static VALUE
-frt_dir_rename(VALUE self, VALUE rfrom, VALUE rto)
+frb_dir_rename(VALUE self, VALUE rfrom, VALUE rto)
 {
     Store *store = DATA_PTR(self);
     StringValue(rfrom);
@@ -277,14 +277,14 @@ frt_dir_rename(VALUE self, VALUE rfrom, VALUE rto)
  *  reserved for lock files
  */
 static VALUE
-frt_dir_make_lock(VALUE self, VALUE rlock_name)
+frb_dir_make_lock(VALUE self, VALUE rlock_name)
 {
     VALUE rlock;
     Lock *lock;
     Store *store = DATA_PTR(self);
     StringValue(rlock_name);
     lock = open_lock(store, rs2s(rlock_name));
-    rlock = Data_Wrap_Struct(cLock, &frt_lock_mark, &frt_lock_free, lock);
+    rlock = Data_Wrap_Struct(cLock, &frb_lock_mark, &frb_lock_free, lock);
     object_add(lock, rlock);
     return rlock;
 }
@@ -308,7 +308,7 @@ frt_dir_make_lock(VALUE self, VALUE rlock_name)
  *  dir:: Directory to load into memory
  */
 static VALUE
-frt_ramdir_init(int argc, VALUE *argv, VALUE self) 
+frb_ramdir_init(int argc, VALUE *argv, VALUE self) 
 {
     VALUE rdir;
     Store *store;
@@ -321,7 +321,7 @@ frt_ramdir_init(int argc, VALUE *argv, VALUE self)
                 }
         default: store = open_ram_store();
     }
-    Frt_Wrap_Struct(self, NULL, &frt_dir_free, store);
+    Frt_Wrap_Struct(self, NULL, &frb_dir_free, store);
     object_add(store, self);
     rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
     return self;
@@ -348,7 +348,7 @@ frt_ramdir_init(int argc, VALUE *argv, VALUE self)
  *           deleted
  */
 static VALUE
-frt_fsdir_new(int argc, VALUE *argv, VALUE klass) 
+frb_fsdir_new(int argc, VALUE *argv, VALUE klass) 
 {
     VALUE self, rpath, rcreate;
     Store *store;
@@ -358,7 +358,7 @@ frt_fsdir_new(int argc, VALUE *argv, VALUE klass)
     StringValue(rpath);
     create = RTEST(rcreate);
     if (create) {
-        frt_create_dir(rpath);
+        frb_create_dir(rpath);
     }
     if (!rb_funcall(rb_cFile, id_is_directory, 1, rpath)) {
         rb_raise(rb_eIOError, "No directory <%s> found. Use :create => true"
@@ -367,7 +367,7 @@ frt_fsdir_new(int argc, VALUE *argv, VALUE klass)
     store = open_fs_store(rs2s(rpath));
     if (create) store->clear_all(store);
     if ((self = object_get(store)) == Qnil) {
-        self = Data_Wrap_Struct(klass, NULL, &frt_dir_free, store);
+        self = Data_Wrap_Struct(klass, NULL, &frb_dir_free, store);
         object_add(store, self);
         rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
     }
@@ -408,14 +408,14 @@ Init_Directory(void)
 {
     cDirectory = rb_define_class_under(mStore, "Directory", rb_cObject);
     rb_define_const(cDirectory, "LOCK_PREFIX", rb_str_new2(LOCK_PREFIX));
-    rb_define_method(cDirectory, "close", frt_dir_close, 0);
-    rb_define_method(cDirectory, "exists?", frt_dir_exists, 1);
-    rb_define_method(cDirectory, "touch", frt_dir_touch, 1);
-    rb_define_method(cDirectory, "delete", frt_dir_delete, 1);
-    rb_define_method(cDirectory, "file_count", frt_dir_file_count, 0);
-    rb_define_method(cDirectory, "refresh", frt_dir_refresh, 0);
-    rb_define_method(cDirectory, "rename", frt_dir_rename, 2);
-    rb_define_method(cDirectory, "make_lock", frt_dir_make_lock, 1);
+    rb_define_method(cDirectory, "close", frb_dir_close, 0);
+    rb_define_method(cDirectory, "exists?", frb_dir_exists, 1);
+    rb_define_method(cDirectory, "touch", frb_dir_touch, 1);
+    rb_define_method(cDirectory, "delete", frb_dir_delete, 1);
+    rb_define_method(cDirectory, "file_count", frb_dir_file_count, 0);
+    rb_define_method(cDirectory, "refresh", frb_dir_refresh, 0);
+    rb_define_method(cDirectory, "rename", frb_dir_rename, 2);
+    rb_define_method(cDirectory, "make_lock", frb_dir_make_lock, 1);
 }
 
 /*
@@ -445,10 +445,10 @@ void
 Init_Lock(void)
 {
     cLock = rb_define_class_under(mStore, "Lock", rb_cObject);
-    rb_define_method(cLock, "obtain", frt_lock_obtain, -1);
-    rb_define_method(cLock, "while_locked", frt_lock_while_locked, -1);
-    rb_define_method(cLock, "release", frt_lock_release, 0);
-    rb_define_method(cLock, "locked?", frt_lock_is_locked, 0);
+    rb_define_method(cLock, "obtain", frb_lock_obtain, -1);
+    rb_define_method(cLock, "while_locked", frb_lock_while_locked, -1);
+    rb_define_method(cLock, "release", frb_lock_release, 0);
+    rb_define_method(cLock, "locked?", frb_lock_is_locked, 0);
 
     cLockError = rb_define_class_under(cLock, "LockError", rb_eStandardError);
 }
@@ -466,8 +466,8 @@ void
 Init_RAMDirectory(void)
 {
     cRAMDirectory = rb_define_class_under(mStore, "RAMDirectory", cDirectory);
-    rb_define_alloc_func(cRAMDirectory, frt_data_alloc);
-    rb_define_method(cRAMDirectory, "initialize", frt_ramdir_init, -1);
+    rb_define_alloc_func(cRAMDirectory, frb_data_alloc);
+    rb_define_method(cRAMDirectory, "initialize", frb_ramdir_init, -1);
 }
 
 /*
@@ -483,8 +483,8 @@ void
 Init_FSDirectory(void)
 {
     cFSDirectory = rb_define_class_under(mStore, "FSDirectory", cDirectory);
-    rb_define_alloc_func(cFSDirectory, frt_data_alloc);
-    rb_define_singleton_method(cFSDirectory, "new", frt_fsdir_new, -1);
+    rb_define_alloc_func(cFSDirectory, frb_data_alloc);
+    rb_define_singleton_method(cFSDirectory, "new", frb_fsdir_new, -1);
 }
 
 /* rdoc hack

data/ext/r_utils.c

@@ -1,5 +1,11 @@
 #include "ferret.h"
 #include "bitvector.h"
+#include "multimapper.h"
+#ifdef FRT_RUBY_VERSION_1_9
+#  include <ruby/st.h>
+#else
+#  include <st.h>
+#endif
 
 /*****************
  *** BitVector ***
@@ -7,17 +13,17 @@
 static VALUE cBitVector;
 
 static void
-frt_bv_free(void *p)
+frb_bv_free(void *p)
 {
     object_del(p);
     bv_destroy((BitVector *)p);
 }
 
 static VALUE
-frt_bv_alloc(VALUE klass)
+frb_bv_alloc(VALUE klass)
 {
     BitVector *bv = bv_new();
-    VALUE rbv = Data_Wrap_Struct(klass, NULL, &frt_bv_free, bv);
+    VALUE rbv = Data_Wrap_Struct(klass, NULL, &frb_bv_free, bv);
     object_add(bv, rbv);
     return rbv;
 }
@@ -25,11 +31,11 @@ frt_bv_alloc(VALUE klass)
 #define GET_BV(bv, self) Data_Get_Struct(self, BitVector, bv)
 
 VALUE
-frt_get_bv(BitVector *bv)
+frb_get_bv(BitVector *bv)
 {
     VALUE rbv;
     if ((rbv = object_get(bv)) == Qnil) {
-        rbv = Data_Wrap_Struct(cBitVector, NULL, &frt_bv_free, bv);
+        rbv = Data_Wrap_Struct(cBitVector, NULL, &frb_bv_free, bv);
         REF(bv);
         object_add(bv, rbv);
     }
@@ -38,12 +44,12 @@ frt_get_bv(BitVector *bv)
 
 /*
  *  call-seq:
- *     BitVector.new() -> new_bv
+ *     BitVector.new() -> new_bit_vector
  *  
  *  Returns a new empty bit vector object
  */
 static VALUE 
-frt_bv_init(VALUE self)
+frb_bv_init(VALUE self)
 {
     return self;
 }
@@ -56,7 +62,7 @@ frt_bv_init(VALUE self)
  *  +false+).
  */
 VALUE
-frt_bv_set(VALUE self, VALUE rindex, VALUE rstate)
+frb_bv_set(VALUE self, VALUE rindex, VALUE rstate)
 {
     BitVector *bv;
     int index = FIX2INT(rindex);
@@ -81,9 +87,9 @@ frt_bv_set(VALUE self, VALUE rindex, VALUE rstate)
  *  Set the bit at _i_ to *on* (+true+)
  */
 VALUE
-frt_bv_set_on(VALUE self, VALUE rindex)
+frb_bv_set_on(VALUE self, VALUE rindex)
 {
-    frt_bv_set(self, rindex, Qtrue);
+    frb_bv_set(self, rindex, Qtrue);
     return self;
 }
 
@@ -94,9 +100,9 @@ frt_bv_set_on(VALUE self, VALUE rindex)
  *  Set the bit at _i_ to *off* (+false+)
  */
 VALUE
-frt_bv_set_off(VALUE self, VALUE rindex)
+frb_bv_set_off(VALUE self, VALUE rindex)
 {
-    frt_bv_set(self, rindex, Qfalse);
+    frb_bv_set(self, rindex, Qfalse);
     return self;
 }
 
@@ -108,7 +114,7 @@ frt_bv_set_off(VALUE self, VALUE rindex)
  *  Get the bit value at _i_
  */
 VALUE
-frt_bv_get(VALUE self, VALUE rindex)
+frb_bv_get(VALUE self, VALUE rindex)
 {
     BitVector *bv;
     int index = FIX2INT(rindex);
@@ -129,7 +135,7 @@ frt_bv_get(VALUE self, VALUE rindex)
  *  instead.
  */
 VALUE
-frt_bv_count(VALUE self)
+frb_bv_count(VALUE self)
 {
     BitVector *bv;
     GET_BV(bv, self);
@@ -144,7 +150,7 @@ frt_bv_count(VALUE self)
  *  all bits set to *off*.
  */
 VALUE
-frt_bv_clear(VALUE self)
+frb_bv_clear(VALUE self)
 {
     BitVector *bv;
     GET_BV(bv, self);
@@ -163,7 +169,7 @@ frt_bv_clear(VALUE self)
  *  bits set.
  */
 VALUE
-frt_bv_eql(VALUE self, VALUE other)
+frb_bv_eql(VALUE self, VALUE other)
 {
     BitVector *bv1, *bv2;
     GET_BV(bv1, self);
@@ -179,7 +185,7 @@ frt_bv_eql(VALUE self, VALUE other)
  *  cache them.
  */
 VALUE
-frt_bv_hash(VALUE self)
+frb_bv_hash(VALUE self)
 {
     BitVector *bv;
     GET_BV(bv, self);
@@ -195,7 +201,7 @@ frt_bv_hash(VALUE self)
  *  +bv2+
  */
 VALUE
-frt_bv_and(VALUE self, VALUE other)
+frb_bv_and(VALUE self, VALUE other)
 {
     BitVector *bv1, *bv2;
     GET_BV(bv1, self);
@@ -211,7 +217,7 @@ frt_bv_and(VALUE self, VALUE other)
  *  +bv2+ in place on +bv1+
  */
 VALUE
-frt_bv_and_x(VALUE self, VALUE other)
+frb_bv_and_x(VALUE self, VALUE other)
 {
     BitVector *bv1, *bv2;
     GET_BV(bv1, self);
@@ -229,7 +235,7 @@ frt_bv_and_x(VALUE self, VALUE other)
  *  +bv2+
  */
 VALUE
-frt_bv_or(VALUE self, VALUE other)
+frb_bv_or(VALUE self, VALUE other)
 {
     BitVector *bv1, *bv2;
     GET_BV(bv1, self);
@@ -245,7 +251,7 @@ frt_bv_or(VALUE self, VALUE other)
  *  +bv2+ in place on +bv1+
  */
 VALUE
-frt_bv_or_x(VALUE self, VALUE other)
+frb_bv_or_x(VALUE self, VALUE other)
 {
     BitVector *bv1, *bv2;
     GET_BV(bv1, self);
@@ -263,7 +269,7 @@ frt_bv_or_x(VALUE self, VALUE other)
  *  +bv2+
  */
 VALUE
-frt_bv_xor(VALUE self, VALUE other)
+frb_bv_xor(VALUE self, VALUE other)
 {
     BitVector *bv1, *bv2;
     GET_BV(bv1, self);
@@ -279,7 +285,7 @@ frt_bv_xor(VALUE self, VALUE other)
  *  +bv2+ in place on +bv1+
  */
 VALUE
-frt_bv_xor_x(VALUE self, VALUE other)
+frb_bv_xor_x(VALUE self, VALUE other)
 {
     BitVector *bv1, *bv2;
     GET_BV(bv1, self);
@@ -296,7 +302,7 @@ frt_bv_xor_x(VALUE self, VALUE other)
  *  Perform a boolean _not_ operation on +bv+
  *  */
 VALUE
-frt_bv_not(VALUE self)
+frb_bv_not(VALUE self)
 {
     BitVector *bv;
     GET_BV(bv, self);
@@ -310,7 +316,7 @@ frt_bv_not(VALUE self)
  *  Perform a boolean _not_ operation on +bv+ in-place
  */
 VALUE
-frt_bv_not_x(VALUE self)
+frb_bv_not_x(VALUE self)
 {
     BitVector *bv;
     GET_BV(bv, self);
@@ -327,7 +333,7 @@ frt_bv_not_x(VALUE self)
  *  necessary for the other scan methods or for the +#each+ method.
  */
 VALUE
-frt_bv_reset_scan(VALUE self)
+frb_bv_reset_scan(VALUE self)
 {
     BitVector *bv;
     GET_BV(bv, self);
@@ -345,7 +351,7 @@ frt_bv_reset_scan(VALUE self)
  *  first create the bit vector.
  */
 VALUE
-frt_bv_next(VALUE self)
+frb_bv_next(VALUE self)
 {
     BitVector *bv;
     GET_BV(bv, self);
@@ -363,7 +369,7 @@ frt_bv_next(VALUE self)
  *  automatically reset when you first create the bit vector.
  */
 VALUE
-frt_bv_next_unset(VALUE self)
+frb_bv_next_unset(VALUE self)
 {
     BitVector *bv;
     GET_BV(bv, self);
@@ -381,7 +387,7 @@ frt_bv_next_unset(VALUE self)
  *  use the +#next_unset_from+ method.
  */
 VALUE
-frt_bv_next_from(VALUE self, VALUE rfrom)
+frb_bv_next_from(VALUE self, VALUE rfrom)
 {
     BitVector *bv;
     int from = FIX2INT(rfrom);
@@ -403,7 +409,7 @@ frt_bv_next_from(VALUE self, VALUE rfrom)
  *  should use the +#next_from+ method.
  */
 VALUE
-frt_bv_next_unset_from(VALUE self, VALUE rfrom)
+frb_bv_next_unset_from(VALUE self, VALUE rfrom)
 {
     BitVector *bv;
     int from = FIX2INT(rfrom);
@@ -422,7 +428,7 @@ frt_bv_next_unset_from(VALUE self, VALUE rfrom)
  *  order
  */
 VALUE
-frt_bv_each(VALUE self)
+frb_bv_each(VALUE self)
 {
     BitVector *bv;
     int bit;
@@ -453,7 +459,7 @@ frt_bv_each(VALUE self)
  *    bv = [1, 12, 45, 367, 455].inject(BitVector.new) {|bv, i| bv.set(i)}
  */
 VALUE
-frt_bv_to_a(VALUE self)
+frb_bv_to_a(VALUE self)
 {
     BitVector *bv;
     int bit;
@@ -527,38 +533,198 @@ Init_BitVector(void)
 {
     /* BitVector */
     cBitVector = rb_define_class_under(mUtils, "BitVector", rb_cObject);
-    rb_define_alloc_func(cBitVector, frt_bv_alloc);
-
-    rb_define_method(cBitVector, "initialize", frt_bv_init, 0);
-    rb_define_method(cBitVector, "set", frt_bv_set_on, 1);
-    rb_define_method(cBitVector, "unset", frt_bv_set_off, 1);
-    rb_define_method(cBitVector, "[]=", frt_bv_set, 2);
-    rb_define_method(cBitVector, "get", frt_bv_get, 1);
-    rb_define_method(cBitVector, "[]", frt_bv_get, 1);
-    rb_define_method(cBitVector, "count", frt_bv_count, 0);
-    rb_define_method(cBitVector, "clear", frt_bv_clear, 0);
-    rb_define_method(cBitVector, "eql?", frt_bv_eql, 1);
-    rb_define_method(cBitVector, "==", frt_bv_eql, 1);
-    rb_define_method(cBitVector, "hash", frt_bv_hash, 0);
-    rb_define_method(cBitVector, "and!", frt_bv_and_x, 1);
-    rb_define_method(cBitVector, "and", frt_bv_and, 1);
-    rb_define_method(cBitVector, "&", frt_bv_and, 1);
-    rb_define_method(cBitVector, "or!", frt_bv_or_x, 1);
-    rb_define_method(cBitVector, "or", frt_bv_or, 1);
-    rb_define_method(cBitVector, "|", frt_bv_or, 1);
-    rb_define_method(cBitVector, "xor!", frt_bv_xor_x, 1);
-    rb_define_method(cBitVector, "xor", frt_bv_xor, 1);
-    rb_define_method(cBitVector, "^", frt_bv_xor, 1);
-    rb_define_method(cBitVector, "not!", frt_bv_not_x, 0);
-    rb_define_method(cBitVector, "not", frt_bv_not, 0);
-    rb_define_method(cBitVector, "~", frt_bv_not, 0);
-    rb_define_method(cBitVector, "reset_scan", frt_bv_reset_scan, 0);
-    rb_define_method(cBitVector, "next", frt_bv_next, 0);
-    rb_define_method(cBitVector, "next_unset", frt_bv_next_unset, 0);
-    rb_define_method(cBitVector, "next_from", frt_bv_next_from, 1);
-    rb_define_method(cBitVector, "next_unset_from", frt_bv_next_unset_from, 1);
-    rb_define_method(cBitVector, "each", frt_bv_each, 0);
-    rb_define_method(cBitVector, "to_a", frt_bv_to_a, 0);
+    rb_define_alloc_func(cBitVector, frb_bv_alloc);
+
+    rb_define_method(cBitVector, "initialize", frb_bv_init, 0);
+    rb_define_method(cBitVector, "set", frb_bv_set_on, 1);
+    rb_define_method(cBitVector, "unset", frb_bv_set_off, 1);
+    rb_define_method(cBitVector, "[]=", frb_bv_set, 2);
+    rb_define_method(cBitVector, "get", frb_bv_get, 1);
+    rb_define_method(cBitVector, "[]", frb_bv_get, 1);
+    rb_define_method(cBitVector, "count", frb_bv_count, 0);
+    rb_define_method(cBitVector, "clear", frb_bv_clear, 0);
+    rb_define_method(cBitVector, "eql?", frb_bv_eql, 1);
+    rb_define_method(cBitVector, "==", frb_bv_eql, 1);
+    rb_define_method(cBitVector, "hash", frb_bv_hash, 0);
+    rb_define_method(cBitVector, "and!", frb_bv_and_x, 1);
+    rb_define_method(cBitVector, "and", frb_bv_and, 1);
+    rb_define_method(cBitVector, "&", frb_bv_and, 1);
+    rb_define_method(cBitVector, "or!", frb_bv_or_x, 1);
+    rb_define_method(cBitVector, "or", frb_bv_or, 1);
+    rb_define_method(cBitVector, "|", frb_bv_or, 1);
+    rb_define_method(cBitVector, "xor!", frb_bv_xor_x, 1);
+    rb_define_method(cBitVector, "xor", frb_bv_xor, 1);
+    rb_define_method(cBitVector, "^", frb_bv_xor, 1);
+    rb_define_method(cBitVector, "not!", frb_bv_not_x, 0);
+    rb_define_method(cBitVector, "not", frb_bv_not, 0);
+    rb_define_method(cBitVector, "~", frb_bv_not, 0);
+    rb_define_method(cBitVector, "reset_scan", frb_bv_reset_scan, 0);
+    rb_define_method(cBitVector, "next", frb_bv_next, 0);
+    rb_define_method(cBitVector, "next_unset", frb_bv_next_unset, 0);
+    rb_define_method(cBitVector, "next_from", frb_bv_next_from, 1);
+    rb_define_method(cBitVector, "next_unset_from", frb_bv_next_unset_from, 1);
+    rb_define_method(cBitVector, "each", frb_bv_each, 0);
+    rb_define_method(cBitVector, "to_a", frb_bv_to_a, 0);
+}
+
+/*******************
+ *** MultiMapper ***
+ *******************/
+static VALUE cMultiMapper;
+
+static void
+frb_mulmap_free(void *p)
+{
+    object_del(p);
+    mulmap_destroy((MultiMapper *)p);
+}
+
+static VALUE
+frb_mulmap_alloc(VALUE klass)
+{
+    MultiMapper *mulmap = mulmap_new();
+    VALUE rmulmap = Data_Wrap_Struct(klass, NULL, &frb_mulmap_free, mulmap);
+    object_add(mulmap, rmulmap);
+    return rmulmap;
+}
+
+/* XXX: Duplication from frb_add_mapping_i in r_analysis.c */
+static INLINE void frb_mulmap_add_mapping_i(MultiMapper *mulmap, VALUE from,
+                                            const char *to)
+{
+    switch (TYPE(from)) {
+        case T_STRING:
+            mulmap_add_mapping(mulmap, rs2s(from), to);
+            break;
+        case T_SYMBOL:
+            mulmap_add_mapping(mulmap, rb_id2name(SYM2ID(from)), to);
+            break;
+        default:
+            rb_raise(rb_eArgError,
+                     "cannot map from %s with MappingFilter",
+                     rs2s(rb_obj_as_string(from)));
+            break;
+    }
+}
+
+/* XXX: Duplication from frb_add_mappings_i in r_analysis.c */
+static int frb_mulmap_add_mappings_i(VALUE key, VALUE value, VALUE arg)
+{
+    if (key == Qundef) {
+        return ST_CONTINUE;
+    } else {
+        MultiMapper *mulmap = (MultiMapper *)arg;
+        const char *to;
+        switch (TYPE(value)) {
+            case T_STRING:
+                to = rs2s(value);
+                break;
+            case T_SYMBOL:
+                to = rb_id2name(SYM2ID(value));
+                break;
+            default:
+                rb_raise(rb_eArgError,
+                         "cannot map to %s with MultiMapper",
+                         rs2s(rb_obj_as_string(key)));
+                break;
+        }
+        if (TYPE(key) == T_ARRAY) {
+            int i;
+            for (i = RARRAY_LEN(key) - 1; i >= 0; i--) {
+                frb_mulmap_add_mapping_i(mulmap, RARRAY_PTR(key)[i], to);
+            }
+        }
+        else {
+            frb_mulmap_add_mapping_i(mulmap, key, to);
+        }
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     MultiMapper.new() -> new_multi_mapper
+ *  
+ *  Returns a new multi-mapper object and compiles it for optimization.
+ *
+ *  Note that MultiMapper is immutable.
+ */
+static VALUE 
+frb_mulmap_init(VALUE self, VALUE rmappings)
+{
+    MultiMapper *mulmap = DATA_PTR(self);
+    rb_hash_foreach(rmappings, frb_mulmap_add_mappings_i, (VALUE)mulmap);
+    mulmap_compile(mulmap);
+
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     multi_mapper.map(string) -> mapped_string
+ *  
+ *  Performs all the mappings on the string.
+ */
+VALUE
+frb_mulmap_map(VALUE self, VALUE rstring)
+{
+    MultiMapper *mulmap = DATA_PTR(self);
+    char *string = rs2s(rb_obj_as_string(rstring));
+    char *mapped_string = mulmap_dynamic_map(mulmap, string);
+    VALUE rmapped_string = rb_str_new2(mapped_string);
+    free(mapped_string);
+    return rmapped_string;
+}
+
+/*  
+ *  Document-class: Ferret::Utils::MultiMapper
+ *
+ *  == Summary
+ *
+ *  A MultiMapper performs a list of mappings from one string to another. You
+ *  could of course just use gsub to do this but when you are just mapping
+ *  strings, this is much faster.
+ *
+ *  Note that MultiMapper is immutable.
+ *
+ *  == Example
+ *
+ *     mapping = {
+ *       ['à','á','â','ã','ä','å','ā','ă']         => 'a',
+ *       'æ'                                       => 'ae',
+ *       ['ď','đ']                                 => 'd',
+ *       ['ç','ć','č','ĉ','ċ']                     => 'c',
+ *       ['è','é','ê','ë','ē','ę','ě','ĕ','ė',]    => 'e',
+ *       ['ƒ']                                     => 'f',
+ *       ['ĝ','ğ','ġ','ģ']                         => 'g',
+ *       ['ĥ','ħ']                                 => 'h',
+ *       ['ì','ì','í','î','ï','ī','ĩ','ĭ']         => 'i',
+ *       ['į','ı','ij','ĵ']                         => 'j',
+ *       ['ķ','ĸ']                                 => 'k',
+ *       ['ł','ľ','ĺ','ļ','ŀ']                     => 'l',
+ *       ['ñ','ń','ň','ņ','ʼn','ŋ']                 => 'n',
+ *       ['ò','ó','ô','õ','ö','ø','ō','ő','ŏ','ŏ'] => 'o',
+ *       ['œ']                                     => 'oek',
+ *       ['ą']                                     => 'q',
+ *       ['ŕ','ř','ŗ']                             => 'r',
+ *       ['ś','š','ş','ŝ','ș']                     => 's',
+ *       ['ť','ţ','ŧ','ț']                         => 't',
+ *       ['ù','ú','û','ü','ū','ů','ű','ŭ','ũ','ų'] => 'u',
+ *       ['ŵ']                                     => 'w',
+ *       ['ý','ÿ','ŷ']                             => 'y',
+ *       ['ž','ż','ź']                             => 'z'
+ *     mapper = MultiMapper.new(mapping)
+ *     mapped_string = mapper.map(string)
+ */
+static void
+Init_MultiMapper(void)
+{
+    /* MultiMapper */
+    cMultiMapper = rb_define_class_under(mUtils, "MultiMapper", rb_cObject);
+    rb_define_alloc_func(cMultiMapper, frb_mulmap_alloc);
+
+    rb_define_method(cMultiMapper, "initialize", frb_mulmap_init, 1);
+    rb_define_method(cMultiMapper, "map", frb_mulmap_map, 1);
 }
 
 /*********************
@@ -575,7 +741,7 @@ typedef struct PriQ
 
 #define PQ_START_CAPA 32
 
-static bool frt_pq_lt(VALUE proc, VALUE v1, VALUE v2)
+static bool frb_pq_lt(VALUE proc, VALUE v1, VALUE v2)
 {
     if (proc == Qnil) {
         return RTEST(rb_funcall(v1, id_lt, 1, v2));
@@ -594,7 +760,7 @@ static void pq_up(PriQ *pq)
 
     node = heap[i];
 
-    while ((j > 0) && frt_pq_lt(pq->proc, node, heap[j])) {
+    while ((j > 0) && frb_pq_lt(pq->proc, node, heap[j])) {
         heap[i] = heap[j];
         i = j;
         j = j >> 1;
@@ -611,16 +777,16 @@ static void pq_down(PriQ *pq)
     VALUE *heap = pq->heap;
     VALUE node = heap[i];       /* save top node */
 
-    if ((k <= size) && (frt_pq_lt(pq->proc, heap[k], heap[j]))) {
+    if ((k <= size) && (frb_pq_lt(pq->proc, heap[k], heap[j]))) {
         j = k;
     }
 
-    while ((j <= size) && frt_pq_lt(pq->proc, heap[j], node)) {
+    while ((j <= size) && frb_pq_lt(pq->proc, heap[j], node)) {
         heap[i] = heap[j];      /* shift up child */
         i = j;
         j = i << 1;
         k = j + 1;
-        if ((k <= size) && frt_pq_lt(pq->proc, heap[k], heap[j])) {
+        if ((k <= size) && frb_pq_lt(pq->proc, heap[k], heap[j])) {
             j = k;
         }
     }
@@ -641,7 +807,7 @@ static void pq_push(PriQ *pq, VALUE elem)
 static VALUE cPriorityQueue;
 
 static void
-frt_pq_mark(void *p)
+frb_pq_mark(void *p)
 {
     PriQ *pq = (PriQ *)p;
     int i;
@@ -650,21 +816,21 @@ frt_pq_mark(void *p)
     }
 }
 
-static void frt_pq_free(PriQ *pq)
+static void frb_pq_free(PriQ *pq)
 {
     free(pq->heap);
     free(pq);
 }
 
 static VALUE
-frt_pq_alloc(VALUE klass)
+frb_pq_alloc(VALUE klass)
 {
     PriQ *pq = ALLOC_AND_ZERO(PriQ);
     pq->capa = PQ_START_CAPA;
     pq->mem_capa = PQ_START_CAPA;
     pq->heap = ALLOC_N(VALUE, PQ_START_CAPA);
     pq->proc = Qnil;
-    return Data_Wrap_Struct(klass, &frt_pq_mark, &frt_pq_free, pq);
+    return Data_Wrap_Struct(klass, &frb_pq_mark, &frb_pq_free, pq);
 }
 
 #define GET_PQ(pq, self) Data_Get_Struct(self, PriQ, pq)
@@ -681,7 +847,7 @@ frt_pq_alloc(VALUE klass)
  *  inserted into the queue.
  */
 static VALUE 
-frt_pq_init(int argc, VALUE *argv, VALUE self)
+frb_pq_init(int argc, VALUE *argv, VALUE self)
 {
     if (argc >= 1) {
         PriQ *pq;
@@ -736,7 +902,7 @@ frt_pq_init(int argc, VALUE *argv, VALUE self)
  *  queue is cloned, its contents are not cloned.
  */
 static VALUE
-frt_pq_clone(VALUE self)
+frb_pq_clone(VALUE self)
 {
     PriQ *pq, *new_pq = ALLOC(PriQ);
     GET_PQ(pq, self);
@@ -744,7 +910,7 @@ frt_pq_clone(VALUE self)
     new_pq->heap = ALLOC_N(VALUE, new_pq->mem_capa);
     memcpy(new_pq->heap, pq->heap, sizeof(VALUE) * (new_pq->size + 1));
 
-    return Data_Wrap_Struct(cPriorityQueue, &frt_pq_mark, &frt_pq_free, new_pq);
+    return Data_Wrap_Struct(cPriorityQueue, &frb_pq_mark, &frb_pq_free, new_pq);
 }
 
 /*
@@ -754,7 +920,7 @@ frt_pq_clone(VALUE self)
  *  Clears all elements from the priority queue. The size will be reset to 0.
  */
 static VALUE
-frt_pq_clear(VALUE self)
+frb_pq_clear(VALUE self)
 {
     PriQ *pq;
     GET_PQ(pq, self);
@@ -771,14 +937,14 @@ frt_pq_clear(VALUE self)
  *  position in the queue according to its priority.
  */
 static VALUE
-frt_pq_insert(VALUE self, VALUE elem)
+frb_pq_insert(VALUE self, VALUE elem)
 {
     PriQ *pq;
     GET_PQ(pq, self);
     if (pq->size < pq->capa) {
         pq_push(pq, elem);
     }
-    else if (pq->size > 0 && frt_pq_lt(pq->proc, pq->heap[1], elem)) {
+    else if (pq->size > 0 && frb_pq_lt(pq->proc, pq->heap[1], elem)) {
         pq->heap[1] = elem;
         pq_down(pq);
     }
@@ -795,7 +961,7 @@ frt_pq_insert(VALUE self, VALUE elem)
  *  do this by calling the adjust method.
  */
 static VALUE
-frt_pq_adjust(VALUE self)
+frb_pq_adjust(VALUE self)
 {
     PriQ *pq;
     GET_PQ(pq, self);
@@ -811,7 +977,7 @@ frt_pq_adjust(VALUE self)
  *  queue.
  */
 static VALUE
-frt_pq_top(VALUE self)
+frb_pq_top(VALUE self)
 {
     PriQ *pq;
     GET_PQ(pq, self);
@@ -825,7 +991,7 @@ frt_pq_top(VALUE self)
  *  Returns the top element in the queue removing it from the queue.
  */
 static VALUE
-frt_pq_pop(VALUE self)
+frb_pq_pop(VALUE self)
 {
     PriQ *pq;
     GET_PQ(pq, self);
@@ -851,7 +1017,7 @@ frt_pq_pop(VALUE self)
  *  its _capacity_
  */
 static VALUE
-frt_pq_size(VALUE self)
+frb_pq_size(VALUE self)
 {
     PriQ *pq;
     GET_PQ(pq, self);
@@ -868,7 +1034,7 @@ frt_pq_size(VALUE self)
  *  _capacity_
  */
 static VALUE
-frt_pq_capa(VALUE self)
+frb_pq_capa(VALUE self)
 {
     PriQ *pq;
     GET_PQ(pq, self);
@@ -922,18 +1088,18 @@ Init_PriorityQueue(void)
 {
     /* PriorityQueue */
     cPriorityQueue = rb_define_class_under(mUtils, "PriorityQueue", rb_cObject);
-    rb_define_alloc_func(cPriorityQueue, frt_pq_alloc);
-
-    rb_define_method(cPriorityQueue, "initialize", frt_pq_init, -1);
-    rb_define_method(cPriorityQueue, "clone", frt_pq_clone, 0);
-    rb_define_method(cPriorityQueue, "clear", frt_pq_clear, 0);
-    rb_define_method(cPriorityQueue, "insert", frt_pq_insert, 1);
-    rb_define_method(cPriorityQueue, "<<", frt_pq_insert, 1);
-    rb_define_method(cPriorityQueue, "top", frt_pq_top, 0);
-    rb_define_method(cPriorityQueue, "pop", frt_pq_pop, 0);
-    rb_define_method(cPriorityQueue, "size", frt_pq_size, 0);
-    rb_define_method(cPriorityQueue, "capacity", frt_pq_capa, 0);
-    rb_define_method(cPriorityQueue, "adjust", frt_pq_adjust, 0);
+    rb_define_alloc_func(cPriorityQueue, frb_pq_alloc);
+
+    rb_define_method(cPriorityQueue, "initialize", frb_pq_init, -1);
+    rb_define_method(cPriorityQueue, "clone", frb_pq_clone, 0);
+    rb_define_method(cPriorityQueue, "clear", frb_pq_clear, 0);
+    rb_define_method(cPriorityQueue, "insert", frb_pq_insert, 1);
+    rb_define_method(cPriorityQueue, "<<", frb_pq_insert, 1);
+    rb_define_method(cPriorityQueue, "top", frb_pq_top, 0);
+    rb_define_method(cPriorityQueue, "pop", frb_pq_pop, 0);
+    rb_define_method(cPriorityQueue, "size", frb_pq_size, 0);
+    rb_define_method(cPriorityQueue, "capacity", frb_pq_capa, 0);
+    rb_define_method(cPriorityQueue, "adjust", frb_pq_adjust, 0);
 }
 
 /* rdoc hack
@@ -947,6 +1113,7 @@ extern VALUE mFerret = rb_define_module("Ferret");
  *  useful when indexing with Ferret. They are;
  *
  *  * BitVector
+ *  * MultiMapper
  *  * PriorityQueue
  *  * => more to come
  *
@@ -959,5 +1126,6 @@ Init_Utils(void)
     mUtils = rb_define_module_under(mFerret, "Utils");
 
     Init_BitVector();
+    Init_MultiMapper();
     Init_PriorityQueue();
 }