From 6562c6ecc253b7b5f743d323092bc2be5c4dce87 Mon Sep 17 00:00:00 2001 From: mrkn Date: Fri, 18 Nov 2016 15:17:19 +0000 Subject: complex.c: optimize f_negate * complex.c (f_negate): optimize for special numeric types. * complex.c (nucomp_expt): use rb_int_uminus instead of f_negate for fixnum value. * internal.h (rb_float_uminus, rb_rational_uminus): exported. * numeric.c (rb_float_uminus): rename from flo_uminus. * rational.c (rb_rational_uminus): rename from nurat_negate, and add assertion for the parameter. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- rational.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'rational.c') diff --git a/rational.c b/rational.c index ee73426786..f2b83a347a 100644 --- a/rational.c +++ b/rational.c @@ -620,10 +620,12 @@ nurat_denominator(VALUE self) * * Negates +rat+. */ -static VALUE -nurat_negate(VALUE self) +VALUE +rb_rational_uminus(VALUE self) { + const int unused = (assert(RB_TYPE_P(self, T_RATIONAL)), 0); get_dat1(self); + (void)unused; return f_rational_new2(CLASS_OF(self), rb_int_uminus(dat->num), dat->den); } @@ -1644,7 +1646,7 @@ nurat_rationalize(int argc, VALUE *argv, VALUE self) return self; if (nurat_negative_p(self)) - return nurat_negate(nurat_rationalize(argc, argv, nurat_negate(self))); + return rb_rational_uminus(nurat_rationalize(argc, argv, rb_rational_uminus(self))); rb_scan_args(argc, argv, "01", &e); e = f_abs(e); @@ -2200,7 +2202,7 @@ float_rationalize(int argc, VALUE *argv, VALUE self) double d = RFLOAT_VALUE(self); if (d < 0.0) - return nurat_negate(float_rationalize(argc, argv, DBL2NUM(-d))); + return rb_rational_uminus(float_rationalize(argc, argv, DBL2NUM(-d))); rb_scan_args(argc, argv, "01", &e); @@ -2339,7 +2341,7 @@ read_num(const char **s, int numsign, int strict, } if (numsign == '-') - *num = nurat_negate(*num); + *num = rb_rational_uminus(*num); if (!NIL_P(exp)) { VALUE l = f_expt10(exp); *num = nurat_mul(*num, l); @@ -2637,7 +2639,7 @@ Init_Rational(void) rb_define_method(rb_cRational, "numerator", nurat_numerator, 0); rb_define_method(rb_cRational, "denominator", nurat_denominator, 0); - rb_define_method(rb_cRational, "-@", nurat_negate, 0); + rb_define_method(rb_cRational, "-@", rb_rational_uminus, 0); rb_define_method(rb_cRational, "+", rb_rational_plus, 1); rb_define_method(rb_cRational, "-", nurat_sub, 1); rb_define_method(rb_cRational, "*", nurat_mul, 1); -- cgit v1.2.3