From 6c0f7d19ba97b0a2116004d830a2565c2c0836d4 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 21 Jun 2009 09:16:44 +0000 Subject: 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 --- complex.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'complex.c') 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)); -- cgit