aboutsummaryrefslogtreecommitdiffstats
path: root/complex.c
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-10 10:35:08 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-10 10:35:08 +0000
commit2e2fabc4335763199c69379502f8033d50f157a0 (patch)
tree11dbfb655c2f177ba151526e3e7d025580965f85 /complex.c
parent6bf7dd725bf57dc6d52a7fe3353f70d061193d94 (diff)
downloadruby-2e2fabc4335763199c69379502f8033d50f157a0.tar.gz
* complex.c (nucomp_rationalize): calls rationalize of real part if
imaginary part is exactly zero. The patch is made by Marc-Andre Lafortune. fixes [Bug #5178] [ruby-core:38885] * test/ruby/test_complex.rb (test_rationalize): add a test for the above change. * complex.c (nucomp_to_r): fix RDoc comment. The patch is made by Marc-Andre Lafortune. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'complex.c')
-rw-r--r--complex.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/complex.c b/complex.c
index 4be8099ed6..a701129b73 100644
--- a/complex.c
+++ b/complex.c
@@ -1339,7 +1339,8 @@ nucomp_to_f(VALUE self)
* call-seq:
* cmp.to_r -> rational
*
- * Returns the value as a rational if possible.
+ * If the imaginary part is exactly 0, returns the real part as a Rational,
+ * otherwise a RangeError is raised.
*/
static VALUE
nucomp_to_r(VALUE self)
@@ -1358,14 +1359,22 @@ nucomp_to_r(VALUE self)
* call-seq:
* cmp.rationalize([eps]) -> rational
*
- * Returns the value as a rational if possible. An optional argument
- * eps is always ignored.
+ * If the imaginary part is exactly 0, returns the real part as a Rational,
+ * otherwise a RangeError is raised.
*/
static VALUE
nucomp_rationalize(int argc, VALUE *argv, VALUE self)
{
+ get_dat1(self);
+
rb_scan_args(argc, argv, "01", NULL);
- return nucomp_to_r(self);
+
+ if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
+ VALUE s = f_to_s(self);
+ rb_raise(rb_eRangeError, "can't convert %s into Rational",
+ StringValuePtr(s));
+ }
+ return rb_funcall(dat->real, rb_intern("rationalize"), argc, argv);
}
/*