ingramj-bitarray 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bitarray.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitarray}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James E. Ingram"]
-  s.date = %q{2009-05-25}
+  s.date = %q{2009-05-30}
   s.description = %q{A bit array class for Ruby, implemented as a C extension. Includes methods for setting and clearing individual bits, and all bits at once. Also has the standard array access methods, [] and []=, and it mixes in Enumerable.}
   s.email = %q{ingramj@gmail.com}
   s.extensions = ["ext/extconf.rb"]

data/ext/bitarray.c

@@ -22,7 +22,7 @@ struct bit_array {
 /* Bit Array manipulation functions. */
 
 /* Set the specified bit to 1. Return 1 on success, 0 on failure. */
-static int
+static inline int
 set_bit(struct bit_array *ba, long bit)
 {
     if (bit < 0) bit += ba->bits;
@@ -36,7 +36,7 @@ set_bit(struct bit_array *ba, long bit)
 
 
 /* Set all bits to 1. */
-static int
+static inline int
 set_all_bits(struct bit_array *ba)
 {
     memset(ba->array, 0xff, (ba->array_size * UINT_BYTES));
@@ -45,7 +45,7 @@ set_all_bits(struct bit_array *ba)
 
 
 /* Clear the specified bit to 0. Return 1 on success, 0 on failure. */
-static int
+static inline int
 clear_bit(struct bit_array *ba, long bit)
 {
     if (bit < 0) bit += ba->bits;
@@ -59,7 +59,7 @@ clear_bit(struct bit_array *ba, long bit)
 
 
 /* Clear all bits to 0. */
-static int
+static inline int
 clear_all_bits(struct bit_array *ba)
 {
     memset(ba->array, 0x00, (ba->array_size * UINT_BYTES));
@@ -68,7 +68,7 @@ clear_all_bits(struct bit_array *ba)
 
 
 /* Toggle the state of the specified bit. Return 1 on success, 0 on failure. */
-static int
+static inline int
 toggle_bit(struct bit_array *ba, long bit)
 {
     if (bit < 0) bit += ba->bits;
@@ -82,7 +82,7 @@ toggle_bit(struct bit_array *ba, long bit)
 
 
 /* Toggle the state of all bits. */
-static int
+static inline int
 toggle_all_bits(struct bit_array *ba)
 {
     long i;
@@ -95,7 +95,7 @@ toggle_all_bits(struct bit_array *ba)
 
 /* Assign the specified value to a bit. Return 1 on success, 0 on invalid bit
  * index, and -1 on invalid value. */
-static int
+static inline int
 assign_bit(struct bit_array *ba, long bit, int value)
 {
     if (value == 0) {
@@ -109,7 +109,7 @@ assign_bit(struct bit_array *ba, long bit, int value)
 
 
 /* Get the state of the specified bit. Return -1 on failure. */
-static int
+static inline int
 get_bit(struct bit_array *ba, long bit)
 {
     if (bit < 0) bit += ba->bits;
@@ -127,7 +127,7 @@ get_bit(struct bit_array *ba, long bit)
 
 
 /* Return the number of set bits in the array. */
-static long
+static inline long
 total_set(struct bit_array *ba)
 {
     /* This is basically the algorithm from K&R, with a running total for all
@@ -610,6 +610,29 @@ rb_bitarray_inspect(VALUE self)
 }
 
 
+/* call-seq:
+ *      bitarray.to_a           -> an_array
+ *
+ * Creates a Ruby Array from bitarray.
+ */
+static VALUE
+rb_bitarray_to_a(VALUE self)
+{
+    struct bit_array *ba;
+    Data_Get_Struct(self, struct bit_array, ba);
+
+    long array_size = ba->bits;
+    VALUE c_array[array_size];
+    
+    int i;
+    for (i = 0; i < array_size; i++) {
+        c_array[i] = INT2FIX(get_bit(ba, i));
+    }
+
+    return rb_ary_new4(array_size, c_array);
+}
+
+
 /* call-seq:
  *      bitarray.each {|bit| block }        -> bitarray
  *
@@ -671,6 +694,7 @@ Init_bitarray()
     rb_define_method(rb_bitarray_class, "[]", rb_bitarray_bitref, -1);
     rb_define_alias(rb_bitarray_class, "slice", "[]");
     rb_define_method(rb_bitarray_class, "[]=", rb_bitarray_assign_bit, 2);
+    rb_define_method(rb_bitarray_class, "to_a", rb_bitarray_to_a, 0);
     rb_define_method(rb_bitarray_class, "inspect", rb_bitarray_inspect, 0);
     rb_define_alias(rb_bitarray_class, "to_s", "inspect");
     rb_define_method(rb_bitarray_class, "each", rb_bitarray_each, 0);

data/test/bm.rb

@@ -26,6 +26,10 @@ Benchmark.bm(28) { |bm|
   bm.report("BitField to_s")       { 10000.times { bf.to_s } }
   bm.report("BitArray to_s")       { 10000.times { ba.to_s } }
 
+  puts "---------------------------- To Array (10,000 iterations)"
+  bm.report("BitField to_a")       { 10000.times { bf.to_a } }
+  bm.report("BitArray to_a")       { 10000.times { ba.to_a } }
+
   puts "---------------------------- Total Set (100,000 iterations)"
   bf = BitField.new(256)
   ba = BitArray.new(256)

data/test/test.rb

@@ -133,5 +133,12 @@ class TestLibraryFileName < Test::Unit::TestCase
     ba3 = ba2 + ba1
     assert_equal "111111100000000000000000000000000000000", ba3.to_s
   end
+
+  def test_to_a
+    ba = BitArray.new(16)
+    ba[1] = 1
+    ba[5] = 1
+    assert_equal [0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0], ba.to_a
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ingramj-bitarray
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - James E. Ingram
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
+date: 2009-05-30 00:00:00 -07:00
 default_executable: 
 dependencies: []