ferret 0.2.2 → 0.3.0

data/ext/priority_queue.c

@@ -16,188 +16,193 @@ frt_priq_free(void *p)
 static VALUE
 frt_priq_alloc(VALUE klass)
 {
-	PriorityQueue *priq;
-	priq = (PriorityQueue *)ALLOC(PriorityQueue);
-	priq->len = 0;
-	priq->size = 0;
-	VALUE rpriq = Data_Wrap_Struct(klass, NULL, frt_priq_free, priq);
-	return rpriq;
+  PriorityQueue *priq;
+  VALUE rpriq;
+  priq = (PriorityQueue *)ALLOC(PriorityQueue);
+  priq->len = 0;
+  priq->size = 0;
+  rpriq = Data_Wrap_Struct(klass, NULL, frt_priq_free, priq);
+  return rpriq;
 }
 
 static VALUE
 frt_priq_init(VALUE self, VALUE rsize)
 {
-	VALUE heap;
-	PriorityQueue *priq;
-	
-	int size = FIX2INT(rsize);
-	heap = rb_ary_new2(size+1);
-	Data_Get_Struct(self, PriorityQueue, priq);
-	
-	priq->heap = RARRAY(heap)->ptr;
-	priq->size = size;
-	rb_iv_set(self, "@heap", heap);
-	return self;
+  VALUE heap;
+  PriorityQueue *priq;
+  
+  int size = FIX2INT(rsize);
+  heap = rb_ary_new2(size+1);
+  Data_Get_Struct(self, PriorityQueue, priq);
+  
+  priq->heap = RARRAY(heap)->ptr;
+  priq->size = size;
+  rb_iv_set(self, "@heap", heap);
+  return self;
 }
 
 void
 priq_up(PriorityQueue *priq, VALUE self, VALUE rary)
 {
-	int i,j;
-	VALUE *heap, node;
-	
-	i = priq->len;
-	heap = priq->heap;
-	node = heap[i];
-	j = i >> 1;
-	while((j > 0) && rb_funcall(self, less_than, 2, node, heap[j])){
-		heap[i] = heap[j];
-		i = j;
-		j = j >> 1;
-	}
-	rb_ary_store(rary, i, node);
+  int i,j;
+  VALUE *heap, node;
+  
+  i = priq->len;
+  heap = priq->heap;
+  node = heap[i];
+  j = i >> 1;
+  while((j > 0) && rb_funcall(self, less_than, 2, node, heap[j])){
+    heap[i] = heap[j];
+    i = j;
+    j = j >> 1;
+  }
+  rb_ary_store(rary, i, node);
 }
 
 void
 priq_down(PriorityQueue *priq, VALUE self, VALUE rary)
 {
-	int i, j, k, len;
-	VALUE *heap, node;
-	
-	i = 1;
-	heap = priq->heap;
-	len = priq->len;
-	node = heap[i];
-	j = i << 1;
-	k = j + 1;
-
-	if ((k <= len) && rb_funcall(self, less_than, 2, heap[k], heap[j]))
-		j = k;
-
-	while((j <= len) && rb_funcall(self, less_than, 2, heap[j], node)){
-		heap[i] = heap[j];
-		i = j;
-		j = i << 1;
-		k = j + 1;
-		if((k <= len) && rb_funcall(self, less_than, 2, heap[k], heap[j]))
-			j = k;
-	}
-	rb_ary_store(rary,i, node);
+  int i, j, k, len;
+  VALUE *heap, node;
+  
+  i = 1;
+  heap = priq->heap;
+  len = priq->len;
+  node = heap[i];
+  j = i << 1;
+  k = j + 1;
+
+  if ((k <= len) && rb_funcall(self, less_than, 2, heap[k], heap[j]))
+    j = k;
+
+  while((j <= len) && rb_funcall(self, less_than, 2, heap[j], node)){
+    heap[i] = heap[j];
+    i = j;
+    j = i << 1;
+    k = j + 1;
+    if((k <= len) && rb_funcall(self, less_than, 2, heap[k], heap[j]))
+      j = k;
+  }
+  rb_ary_store(rary,i, node);
 }
 
 static VALUE
 frt_priq_push(VALUE self, VALUE e)
 {
-	PriorityQueue *priq;
-	Data_Get_Struct(self, PriorityQueue, priq);
-	int len = priq->len;
-	VALUE rary = rb_iv_get(self, "@heap");
-	
-	len++;
-	rb_ary_store(rary, len, e);
-	priq->len = len;
-	priq_up(priq, self, rary);
-	
-	return Qnil;
+  PriorityQueue *priq;
+  int len;
+  VALUE rary;
+  Data_Get_Struct(self, PriorityQueue, priq);
+  len = priq->len;
+  rary = rb_iv_get(self, "@heap");
+  
+  len++;
+  rb_ary_store(rary, len, e);
+  priq->len = len;
+  priq_up(priq, self, rary);
+  
+  return Qnil;
 }
 
 static VALUE
 frt_priq_insert(VALUE self, VALUE e)
 {
-	PriorityQueue *priq;
-	VALUE *heap, rary;
-	int len, size;
-	rary = rb_iv_get(self, "@heap");
-	
-	Data_Get_Struct(self, PriorityQueue, priq);
-	len = priq->len;
-	size = priq->size;
-	heap = priq->heap;
-	
-	if(len < size){
-		frt_priq_push(self, e);
-		return 1;
-	} else if ((len > 0) && !rb_funcall(self, less_than, 2, e, heap[1])) {
-		heap[1] = e;
-		priq_down(priq, self, rary);
-		return 1;
-	} else {
-		return 0;
+  PriorityQueue *priq;
+  VALUE *heap, rary;
+  int len, size;
+  rary = rb_iv_get(self, "@heap");
+  
+  Data_Get_Struct(self, PriorityQueue, priq);
+  len = priq->len;
+  size = priq->size;
+  heap = priq->heap;
+  
+  if(len < size){
+    frt_priq_push(self, e);
+    return 1;
+  } else if ((len > 0) && !rb_funcall(self, less_than, 2, e, heap[1])) {
+    heap[1] = e;
+    priq_down(priq, self, rary);
+    return 1;
+  } else {
+    return 0;
   }
 }
 
 static VALUE
 frt_priq_top(VALUE self)
 {
-	PriorityQueue *priq;
-	VALUE *heap;
-	int len;
-	
-	Data_Get_Struct(self, PriorityQueue, priq);
-	len = priq->len;
-	heap = priq->heap;
-
-	if(len > 0)
-		return heap[1];
-	else
-		return Qnil;
+  PriorityQueue *priq;
+  VALUE *heap;
+  int len;
+  
+  Data_Get_Struct(self, PriorityQueue, priq);
+  len = priq->len;
+  heap = priq->heap;
+
+  if(len > 0)
+    return heap[1];
+  else
+    return Qnil;
 }
 
 static VALUE
 frt_priq_pop(VALUE self)
 {
-	PriorityQueue *priq;
-	VALUE *heap, rary;
-	int len;
-	
-	Data_Get_Struct(self, PriorityQueue, priq);
-	rary = rb_iv_get(self, "@heap");
-	len = priq->len;
-	heap = priq->heap;
-
-	if(len > 0){
-		VALUE res = heap[1];
-		heap[1] = heap[len];
-		heap[len] = Qnil;
-		len--;
-		priq->len = len;
-		priq_down(priq, self, rary);
-		return res;
-	} else
-		return Qnil;
+  PriorityQueue *priq;
+  VALUE *heap, rary;
+  int len;
+  
+  Data_Get_Struct(self, PriorityQueue, priq);
+  rary = rb_iv_get(self, "@heap");
+  len = priq->len;
+  heap = priq->heap;
+
+  if(len > 0){
+    VALUE res = heap[1];
+    heap[1] = heap[len];
+    heap[len] = Qnil;
+    len--;
+    priq->len = len;
+    priq_down(priq, self, rary);
+    return res;
+  } else
+    return Qnil;
 }
 
 static VALUE
 frt_priq_clear(VALUE self)
 {
-	PriorityQueue *priq;
-	Data_Get_Struct(self, PriorityQueue, priq);
-	VALUE heap = rb_ary_new2(priq->size+1);
-	rb_iv_set(self, "@heap", heap);
-	priq->heap = RARRAY(heap)->ptr;
-	priq->len = 0;
-	return Qnil;
-	
+  PriorityQueue *priq;
+  VALUE heap;
+  Data_Get_Struct(self, PriorityQueue, priq);
+  heap = rb_ary_new2(priq->size+1);
+  rb_iv_set(self, "@heap", heap);
+  priq->heap = RARRAY(heap)->ptr;
+  priq->len = 0;
+  return Qnil;
+  
 }
 
 static VALUE
 frt_priq_size(VALUE self)
 {
-	PriorityQueue *priq;
-	Data_Get_Struct(self, PriorityQueue, priq);
-	return INT2FIX(priq->len);
+  PriorityQueue *priq;
+  Data_Get_Struct(self, PriorityQueue, priq);
+  return INT2FIX(priq->len);
 }
 
 static VALUE
 frt_priq_adjust_top(VALUE self)
 {
-	PriorityQueue *priq;
-	Data_Get_Struct(self, PriorityQueue, priq);
-	VALUE rary = rb_iv_get(self, "@heap");
-	
-	priq_down(priq, self, rary);
-	
-	return Qnil;
+  PriorityQueue *priq;
+  VALUE rary;
+  Data_Get_Struct(self, PriorityQueue, priq);
+  rary = rb_iv_get(self, "@heap");
+  
+  priq_down(priq, self, rary);
+  
+  return Qnil;
 }
 
 
@@ -210,18 +215,18 @@ frt_priq_adjust_top(VALUE self)
 void
 Init_priority_queue(void)
 {
-	less_than = rb_intern("less_than");
-	put_heap = rb_intern("put_heap");
-	
-	cPriorityQueue = rb_define_class_under(mUtils, "PriorityQueue", rb_cObject);
-	rb_define_alloc_func(cPriorityQueue, frt_priq_alloc);
-
-	rb_define_method(cPriorityQueue, "initialize", frt_priq_init, 1);
-	rb_define_method(cPriorityQueue, "pop", frt_priq_pop, 0);
-	rb_define_method(cPriorityQueue, "top", frt_priq_top, 0);
-	rb_define_method(cPriorityQueue, "clear", frt_priq_clear, 0);
-	rb_define_method(cPriorityQueue, "insert", frt_priq_insert, 1);
-	rb_define_method(cPriorityQueue, "push", frt_priq_push, 1);
-	rb_define_method(cPriorityQueue, "size", frt_priq_size, 0);
-	rb_define_method(cPriorityQueue, "adjust_top", frt_priq_adjust_top, 0);
+  less_than = rb_intern("less_than");
+  put_heap = rb_intern("put_heap");
+  
+  cPriorityQueue = rb_define_class_under(mUtils, "PriorityQueue", rb_cObject);
+  rb_define_alloc_func(cPriorityQueue, frt_priq_alloc);
+
+  rb_define_method(cPriorityQueue, "initialize", frt_priq_init, 1);
+  rb_define_method(cPriorityQueue, "pop", frt_priq_pop, 0);
+  rb_define_method(cPriorityQueue, "top", frt_priq_top, 0);
+  rb_define_method(cPriorityQueue, "clear", frt_priq_clear, 0);
+  rb_define_method(cPriorityQueue, "insert", frt_priq_insert, 1);
+  rb_define_method(cPriorityQueue, "push", frt_priq_push, 1);
+  rb_define_method(cPriorityQueue, "size", frt_priq_size, 0);
+  rb_define_method(cPriorityQueue, "adjust_top", frt_priq_adjust_top, 0);
 }

data/ext/ram_directory.c

@@ -1,6 +1,6 @@
 #include "ferret.h"
 
-ID flush, seek;
+ID flush, seek, id_file, id_pointer;
 
 /****************************************************************************
  *
@@ -33,23 +33,24 @@ frt_rf_alloc(VALUE klass)
 {
   RAMFile *rf;
   byte_t *buf;
+  VALUE rrf;
 
-  rf = (RAMFile *)ALLOC(RAMFile);
-  buf = (byte_t *)ALLOC_N(byte_t, BUFFER_SIZE);
-  rf->buffers = (void **)ALLOC_N(void *, 1);
+  rf = ALLOC(RAMFile);
+  buf = ALLOC_N(byte_t, BUFFER_SIZE);
+  rf->buffers = ALLOC_N(void *, 1);
   rf->buffers[0] = buf;
   rf->bufcnt = 1;
   rf->length = 0;
-  rf->mtime = rb_funcall(rb_cTime, frt_newobj, 0);
+  rf->mtime = rb_funcall(rb_cTime, id_new, 0);
 
-  VALUE rrf = Data_Wrap_Struct(klass, frt_rf_mark, frt_rf_free, rf);
+  rrf = Data_Wrap_Struct(klass, frt_rf_mark, frt_rf_free, rf);
   return rrf;
 }
 
 void
 frt_rf_extend(RAMFile *rf)
 {
-  byte_t *buf = (byte_t *)ALLOC_N(byte_t, BUFFER_SIZE);
+  byte_t *buf = ALLOC_N(byte_t, BUFFER_SIZE);
   rf->bufcnt++;
   REALLOC_N(rf->buffers, void *, rf->bufcnt);
   rf->buffers[rf->bufcnt - 1] = buf;
@@ -73,17 +74,17 @@ frt_rf_length(VALUE self)
 static VALUE
 frt_rio_init(VALUE self, VALUE ramfile)
 {
-  rb_iv_set(self, "file", ramfile); 
-  rb_iv_set(self, "pointer", INT2FIX(0)); 
+  rb_ivar_set(self, id_file, ramfile); 
+  rb_ivar_set(self, id_pointer, INT2FIX(0)); 
   return self;
 }
 
 static VALUE
 frt_rio_length(VALUE self)
 {
-	VALUE file = rb_iv_get(self, "file");
+  VALUE file = rb_ivar_get(self, id_file);
   RAMFile *rf;
-	Data_Get_Struct(file, RAMFile, rf);
+  Data_Get_Struct(file, RAMFile, rf);
   return INT2FIX(rf->length);
 }
 
@@ -102,11 +103,12 @@ frt_rio_flush_buffer(VALUE self, VALUE rsrc, VALUE rlen)
   int src_offset;
   int len = FIX2INT(rlen);
   /* char *src = StringValuePtr(rsrc); */
-  int pointer = FIX2INT(rb_iv_get(self, "pointer"));
+  int pointer = FIX2INT(rb_ivar_get(self, id_pointer));
+  byte_t *buffer;
  
-	VALUE file = rb_iv_get(self, "file");
+  VALUE file = rb_ivar_get(self, id_file);
   RAMFile *rf;
-	Data_Get_Struct(file, RAMFile, rf);
+  Data_Get_Struct(file, RAMFile, rf);
 
   buffer_number = (int)(pointer / BUFFER_SIZE);
   buffer_offset = pointer % BUFFER_SIZE;
@@ -115,7 +117,7 @@ frt_rio_flush_buffer(VALUE self, VALUE rsrc, VALUE rlen)
 
   frt_extend_buffer_if_necessary(rf, buffer_number);
 
-  byte_t *buffer = rf->buffers[buffer_number];
+  buffer = rf->buffers[buffer_number];
   MEMCPY(buffer + buffer_offset, RSTRING(rsrc)->ptr, byte_t, bytes_to_copy);
   
   if (bytes_to_copy < len) {
@@ -128,12 +130,12 @@ frt_rio_flush_buffer(VALUE self, VALUE rsrc, VALUE rlen)
     MEMCPY(buffer, RSTRING(rsrc)->ptr + src_offset, byte_t, bytes_to_copy);
   }
   pointer += len;
-  rb_iv_set(self, "pointer", INT2FIX(pointer));
+  rb_ivar_set(self, id_pointer, INT2FIX(pointer));
 
   if (pointer > rf->length)
     rf->length = pointer;
 
-  rf->mtime = rb_funcall(rb_cTime, frt_newobj, 0);
+  rf->mtime = rb_class_new_instance(0, NULL, rb_cTime);
   return Qnil;
 }
 
