1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define Integer#/ instead of Bignum#/.

Browse Source 
* numeric.c (rb_int_div): Define Integer#/.

* bignum.c (rb_big_div): Don't define Bignum#/.

* lib/mathn.rb (Integer#/): Replace Integer#/ instead of Bignum#/.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2016-04-30 12:39:53 +00:00
parent d0e2d150b8
commit 8248c26e6d
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Apr 30 21:28:14 2016 Tanaka Akira <akr@fsij.org>
* numeric.c (rb_int_div): Define Integer#/.
* bignum.c (rb_big_div): Don't define Bignum#/.
* lib/mathn.rb (Integer#/): Replace Integer#/ instead of Bignum#/.
Sat Apr 30 21:11:08 2016 Tanaka Akira <akr@fsij.org> Sat Apr 30 21:11:08 2016 Tanaka Akira <akr@fsij.org>
* numeric.c (rb_int_plus): Define Integer#+. * numeric.c (rb_int_plus): Define Integer#+.

10
bignum.c
View File

@ -6038,15 +6038,6 @@ rb_big_divide(VALUE x, VALUE y, ID op)
return bignorm(z); return bignorm(z);
} }
/*
* call-seq:
* big / other -> Numeric
*
* Performs division: the class of the resulting object depends on
* the class of <code>numeric</code> and on the magnitude of the
* result.
*/
VALUE VALUE
rb_big_div(VALUE x, VALUE y) rb_big_div(VALUE x, VALUE y)
{ {
@ -6821,7 +6812,6 @@ Init_Bignum(void)
rb_cBignum = rb_define_class("Bignum", rb_cInteger); rb_cBignum = rb_define_class("Bignum", rb_cInteger);
rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1); rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1);
rb_define_method(rb_cBignum, "/", rb_big_div, 1);
rb_define_method(rb_cBignum, "===", rb_big_eq, 1); rb_define_method(rb_cBignum, "===", rb_big_eq, 1);

2
lib/mathn.rb
View File

@ -79,7 +79,7 @@ end
# #
# (2**72) / ((2**70) * 3) # => 4/3 # (2**72) / ((2**70) * 3) # => 4/3
class Bignum class Integer
remove_method :/ remove_method :/
## ##

16
numeric.c
View File

@ -3421,9 +3421,10 @@ int_fdiv(VALUE x, VALUE y)
} }
/* /*
* Document-method: Integer#/
* Document-method: Fixnum#/ * Document-method: Fixnum#/
* call-seq: * call-seq:
* fix / numeric -> numeric_result * int / numeric -> numeric_result
* *
* Performs division: the class of the resulting object depends on the class of * Performs division: the class of the resulting object depends on the class of
* +numeric+ and on the magnitude of the result. It may return a Bignum. * +numeric+ and on the magnitude of the result. It may return a Bignum.
@ -3469,6 +3470,18 @@ fix_div(VALUE x, VALUE y)
return fix_divide(x, y, '/'); return fix_divide(x, y, '/');
} }
VALUE
rb_int_div(VALUE x, VALUE y)
{
if (FIXNUM_P(x)) {
return fix_div(x, y);
}
else if (RB_TYPE_P(x, T_BIGNUM)) {
return rb_big_div(x, y);
}
return Qnil;
}
/* /*
* Document-method: Integer#div * Document-method: Integer#div
* call-seq: * call-seq:
@ -4947,6 +4960,7 @@ Init_Numeric(void)
rb_define_method(rb_cFixnum, "*", fix_mul, 1); rb_define_method(rb_cFixnum, "*", fix_mul, 1);
rb_define_method(rb_cInteger, "*", rb_int_mul, 1); rb_define_method(rb_cInteger, "*", rb_int_mul, 1);
rb_define_method(rb_cFixnum, "/", fix_div, 1); rb_define_method(rb_cFixnum, "/", fix_div, 1);
rb_define_method(rb_cInteger, "/", rb_int_div, 1);
rb_define_method(rb_cInteger, "div", rb_int_idiv, 1); rb_define_method(rb_cInteger, "div", rb_int_idiv, 1);
rb_define_method(rb_cFixnum, "%", fix_mod, 1); rb_define_method(rb_cFixnum, "%", fix_mod, 1);
rb_define_method(rb_cInteger, "%", rb_int_modulo, 1); rb_define_method(rb_cInteger, "%", rb_int_modulo, 1);