kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* numeric.c (num_quo): Use to_r method to convert the receiver to

Browse source 
rational.  [ruby-core:41575] [Bug #5736]

* test/ruby/test_numeric.rb: add a test for the above change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2013-06-06 13:31:22 +00:00
parent b1411888d1
commit 7708560bb1
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Jun 6 22:24:00 2013 Kenta Murata <mrkn@mrkn.jp>
* numeric.c (num_quo): Use to_r method to convert the receiver to
rational. [ruby-core:41575] [Bug #5736]
* test/ruby/test_numeric.rb: add a test for the above change.
Thu Jun 6 20:40:17 2013 Tanaka Akira <akr@fsij.org> Thu Jun 6 20:40:17 2013 Tanaka Akira <akr@fsij.org>
* configure.in: Invoke RUBY_REPLACE_TYPE for size_t. * configure.in: Invoke RUBY_REPLACE_TYPE for size_t.

6
numeric.c
View file

@ -101,7 +101,7 @@ static VALUE fix_uminus(VALUE num);
static VALUE fix_mul(VALUE x, VALUE y); static VALUE fix_mul(VALUE x, VALUE y);
static VALUE int_pow(long x, unsigned long y); static VALUE int_pow(long x, unsigned long y);
static ID id_coerce, id_to_i, id_eq, id_div; static ID id_coerce, id_to_i, id_to_r, id_eq, id_div;
VALUE rb_cNumeric; VALUE rb_cNumeric;
VALUE rb_cFloat; VALUE rb_cFloat;
@ -398,7 +398,8 @@ num_quo(VALUE x, VALUE y)
return num_fdiv(x, y); return num_fdiv(x, y);
} }
return rb_funcall(rb_rational_raw1(x), '/', 1, y); x = rb_convert_type(x, T_RATIONAL, "Rational", "to_r");
return rb_funcall(x, '/', 1, y);
} }
@ -3774,6 +3775,7 @@ Init_Numeric(void)
#endif #endif
id_coerce = rb_intern("coerce"); id_coerce = rb_intern("coerce");
id_to_i = rb_intern("to_i"); id_to_i = rb_intern("to_i");
id_to_r = rb_intern("to_r");
id_eq = rb_intern("=="); id_eq = rb_intern("==");
id_div = rb_intern("div"); id_div = rb_intern("div");

15
test/ruby/test_numeric.rb
View file

@ -54,7 +54,20 @@ class TestNumeric < Test::Unit::TestCase
end end
def test_quo def test_quo
assert_raise(ArgumentError) {DummyNumeric.new.quo(1)} assert_raise(TypeError) {DummyNumeric.new.quo(1)}
end
def test_quo_ruby_core_41575
x = DummyNumeric.new
rat = 84.quo(1)
DummyNumeric.class_eval do
define_method(:to_r) { rat }
end
assert_equal(2.quo(1), x.quo(42), '[ruby-core:41575]')
ensure
DummyNumeric.class_eval do
remove_method :to_r
end
end end
def test_divmod def test_divmod