merges r23718 from trunk into ruby_1_9_1.

--
	* complex.c (nucomp_coerce): accepts Complex instances.

	* rational.c (nurat_coerce): accepts Rational
	  instances. [ruby-core:23859]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/complex.c b/complex.c
index b3b55c685..62bc7a6f3 100644
--- a/complex.c
+++ b/complex.c
@@ -753,6 +753,8 @@ nucomp_coerce(VALUE self, VALUE other)
 {
     if (k_numeric_p(other) && f_real_p(other))
 	return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
+    if (TYPE(other) == T_COMPLEX)
+	return rb_assoc_new(other, self);
 
     rb_raise(rb_eTypeError, "%s can't be coerced into %s",
 	     rb_obj_classname(other), rb_obj_classname(self));