diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-30 12:39:53 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-30 12:39:53 +0000 |
commit | 295113337299ac92eee3895c15a13de3372cfee0 (patch) | |
tree | c9e50313b28ebed27525b91497ab9a1698f6639a | |
parent | f80386489a8cda0508c09445ac9a0bcc4027f33a (diff) | |
download | ruby-295113337299ac92eee3895c15a13de3372cfee0.tar.gz |
Define Integer#/ instead of Bignum#/.
* 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
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | bignum.c | 10 | ||||
-rw-r--r-- | lib/mathn.rb | 2 | ||||
-rw-r--r-- | numeric.c | 16 |
4 files changed, 24 insertions, 12 deletions
@@ -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> * numeric.c (rb_int_plus): Define Integer#+. @@ -6038,15 +6038,6 @@ rb_big_divide(VALUE x, VALUE y, ID op) 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 rb_big_div(VALUE x, VALUE y) { @@ -6821,7 +6812,6 @@ Init_Bignum(void) rb_cBignum = rb_define_class("Bignum", rb_cInteger); 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); diff --git a/lib/mathn.rb b/lib/mathn.rb index d07388bc26..9e33f45580 100644 --- a/lib/mathn.rb +++ b/lib/mathn.rb @@ -79,7 +79,7 @@ end # # (2**72) / ((2**70) * 3) # => 4/3 -class Bignum +class Integer remove_method :/ ## @@ -3421,9 +3421,10 @@ int_fdiv(VALUE x, VALUE y) } /* + * Document-method: Integer#/ * Document-method: Fixnum#/ * call-seq: - * fix / numeric -> numeric_result + * int / numeric -> numeric_result * * 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. @@ -3469,6 +3470,18 @@ fix_div(VALUE x, VALUE 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 * call-seq: @@ -4947,6 +4960,7 @@ Init_Numeric(void) rb_define_method(rb_cFixnum, "*", fix_mul, 1); rb_define_method(rb_cInteger, "*", rb_int_mul, 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_cFixnum, "%", fix_mod, 1); rb_define_method(rb_cInteger, "%", rb_int_modulo, 1); |