From dc8afd385de88dfc77ed9d246f9664b87420eb03 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 12 Dec 2018 11:06:47 +0000
Subject: 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 bignum.c              |  2 +-
 complex.c             | 12 +++++++++---
 include/ruby/intern.h |  3 ++-
 internal.h            |  2 +-
 numeric.c             |  4 ++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/bignum.c b/bignum.c
index b3046f2017..ee3b49fd04 100644
--- a/bignum.c
+++ b/bignum.c
@@ -6237,7 +6237,7 @@ rb_big_pow(VALUE x, VALUE y)
     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)) {
diff --git a/complex.c b/complex.c
index dcc25852a9..56bccfddff 100644
--- a/complex.c
+++ b/complex.c
@@ -546,7 +546,7 @@ f_complex_polar(VALUE klass, VALUE x, VALUE y)
 
 /* 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,11 +1382,17 @@ rb_complex_new(VALUE x, VALUE y)
 }
 
 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)
 {
@@ -1737,7 +1743,7 @@ read_comp(const char **s, int strict,
 	    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
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 61e930da56..f3212aef09 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -188,7 +188,8 @@ VALUE rb_complex_raw(VALUE, VALUE);
 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))
diff --git a/internal.h b/internal.h
index 014d1ab98a..67c84332b5 100644
--- a/internal.h
+++ b/internal.h
@@ -1384,7 +1384,7 @@ VALUE rb_complex_plus(VALUE, VALUE);
 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;
diff --git a/numeric.c b/numeric.c
index 8f0a805c68..ef7c58e870 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1308,7 +1308,7 @@ rb_float_pow(VALUE x, VALUE y)
 	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)
 	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));
 	}
     }
-- 
cgit v1.2.3