From 77f245e62ee7e0bbfd1eb868b759dabe169a29bf Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 1 Sep 2013 01:31:16 +0000 Subject: [PATCH] * numeric.c (rb_fix_bit_length): Moved from bignum.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ bignum.c | 41 ----------------------------------------- numeric.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2dd62fa5d3..1c3a10c09a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Sep 1 10:30:42 2013 Tanaka Akira + + * numeric.c (rb_fix_bit_length): Moved from bignum.c. + Sun Sep 1 09:55:45 2013 Tanaka Akira * internal.h (bit_length): Moved from bignum.c. diff --git a/bignum.c b/bignum.c index 6c65cae40e..8c1bb607b0 100644 --- a/bignum.c +++ b/bignum.c @@ -6606,45 +6606,6 @@ rb_big_bit_length(VALUE big) INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER); } -/* - * call-seq: - * int.bit_length -> integer - * - * Returns the number of bits of the value of int. - * - * "the number of bits" means that - * the bit position of the highest bit which is different to the sign bit. - * (The bit position of the bit 2**n is n+1.) - * If there is no such bit (zero or minus one), zero is returned. - * - * I.e. This method returns ceil(log2(int < 0 ? -int : int+1)). - * - * (-2**12-1).bit_length #=> 13 - * (-2**12).bit_length #=> 12 - * (-2**12+1).bit_length #=> 12 - * -0x101.bit_length #=> 9 - * -0x100.bit_length #=> 8 - * -0xff.bit_length #=> 8 - * -2.bit_length #=> 1 - * -1.bit_length #=> 0 - * 0.bit_length #=> 0 - * 1.bit_length #=> 1 - * 0xff.bit_length #=> 8 - * 0x100.bit_length #=> 9 - * (2**12-1).bit_length #=> 12 - * (2**12).bit_length #=> 13 - * (2**12+1).bit_length #=> 13 - */ - -static VALUE -rb_fix_bit_length(VALUE fix) -{ - long v = FIX2LONG(fix); - if (v < 0) - v = ~v; - return LONG2FIX(bit_length(v)); -} - /* * call-seq: * big.odd? -> true or false @@ -6740,7 +6701,5 @@ Init_Bignum(void) rb_define_method(rb_cBignum, "odd?", rb_big_odd_p, 0); rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0); - rb_define_method(rb_cFixnum, "bit_length", rb_fix_bit_length, 0); - power_cache_init(); } diff --git a/numeric.c b/numeric.c index af456c2db7..5293aa7491 100644 --- a/numeric.c +++ b/numeric.c @@ -3493,6 +3493,45 @@ fix_size(VALUE fix) return INT2FIX(sizeof(long)); } +/* + * call-seq: + * int.bit_length -> integer + * + * Returns the number of bits of the value of int. + * + * "the number of bits" means that + * the bit position of the highest bit which is different to the sign bit. + * (The bit position of the bit 2**n is n+1.) + * If there is no such bit (zero or minus one), zero is returned. + * + * I.e. This method returns ceil(log2(int < 0 ? -int : int+1)). + * + * (-2**12-1).bit_length #=> 13 + * (-2**12).bit_length #=> 12 + * (-2**12+1).bit_length #=> 12 + * -0x101.bit_length #=> 9 + * -0x100.bit_length #=> 8 + * -0xff.bit_length #=> 8 + * -2.bit_length #=> 1 + * -1.bit_length #=> 0 + * 0.bit_length #=> 0 + * 1.bit_length #=> 1 + * 0xff.bit_length #=> 8 + * 0x100.bit_length #=> 9 + * (2**12-1).bit_length #=> 12 + * (2**12).bit_length #=> 13 + * (2**12+1).bit_length #=> 13 + */ + +static VALUE +rb_fix_bit_length(VALUE fix) +{ + long v = FIX2LONG(fix); + if (v < 0) + v = ~v; + return LONG2FIX(bit_length(v)); +} + static VALUE int_upto_size(VALUE from, VALUE args, VALUE eobj) { @@ -3864,6 +3903,7 @@ Init_Numeric(void) rb_define_method(rb_cFixnum, "to_f", fix_to_f, 0); rb_define_method(rb_cFixnum, "size", fix_size, 0); + rb_define_method(rb_cFixnum, "bit_length", rb_fix_bit_length, 0); rb_define_method(rb_cFixnum, "zero?", fix_zero_p, 0); rb_define_method(rb_cFixnum, "odd?", fix_odd_p, 0); rb_define_method(rb_cFixnum, "even?", fix_even_p, 0);