From 5ce73b510ea1b0379ad6644d3db6239584cb9cad Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 30 Nov 2011 09:23:04 +0000 Subject: merge revision(s) r33613: * complex.c (nucomp_rationalize): fix function. [ruby-core:40667] [Bug #5546] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ complex.c | 2 +- test/ruby/test_complex.rb | 1 + version.h | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd816352fe..f7ba56a348 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 30 18:22:10 2011 Nobuyoshi Nakada + + * complex.c (nucomp_rationalize): fix function. [ruby-core:40667] + [Bug #5546] + Thu Nov 17 10:36:46 2011 Aaron Patterson * ext/psych/lib/psych.rb (load_file): make sure opened yaml files are diff --git a/complex.c b/complex.c index a701129b73..1617054816 100644 --- a/complex.c +++ b/complex.c @@ -1374,7 +1374,7 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self) rb_raise(rb_eRangeError, "can't convert %s into Rational", StringValuePtr(s)); } - return rb_funcall(dat->real, rb_intern("rationalize"), argc, argv); + return rb_funcall2(dat->real, rb_intern("rationalize"), argc, argv); } /* diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb index 7ff64927ac..b2f9e8dff0 100644 --- a/test/ruby/test_complex.rb +++ b/test/ruby/test_complex.rb @@ -16,6 +16,7 @@ class Complex_Test < Test::Unit::TestCase def test_rationalize assert_equal(1.quo(3), Complex(1/3.0, 0).rationalize, '[ruby-core:38885]') assert_equal(1.quo(5), Complex(0.2, 0).rationalize, '[ruby-core:38885]') + assert_equal(5.quo(2), Complex(2.5, 0).rationalize(0), '[ruby-core:40667]') end def test_compsub diff --git a/version.h b/version.h index 937b374b47..dcbf7403ff 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 4 +#define RUBY_PATCHLEVEL 5 #define RUBY_RELEASE_DATE "2011-11-30" #define RUBY_RELEASE_YEAR 2011 -- cgit v1.2.3