yugui	2009-06-21 19:34:14 +0900 (Sun, 21 Jun 2009)

  New Revision: 23796

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

  Log:
    merges r23727 from trunk into ruby_1_9_1.
    --
    * rational.c (nurat_coerce): accepts Complex when the imag is
      exact zero.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/rational.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23795)
+++ ruby_1_9_1/ChangeLog	(revision 23796)
@@ -1,3 +1,8 @@
+Wed Jun 17 23:46:08 2009  Tadayoshi Funaba  <tadf@d...>
+
+	* rational.c (nurat_coerce): accepts Complex when the imag is
+	  exact zero.
+
 Wed Jun 17 16:57:40 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* load.c (rb_f_require): RDoc updated.  a patch from Run Paint Run
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23795)
+++ ruby_1_9_1/version.h	(revision 23796)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 186
+#define RUBY_PATCHLEVEL 187
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/rational.c
===================================================================
--- ruby_1_9_1/rational.c	(revision 23795)
+++ ruby_1_9_1/rational.c	(revision 23796)
@@ -904,6 +904,10 @@
 	return rb_assoc_new(other, f_to_f(self));
       case T_RATIONAL:
 	return rb_assoc_new(other, self);
+      case T_COMPLEX:
+	if (k_exact_p(RCOMPLEX(other)->imag) && f_zero_p(RCOMPLEX(other)->imag))
+	    return rb_assoc_new(f_rational_new_bang1
+				(CLASS_OF(self), RCOMPLEX(other)->real), self);
     }
 
     rb_raise(rb_eTypeError, "%s can't be coerced into %s",

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