ruby-changes:54138
From: nobu <ko1@a...>
Date: Wed, 12 Dec 2018 20:06:52 +0900 (JST)
Subject: [ruby-changes:54138] nobu:r66359 (trunk): complex.c: rb_complex_new_polar
nobu 2018-12-12 20:06:47 +0900 (Wed, 12 Dec 2018) New Revision: 66359 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66359 Log: complex.c: rb_complex_new_polar * complex.c (rb_complex_new_polar): renamed with _new to clarify that it creates a new instance, but is not an instance method. * complex.c (rb_complex_polar): deprecated. Modified files: trunk/bignum.c trunk/complex.c trunk/include/ruby/intern.h trunk/internal.h trunk/numeric.c Index: numeric.c =================================================================== --- numeric.c (revision 66358) +++ numeric.c (revision 66359) @@ -1308,7 +1308,7 @@ rb_float_pow(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/numeric.c#L1308 dx = RFLOAT_VALUE(x); dy = RFLOAT_VALUE(y); if (dx < 0 && dy != round(dy)) - return rb_dbl_complex_polar_pi(pow(-dx, dy), dy); + return rb_dbl_complex_new_polar_pi(pow(-dx, dy), dy); } else { return rb_num_coerce_bin(x, y, idPow); @@ -4083,7 +4083,7 @@ fix_pow(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/numeric.c#L4083 if (a == 1) return DBL2NUM(1.0); { if (a < 0 && dy != round(dy)) - return rb_dbl_complex_polar_pi(pow(-(double)a, dy), dy); + return rb_dbl_complex_new_polar_pi(pow(-(double)a, dy), dy); return DBL2NUM(pow((double)a, dy)); } } Index: internal.h =================================================================== --- internal.h (revision 66358) +++ internal.h (revision 66359) @@ -1384,7 +1384,7 @@ VALUE rb_complex_plus(VALUE, VALUE); https://github.com/ruby/ruby/blob/trunk/internal.h#L1384 VALUE rb_complex_mul(VALUE, VALUE); VALUE rb_complex_abs(VALUE x); VALUE rb_complex_sqrt(VALUE x); -VALUE rb_dbl_complex_polar_pi(double abs, double ang); +VALUE rb_dbl_complex_new_polar_pi(double abs, double ang); VALUE rb_complex_pow(VALUE self, VALUE other); struct rb_thread_struct; Index: bignum.c =================================================================== --- bignum.c (revision 66358) +++ bignum.c (revision 66359) @@ -6237,7 +6237,7 @@ rb_big_pow(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/bignum.c#L6237 if (RB_FLOAT_TYPE_P(y)) { d = RFLOAT_VALUE(y); if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x))) { - return rb_dbl_complex_polar_pi(pow(-rb_big2dbl(x), d), d); + return rb_dbl_complex_new_polar_pi(pow(-rb_big2dbl(x), d), d); } } else if (RB_BIGNUM_TYPE_P(y)) { Index: complex.c =================================================================== --- complex.c (revision 66358) +++ complex.c (revision 66359) @@ -546,7 +546,7 @@ f_complex_polar(VALUE klass, VALUE x, VA https://github.com/ruby/ruby/blob/trunk/complex.c#L546 /* returns a Complex or Float of ang*PI-rotated abs */ VALUE -rb_dbl_complex_polar_pi(double abs, double ang) +rb_dbl_complex_new_polar_pi(double abs, double ang) { double fi; const double fr = modf(ang, &fi); @@ -1382,12 +1382,18 @@ rb_complex_new(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/complex.c#L1382 } VALUE -rb_complex_polar(VALUE x, VALUE y) +rb_complex_new_polar(VALUE x, VALUE y) { return f_complex_polar(rb_cComplex, x, y); } VALUE +rb_complex_polar(VALUE x, VALUE y) +{ + return rb_complex_new_polar(x, y); +} + +VALUE rb_Complex(VALUE x, VALUE y) { VALUE a[2]; @@ -1737,7 +1743,7 @@ read_comp(const char **s, int strict, https://github.com/ruby/ruby/blob/trunk/complex.c#L1743 return 0; /* e.g. "1@-" */ } num2 = str2num(bb); - *ret = rb_complex_polar(num, num2); + *ret = rb_complex_new_polar(num, num2); if (!st) return 0; /* e.g. "1@2." */ else Index: include/ruby/intern.h =================================================================== --- include/ruby/intern.h (revision 66358) +++ include/ruby/intern.h (revision 66359) @@ -188,7 +188,8 @@ VALUE rb_complex_raw(VALUE, VALUE); https://github.com/ruby/ruby/blob/trunk/include/ruby/intern.h#L188 VALUE rb_complex_new(VALUE, VALUE); #define rb_complex_new1(x) rb_complex_new((x), INT2FIX(0)) #define rb_complex_new2(x,y) rb_complex_new((x), (y)) -VALUE rb_complex_polar(VALUE, VALUE); +VALUE rb_complex_new_polar(VALUE abs, VALUE arg); +DEPRECATED_BY(rb_complex_new_polar, VALUE rb_complex_polar(VALUE abs, VALUE arg)); VALUE rb_Complex(VALUE, VALUE); #define rb_Complex1(x) rb_Complex((x), INT2FIX(0)) #define rb_Complex2(x,y) rb_Complex((x), (y)) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/