@@ -142,7 +144,7 @@ frt_rio_seek(VALUE self, VALUE rpos)
 {
   rb_call_super(1, &rpos);
 
-  rb_iv_set(self, "pointer", rpos);
+  rb_ivar_set(self, id_pointer, rpos);
 
   return rpos;
 }
@@ -150,24 +152,23 @@ frt_rio_seek(VALUE self, VALUE rpos)
 static VALUE
 frt_rio_reset(VALUE self)
 {
-	VALUE file = rb_iv_get(self, "file");
+  VALUE file = rb_ivar_get(self, id_file);
   RAMFile *rf;
-	Data_Get_Struct(file, RAMFile, rf);
-
-  rf->length = 0;
+  Data_Get_Struct(file, RAMFile, rf);
 
   rb_funcall(self, seek, 1, INT2FIX(0));
 
+  rf->length = 0;
   return Qnil;
 }
 
 static VALUE
 frt_rio_close(VALUE self)
 {
-	VALUE file = rb_iv_get(self, "file");
+  VALUE file = rb_ivar_get(self, id_file);
   RAMFile *rf;
-	Data_Get_Struct(file, RAMFile, rf);
-  rf->mtime = rb_funcall(rb_cTime, frt_newobj, 0);
+  Data_Get_Struct(file, RAMFile, rf);
+  rf->mtime = rb_funcall(rb_cTime, id_new, 0);
   rb_call_super(0, NULL);
   return Qnil;
 }
