From c9592384450b7ac21a69d454d92bb8b65cb40b17 Mon Sep 17 00:00:00 2001 From: gogotanaka Date: Tue, 24 Mar 2015 21:59:36 +0000 Subject: [PATCH] * complex.c (k_inexact_p, k_exact_zero_p): use k_exact_zero_p macro to remove k_inexact_p macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ complex.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34a226c04e..404d99d67a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 25 06:55:43 2015 Kazuki Tanaka + + * complex.c (k_inexact_p, k_exact_zero_p): use k_exact_zero_p macro + to remove k_inexact_p macro. + Tue Mar 24 22:23:33 2015 SHIBATA Hiroshi * doc/extention.rdoc: move from toplevel document and added extname. diff --git a/complex.c b/complex.c index 65ae87e7f7..fc1e270453 100644 --- a/complex.c +++ b/complex.c @@ -265,7 +265,6 @@ k_complex_p(VALUE x) } #define k_exact_p(x) (!k_float_p(x)) -#define k_inexact_p(x) k_float_p(x) #define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x)) #define k_exact_one_p(x) (k_exact_p(x) && f_one_p(x)) @@ -1435,7 +1434,7 @@ nucomp_to_i(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Integer", self); } @@ -1458,7 +1457,7 @@ nucomp_to_f(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Float", self); } @@ -1483,7 +1482,7 @@ nucomp_to_r(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational", self); } @@ -1510,7 +1509,7 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "01", NULL); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational", self); }