Fix bug where set operations affect two bits (64/32 bit issue)

tyler · Feb 26, 2011 · 8efca8f · 8efca8f
1 parent f5b378b
commit 8efca8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ext/bitset/bitset.c b/ext/bitset/bitset.c
@@ -55,8 +55,8 @@ void raise_index_error() {
     rb_raise(rb_eIndexError, "Index out of bounds");
 }
 
-#define _bit_segment(bit) ((bit) >> 6)
-#define _bit_mask(bit) (1 << ((bit) & 0x3f))
+#define _bit_segment(bit) ((bit) >> 6UL)
+#define _bit_mask(bit) (1UL << ((bit) & 0x3f))
 
 void validate_index(Bitset * bs, int idx) {
     if(idx < 0 || idx >= bs->len)

diff --git a/spec/bitset_spec.rb b/spec/bitset_spec.rb
@@ -104,6 +104,12 @@
       bs.clear?(0,2,3,6).should == true
     end
 
+    it 'returns works with the full range of 64 bit values'  do
+      bs = Bitset.new(68)
+      bs.set 0, 2, 66
+      bs.clear?(32, 33, 34).should == true
+    end
+
     it 'returns False if not all bits indexed are clear' do
       bs = Bitset.new(8)
       bs.set 1, 4
@@ -231,6 +237,10 @@
       bs = Bitset.new(4)
       bs.set 0, 2
       bs.to_s.should == "1010"
+
+      bs = Bitset.new(68)
+      bs.set 0, 2, 66
+      bs.to_s.should == "101" + ("0" * 63) + "10"
     end
   end