@@ -176,14 +177,15 @@ static VALUE
 frt_rio_write_to(VALUE self, VALUE routput)
 {
   int i, len;
-	VALUE file = rb_iv_get(self, "file");
+  int last_buffer_number, last_buffer_offset; 
+  VALUE file = rb_ivar_get(self, id_file);
   RAMFile *rf;
-	Data_Get_Struct(file, RAMFile, rf);
+  Data_Get_Struct(file, RAMFile, rf);
 
   rb_funcall(self, flush, 0);
 
-  int last_buffer_number = (int)(rf->length / BUFFER_SIZE);
-  int last_buffer_offset = rf->length % BUFFER_SIZE;
+  last_buffer_number = (int)(rf->length / BUFFER_SIZE);
+  last_buffer_offset = rf->length % BUFFER_SIZE;
 
   for (i = 0; i < rf->bufcnt; i++) {
     len = ((i == last_buffer_number) ? last_buffer_offset : BUFFER_SIZE);
@@ -202,36 +204,36 @@ frt_rio_write_to(VALUE self, VALUE routput)
 static VALUE
 frt_rii_init(VALUE self, VALUE ramfile)
 {
-  rb_iv_set(self, "file", ramfile); 
-  rb_iv_set(self, "pointer", INT2FIX(0)); 
+  rb_ivar_set(self, id_file, ramfile); 
+  rb_ivar_set(self, id_pointer, INT2FIX(0)); 
   return self;
 }
 
 static VALUE
 frt_rii_length(VALUE self)
 {
-	VALUE file = rb_iv_get(self, "file");
+  VALUE file = rb_ivar_get(self, id_file);
   RAMFile *rf;
-	Data_Get_Struct(file, RAMFile, rf);
+  Data_Get_Struct(file, RAMFile, rf);
   return INT2FIX(rf->length);
 }
 
 static VALUE
 frt_rii_read_internal(VALUE self, VALUE rb, VALUE roffset, VALUE rlen)
 {
-	VALUE file = rb_iv_get(self, "file");
-  RAMFile *rf;
-	Data_Get_Struct(file, RAMFile, rf);
-
   int buffer_number, buffer_offset, bytes_in_buffer, bytes_to_copy;
   int offset = FIX2INT(roffset);
   int len = FIX2INT(rlen);
   int remainder = len;
-  int pointer = FIX2INT(rb_iv_get(self, "pointer"));
+  int pointer = FIX2INT(rb_ivar_get(self, id_pointer));
   int start = pointer;
   byte_t *buffer;
   byte_t *b = (byte_t *)StringValuePtr(rb);
   
+  VALUE file = rb_ivar_get(self, id_file);
+  RAMFile *rf;
+  Data_Get_Struct(file, RAMFile, rf);
+
   while (remainder > 0) {
     buffer_number = (int)(start / BUFFER_SIZE);
     buffer_offset = start % BUFFER_SIZE;
@@ -249,14 +251,14 @@ frt_rii_read_internal(VALUE self, VALUE rb, VALUE roffset, VALUE rlen)
     remainder -= bytes_to_copy;
   }
   
-  rb_iv_set(self, "pointer", INT2FIX(pointer + len));
+  rb_ivar_set(self, id_pointer, INT2FIX(pointer + len));
   return Qnil;
 }
 
 static VALUE
 frt_rii_seek_internal(VALUE self, VALUE rpos)
 {
-  rb_iv_set(self, "pointer", rpos);
+  rb_ivar_set(self, id_pointer, rpos);
   return Qnil;
 }
 
@@ -275,16 +277,19 @@ frt_rii_close(VALUE self)
 void
 Init_ram_directory(void)
 {
+  VALUE cDirectory, cRAMFile;
   /* IDs */
   flush = rb_intern("flush");
   seek = rb_intern("seek");
+  id_file = rb_intern("@file");
+  id_pointer = rb_intern("@pointer");
 
   /* RAMDirectory */
-  VALUE cDirectory = rb_define_class_under(mStore, "Directory", rb_cObject);
+  cDirectory = rb_define_class_under(mStore, "Directory", rb_cObject);
   cRAMDirectory = rb_define_class_under(mStore, "RAMDirectory", cDirectory);
 
   /* RAMFile */
-  VALUE cRAMFile = rb_define_class_under(cRAMDirectory, "RAMFile", rb_cObject);
+  cRAMFile = rb_define_class_under(cRAMDirectory, "RAMFile", rb_cObject);
   rb_define_alloc_func(cRAMFile, frt_rf_alloc);
 
   /* Methods */