naruse	2011-11-30 18:23:04 +0900 (Wed, 30 Nov 2011)

  New Revision: 33907

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33907

  Log:
    merge revision(s) r33613:
    
    * complex.c (nucomp_rationalize): fix function.  [ruby-core:40667]
      [Bug #5546]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/complex.c
    branches/ruby_1_9_3/test/ruby/test_complex.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/complex.c
===================================================================
--- ruby_1_9_3/complex.c	(revision 33906)
+++ ruby_1_9_3/complex.c	(revision 33907)
@@ -1374,7 +1374,7 @@
        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);
 }
 
 /*
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33906)
+++ ruby_1_9_3/ChangeLog	(revision 33907)
@@ -1,3 +1,8 @@
+Wed Nov 30 18:22:10 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* complex.c (nucomp_rationalize): fix function.  [ruby-core:40667]
+	  [Bug #5546]
+
 Thu Nov 17 10:36:46 2011  Aaron Patterson <aaron@t...>
 
 	* ext/psych/lib/psych.rb (load_file): make sure opened yaml files are
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 33906)
+++ ruby_1_9_3/version.h	(revision 33907)
@@ -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
Index: ruby_1_9_3/test/ruby/test_complex.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_complex.rb	(revision 33906)
+++ ruby_1_9_3/test/ruby/test_complex.rb	(revision 33907)
@@ -16,6 +16,7 @@
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/