From 907508b25f91d7a34919839d9fb0f4bf10080b68 Mon Sep 17 00:00:00 2001 From: marcandre Date: Sun, 17 Dec 2017 18:19:41 +0000 Subject: [PATCH] Integer#{any|all|no}_bits: Fix coercion. Add specs [#12753] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 3 +++ spec/ruby/core/integer/allbits_spec.rb | 37 ++++++++++++++++++++++++++ spec/ruby/core/integer/anybits_spec.rb | 36 +++++++++++++++++++++++++ spec/ruby/core/integer/nobits_spec.rb | 36 +++++++++++++++++++++++++ 4 files changed, 112 insertions(+) create mode 100644 spec/ruby/core/integer/allbits_spec.rb create mode 100644 spec/ruby/core/integer/anybits_spec.rb create mode 100644 spec/ruby/core/integer/nobits_spec.rb diff --git a/numeric.c b/numeric.c index 93098971fe..918b46e9d3 100644 --- a/numeric.c +++ b/numeric.c @@ -3175,6 +3175,7 @@ int_even_p(VALUE num) static VALUE int_allbits_p(VALUE num, VALUE mask) { + mask = rb_to_int(mask); return rb_int_equal(rb_int_and(num, mask), mask); } @@ -3188,6 +3189,7 @@ int_allbits_p(VALUE num, VALUE mask) static VALUE int_anybits_p(VALUE num, VALUE mask) { + mask = rb_to_int(mask); return num_zero_p(rb_int_and(num, mask)) ? Qfalse : Qtrue; } @@ -3201,6 +3203,7 @@ int_anybits_p(VALUE num, VALUE mask) static VALUE int_nobits_p(VALUE num, VALUE mask) { + mask = rb_to_int(mask); return num_zero_p(rb_int_and(num, mask)); } diff --git a/spec/ruby/core/integer/allbits_spec.rb b/spec/ruby/core/integer/allbits_spec.rb new file mode 100644 index 0000000000..54c99265ba --- /dev/null +++ b/spec/ruby/core/integer/allbits_spec.rb @@ -0,0 +1,37 @@ +require File.expand_path('../../../spec_helper', __FILE__) + +describe "Integer#allbits?" do + it "returns true iff all the bits of the argument are set in the receiver" do + 42.allbits?(42).should == true + 0b1010_1010.allbits?(0b1000_0010).should == true + 0b1010_1010.allbits?(0b1000_0001).should == false + 0b1000_0010.allbits?(0b1010_1010).should == false + (0b1010_1010 | bignum_value).allbits?(0b1000_0010 | bignum_value).should == true + (0b1010_1010 | bignum_value).allbits?(0b1000_0001 | bignum_value).should == false + (0b1000_0010 | bignum_value).allbits?(0b1010_1010 | bignum_value).should == false + end + + it "handles negative values using two's complement notation" do + (~0b1).allbits?(42).should == true + (-42).allbits?(-42).should == true + (~0b1010_1010).allbits?(~0b1110_1011).should == true + (~0b1010_1010).allbits?(~0b1000_0010).should == false + (~(0b1010_1010 | bignum_value)).allbits?(~(0b1110_1011 | bignum_value)).should == true + (~(0b1010_1010 | bignum_value)).allbits?(~(0b1000_0010 | bignum_value)).should == false + end + + it "coerces the rhs using to_int" do + obj = mock("the int 0b10") + obj.should_receive(:to_int).and_return(0b10) + 0b110.allbits?(obj).should == true + end + + it "raises a TypeError when given a non-Integer" do + lambda { + (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10]) + 13.allbits?(obj) + }.should raise_error(TypeError) + lambda { 13.allbits?("10") }.should raise_error(TypeError) + lambda { 13.allbits?(:symbol) }.should raise_error(TypeError) + end +end diff --git a/spec/ruby/core/integer/anybits_spec.rb b/spec/ruby/core/integer/anybits_spec.rb new file mode 100644 index 0000000000..409e2e65c5 --- /dev/null +++ b/spec/ruby/core/integer/anybits_spec.rb @@ -0,0 +1,36 @@ +require File.expand_path('../../../spec_helper', __FILE__) + +describe "Integer#anybits?" do + it "returns true iff all the bits of the argument are set in the receiver" do + 42.anybits?(42).should == true + 0b1010_1010.anybits?(0b1000_0010).should == true + 0b1010_1010.anybits?(0b1000_0001).should == true + 0b1000_0010.anybits?(0b0010_1100).should == false + different_bignum = (2 * bignum_value) & (~bignum_value) + (0b1010_1010 | different_bignum).anybits?(0b1000_0010 | bignum_value).should == true + (0b1010_1010 | different_bignum).anybits?(0b0010_1100 | bignum_value).should == true + (0b1000_0010 | different_bignum).anybits?(0b0010_1100 | bignum_value).should == false + end + + it "handles negative values using two's complement notation" do + (~42).anybits?(42).should == false + (-42).anybits?(-42).should == true + (~0b100).anybits?(~0b1).should == true + (~(0b100 | bignum_value)).anybits?(~(0b1 | bignum_value)).should == true + end + + it "coerces the rhs using to_int" do + obj = mock("the int 0b10") + obj.should_receive(:to_int).and_return(0b10) + 0b110.anybits?(obj).should == true + end + + it "raises a TypeError when given a non-Integer" do + lambda { + (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10]) + 13.anybits?(obj) + }.should raise_error(TypeError) + lambda { 13.anybits?("10") }.should raise_error(TypeError) + lambda { 13.anybits?(:symbol) }.should raise_error(TypeError) + end +end diff --git a/spec/ruby/core/integer/nobits_spec.rb b/spec/ruby/core/integer/nobits_spec.rb new file mode 100644 index 0000000000..5b5d82a040 --- /dev/null +++ b/spec/ruby/core/integer/nobits_spec.rb @@ -0,0 +1,36 @@ +require File.expand_path('../../../spec_helper', __FILE__) + +describe "Integer#nobits?" do + it "returns true iff all no bits of the argument are set in the receiver" do + 42.nobits?(42).should == false + 0b1010_1010.nobits?(0b1000_0010).should == false + 0b1010_1010.nobits?(0b1000_0001).should == false + 0b0100_0101.nobits?(0b1010_1010).should == true + different_bignum = (2 * bignum_value) & (~bignum_value) + (0b1010_1010 | different_bignum).nobits?(0b1000_0010 | bignum_value).should == false + (0b1010_1010 | different_bignum).nobits?(0b1000_0001 | bignum_value).should == false + (0b0100_0101 | different_bignum).nobits?(0b1010_1010 | bignum_value).should == true + end + + it "handles negative values using two's complement notation" do + (~0b1101).nobits?(0b1101).should == true + (-42).nobits?(-42).should == false + (~0b1101).nobits?(~0b10).should == false + (~(0b1101 | bignum_value)).nobits?(~(0b10 | bignum_value)).should == false + end + + it "coerces the rhs using to_int" do + obj = mock("the int 0b10") + obj.should_receive(:to_int).and_return(0b10) + 0b110.nobits?(obj).should == false + end + + it "raises a TypeError when given a non-Integer" do + lambda { + (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10]) + 13.nobits?(obj) + }.should raise_error(TypeError) + lambda { 13.nobits?("10") }.should raise_error(TypeError) + lambda { 13.nobits?(:symbol) }.should raise_error(TypeError) + end +end