diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-27 11:56:03 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-27 11:56:03 +0000 |
commit | a7c759f8e84f2d5bd929b54a751fe5c28d77e43b (patch) | |
tree | 0c71b9a6291d3c2b407e44d63f220777d7478308 | |
parent | 7a5708372a5d88cf30ae490b34b3680e07331eed (diff) | |
download | ruby-a7c759f8e84f2d5bd929b54a751fe5c28d77e43b.tar.gz |
{Fixnum,Bignum}#[] is unified into Integer.
* numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into
Integer.
* bignum.c (rb_big_aref): Don't define Bignum#<<.
* internal.h (rb_big_aref): Declared.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | bignum.c | 22 | ||||
-rw-r--r-- | internal.h | 1 | ||||
-rw-r--r-- | numeric.c | 48 |
4 files changed, 44 insertions, 40 deletions
@@ -1,3 +1,12 @@ +Wed Apr 27 20:53:59 2016 Tanaka Akira <akr@fsij.org> + + * numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into + Integer. + + * bignum.c (rb_big_aref): Don't define Bignum#<<. + + * internal.h (rb_big_aref): Declared. + Wed Apr 27 16:10:35 2016 NARUSE, Yui <naruse@ruby-lang.org> * tool/instruction.rb: fix to follow current implementation. @@ -31,8 +40,6 @@ Tue Apr 26 21:11:02 2016 Tanaka Akira <akr@fsij.org> * bignum.c (rb_big_lshift): Don't define Bignum#<<. - * internal.h (rb_big_lshift): Declared. - Tue Apr 26 20:59:40 2016 Tanaka Akira <akr@fsij.org> * numeric.c (rb_int_rshift): {Fixnum,Bignum}#>> is unified into @@ -40,8 +47,6 @@ Tue Apr 26 20:59:40 2016 Tanaka Akira <akr@fsij.org> * bignum.c (rb_big_rshift): Don't define Bignum#>>. - * internal.h (rb_big_rshift): Declared. - Tue Apr 26 20:46:16 2016 Tanaka Akira <akr@fsij.org> * numeric.c (int_size): {Fixnum,Bignum}#size is unified into Integer. @@ -6771,26 +6771,7 @@ rb_big_rshift(VALUE x, VALUE y) } } -/* - * call-seq: - * big[n] -> 0, 1 - * - * Bit Reference---Returns the <em>n</em>th bit in the (assumed) binary - * representation of <i>big</i>, where <i>big</i>[0] is the least - * significant bit. - * - * a = 9**15 - * 50.downto(0) do |n| - * print a[n] - * end - * - * <em>produces:</em> - * - * 000101110110100000111000011110010100111100010111001 - * - */ - -static VALUE +VALUE rb_big_aref(VALUE x, VALUE y) { BDIGIT *xds; @@ -7006,7 +6987,6 @@ Init_Bignum(void) rb_define_method(rb_cBignum, "|", rb_big_or, 1); rb_define_method(rb_cBignum, "^", rb_big_xor, 1); rb_define_method(rb_cBignum, "~", rb_big_neg, 0); - rb_define_method(rb_cBignum, "[]", rb_big_aref, 1); rb_define_method(rb_cBignum, "==", rb_big_eq, 1); rb_define_method(rb_cBignum, ">", big_gt, 1); diff --git a/internal.h b/internal.h index b51a75113d..148f160c62 100644 --- a/internal.h +++ b/internal.h @@ -781,6 +781,7 @@ size_t rb_big_size(VALUE); VALUE rb_integer_float_cmp(VALUE x, VALUE y); VALUE rb_integer_float_eq(VALUE x, VALUE y); VALUE rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base); +VALUE rb_big_aref(VALUE x, VALUE y); VALUE rb_big_abs(VALUE x); VALUE rb_big_size_m(VALUE big); VALUE rb_big_bit_length(VALUE big); @@ -4025,20 +4025,6 @@ rb_int_rshift(VALUE x, VALUE y) return Qnil; } -/* - * call-seq: - * fix[n] -> 0, 1 - * - * Bit Reference---Returns the +n+th bit in the binary representation of - * +fix+, where <code>fix[0]</code> is the least significant bit. - * - * For example: - * - * a = 0b11001100101010 - * 30.downto(0) do |n| print a[n] end - * #=> 0000000000000000011001100101010 - */ - static VALUE fix_aref(VALUE fix, VALUE idx) { @@ -4068,6 +4054,38 @@ fix_aref(VALUE fix, VALUE idx) /* * call-seq: + * fix[n] -> 0, 1 + * + * Bit Reference---Returns the +n+th bit in the binary representation of + * +fix+, where <code>fix[0]</code> is the least significant bit. + * + * For example: + * + * a = 0b11001100101010 + * 30.downto(0) do |n| print a[n] end + * #=> 0000000000000000011001100101010 + * + * a = 9**15 + * 50.downto(0) do |n| + * print a[n] + * end + * #=> 000101110110100000111000011110010100111100010111001 + */ + +static VALUE +int_aref(VALUE num, VALUE idx) +{ + if (FIXNUM_P(num)) { + return fix_aref(num, idx); + } + else if (RB_TYPE_P(num, T_BIGNUM)) { + return rb_big_aref(num, idx); + } + return Qnil; +} + +/* + * call-seq: * int.to_f -> float * * Converts +int+ to a +Float+. If +int+ doesn't fit in a +Float+, @@ -4703,7 +4721,7 @@ Init_Numeric(void) rb_define_method(rb_cFixnum, "&", fix_and, 1); rb_define_method(rb_cFixnum, "|", fix_or, 1); rb_define_method(rb_cFixnum, "^", fix_xor, 1); - rb_define_method(rb_cFixnum, "[]", fix_aref, 1); + rb_define_method(rb_cInteger, "[]", int_aref, 1); rb_define_method(rb_cInteger, "<<", rb_int_lshift, 1); rb_define_method(rb_cInteger, ">>", rb_int_rshift, 1); |