Skip to content

Commit 64254ba

Browse files
yoneyyoney
committed
Remove C(R, I) macro
1 parent a365734 commit 64254ba

File tree

1 file changed

+77
-78
lines changed

1 file changed

+77
-78
lines changed

‎Modules/cmathmodule.c‎

Lines changed: 77 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,14 @@ special_type(double d)
163163
raised.
164164
*/
165165

166-
#define C(R, I) {(R), (I)}
167166
static Py_complex acos_special_values[7][7] = {
168-
{ C(P34,INF), C(P,INF), C(P,INF), C(P,-INF), C(P,-INF), C(P34,-INF), C(N,INF) },
169-
{ C(P12,INF), C(U,U), C(U,U), C(U,U), C(U,U), C(P12,-INF), C(N,N) },
170-
{ C(P12,INF), C(U,U), C(P12,0.), C(P12,-0.), C(U,U), C(P12,-INF), C(P12,N) },
171-
{ C(P12,INF), C(U,U), C(P12,0.), C(P12,-0.), C(U,U), C(P12,-INF), C(P12,N) },
172-
{ C(P12,INF), C(U,U), C(U,U), C(U,U), C(U,U), C(P12,-INF), C(N,N) },
173-
{ C(P14,INF), C(0.,INF), C(0.,INF), C(0.,-INF), C(0.,-INF), C(P14,-INF), C(N,INF) },
174-
{ C(N,INF), C(N,N), C(N,N), C(N,N), C(N,N), C(N,-INF), C(N,N) }
167+
{ {P34,INF}, {P,INF}, {P,INF}, {P,-INF}, {P,-INF}, {P34,-INF}, {N,INF} },
168+
{ {P12,INF}, {U,U}, {U,U}, {U,U}, {U,U}, {P12,-INF}, {N,N} },
169+
{ {P12,INF}, {U,U}, {P12,0.}, {P12,-0.}, {U,U}, {P12,-INF}, {P12,N} },
170+
{ {P12,INF}, {U,U}, {P12,0.}, {P12,-0.}, {U,U}, {P12,-INF}, {P12,N} },
171+
{ {P12,INF}, {U,U}, {U,U}, {U,U}, {U,U}, {P12,-INF}, {N,N} },
172+
{ {P14,INF}, {0.,INF}, {0.,INF}, {0.,-INF}, {0.,-INF}, {P14,-INF}, {N,INF} },
173+
{ {N,INF}, {N,N}, {N,N}, {N,N}, {N,N}, {N,-INF}, {N,N} }
175174
};
176175
/*[clinic input]
177176
cmath.acos -> Py_complex_protected
@@ -211,13 +210,13 @@ cmath_acos_impl(PyObject *module, Py_complex z)
211210

212211

213212
static Py_complex acosh_special_values[7][7] = {
214-
{ C(INF,-P34), C(INF,-P), C(INF,-P), C(INF,P), C(INF,P), C(INF,P34), C(INF,N) },
215-
{ C(INF,-P12), C(U,U), C(U,U), C(U,U), C(U,U), C(INF,P12), C(N,N) },
216-
{ C(INF,-P12), C(U,U), C(0.,-P12), C(0.,P12), C(U,U), C(INF,P12), C(N,P12) },
217-
{ C(INF,-P12), C(U,U), C(0.,-P12), C(0.,P12), C(U,U), C(INF,P12), C(N,P12) },
218-
{ C(INF,-P12), C(U,U), C(U,U), C(U,U), C(U,U), C(INF,P12), C(N,N) },
219-
{ C(INF,-P14), C(INF,-0.), C(INF,-0.), C(INF,0.), C(INF,0.), C(INF,P14), C(INF,N) },
220-
{ C(INF,N), C(N,N), C(N,N), C(N,N), C(N,N), C(INF,N), C(N,N) }
213+
{ {INF,-P34}, {INF,-P}, {INF,-P}, {INF,P}, {INF,P}, {INF,P34}, {INF,N} },
214+
{ {INF,-P12}, {U,U}, {U,U}, {U,U}, {U,U}, {INF,P12}, {N,N} },
215+
{ {INF,-P12}, {U,U}, {0.,-P12}, {0.,P12}, {U,U}, {INF,P12}, {N,P12} },
216+
{ {INF,-P12}, {U,U}, {0.,-P12}, {0.,P12}, {U,U}, {INF,P12}, {N,P12} },
217+
{ {INF,-P12}, {U,U}, {U,U}, {U,U}, {U,U}, {INF,P12}, {N,N} },
218+
{ {INF,-P14}, {INF,-0.}, {INF,-0.}, {INF,0.}, {INF,0.}, {INF,P14}, {INF,N} },
219+
{ {INF,N}, {N,N}, {N,N}, {N,N}, {N,N}, {INF,N}, {N,N} }
221220
};
222221

223222
/*[clinic input]
@@ -274,13 +273,13 @@ cmath_asin_impl(PyObject *module, Py_complex z)
274273

275274

276275
static Py_complex asinh_special_values[7][7] = {
277-
{ C(-INF,-P14), C(-INF,-0.), C(-INF,-0.), C(-INF,0.), C(-INF,0.), C(-INF,P14), C(-INF,N) },
278-
{ C(-INF,-P12), C(U,U), C(U,U), C(U,U), C(U,U), C(-INF,P12), C(N,N) },
279-
{ C(-INF,-P12), C(U,U), C(-0.,-0.), C(-0.,0.), C(U,U), C(-INF,P12), C(N,N) },
280-
{ C(INF,-P12), C(U,U), C(0.,-0.), C(0.,0.), C(U,U), C(INF,P12), C(N,N) },
281-
{ C(INF,-P12), C(U,U), C(U,U), C(U,U), C(U,U), C(INF,P12), C(N,N) },
282-
{ C(INF,-P14), C(INF,-0.), C(INF,-0.), C(INF,0.), C(INF,0.), C(INF,P14), C(INF,N) },
283-
{ C(INF,N), C(N,N), C(N,-0.), C(N,0.), C(N,N), C(INF,N), C(N,N) }
276+
{ {-INF,-P14}, {-INF,-0.}, {-INF,-0.}, {-INF,0.}, {-INF,0.}, {-INF,P14}, {-INF,N} },
277+
{ {-INF,-P12}, {U,U}, {U,U}, {U,U}, {U,U}, {-INF,P12}, {N,N} },
278+
{ {-INF,-P12}, {U,U}, {-0.,-0.}, {-0.,0.}, {U,U}, {-INF,P12}, {N,N} },
279+
{ {INF,-P12}, {U,U}, {0.,-0.}, {0.,0.}, {U,U}, {INF,P12}, {N,N} },
280+
{ {INF,-P12}, {U,U}, {U,U}, {U,U}, {U,U}, {INF,P12}, {N,N} },
281+
{ {INF,-P14}, {INF,-0.}, {INF,-0.}, {INF,0.}, {INF,0.}, {INF,P14}, {INF,N} },
282+
{ {INF,N}, {N,N}, {N,-0.}, {N,0.}, {N,N}, {INF,N}, {N,N} }
284283
};
285284

286285
/*[clinic input]
@@ -343,13 +342,13 @@ cmath_atan_impl(PyObject *module, Py_complex z)
343342

344343

345344
static Py_complex atanh_special_values[7][7] = {
346-
{ C(-0.,-P12), C(-0.,-P12), C(-0.,-P12), C(-0.,P12), C(-0.,P12), C(-0.,P12), C(-0.,N) },
347-
{ C(-0.,-P12), C(U,U), C(U,U), C(U,U), C(U,U), C(-0.,P12), C(N,N) },
348-
{ C(-0.,-P12), C(U,U), C(-0.,-0.), C(-0.,0.), C(U,U), C(-0.,P12), C(-0.,N) },
349-
{ C(0.,-P12), C(U,U), C(0.,-0.), C(0.,0.), C(U,U), C(0.,P12), C(0.,N) },
350-
{ C(0.,-P12), C(U,U), C(U,U), C(U,U), C(U,U), C(0.,P12), C(N,N) },
351-
{ C(0.,-P12), C(0.,-P12), C(0.,-P12), C(0.,P12), C(0.,P12), C(0.,P12), C(0.,N) },
352-
{ C(0.,-P12), C(N,N), C(N,N), C(N,N), C(N,N), C(0.,P12), C(N,N) }
345+
{ {-0.,-P12}, {-0.,-P12}, {-0.,-P12}, {-0.,P12}, {-0.,P12}, {-0.,P12}, {-0.,N} },
346+
{ {-0.,-P12}, {U,U}, {U,U}, {U,U}, {U,U}, {-0.,P12}, {N,N} },
347+
{ {-0.,-P12}, {U,U}, {-0.,-0.}, {-0.,0.}, {U,U}, {-0.,P12}, {-0.,N} },
348+
{ {0.,-P12}, {U,U}, {0.,-0.}, {0.,0.}, {U,U}, {0.,P12}, {0.,N} },
349+
{ {0.,-P12}, {U,U}, {U,U}, {U,U}, {U,U}, {0.,P12}, {N,N} },
350+
{ {0.,-P12}, {0.,-P12}, {0.,-P12}, {0.,P12}, {0.,P12}, {0.,P12}, {0.,N} },
351+
{ {0.,-P12}, {N,N}, {N,N}, {N,N}, {N,N}, {0.,P12}, {N,N} }
353352
};
354353

355354
/*[clinic input]
@@ -424,13 +423,13 @@ cmath_cos_impl(PyObject *module, Py_complex z)
424423

425424
/* cosh(infinity + i*y) needs to be dealt with specially */
426425
static Py_complex cosh_special_values[7][7] = {
427-
{ C(INF,N), C(U,U), C(INF,0.), C(INF,-0.), C(U,U), C(INF,N), C(INF,N) },
428-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
429-
{ C(N,0.), C(U,U), C(1.,0.), C(1.,-0.), C(U,U), C(N,0.), C(N,0.) },
430-
{ C(N,0.), C(U,U), C(1.,-0.), C(1.,0.), C(U,U), C(N,0.), C(N,0.) },
431-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
432-
{ C(INF,N), C(U,U), C(INF,-0.), C(INF,0.), C(U,U), C(INF,N), C(INF,N) },
433-
{ C(N,N), C(N,N), C(N,0.), C(N,0.), C(N,N), C(N,N), C(N,N) }
426+
{ {INF,N}, {U,U}, {INF,0.}, {INF,-0.}, {U,U}, {INF,N}, {INF,N} },
427+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
428+
{ {N,0.}, {U,U}, {1.,0.}, {1.,-0.}, {U,U}, {N,0.}, {N,0.} },
429+
{ {N,0.}, {U,U}, {1.,-0.}, {1.,0.}, {U,U}, {N,0.}, {N,0.} },
430+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
431+
{ {INF,N}, {U,U}, {INF,-0.}, {INF,0.}, {U,U}, {INF,N}, {INF,N} },
432+
{ {N,N}, {N,N}, {N,0.}, {N,0.}, {N,N}, {N,N}, {N,N} }
434433
};
435434

436435
/*[clinic input]
@@ -494,13 +493,13 @@ cmath_cosh_impl(PyObject *module, Py_complex z)
494493
/* exp(infinity + i*y) and exp(-infinity + i*y) need special treatment for
495494
finite y */
496495
static Py_complex exp_special_values[7][7] = {
497-
{ C(0.,0.), C(U,U), C(0.,-0.), C(0.,0.), C(U,U), C(0.,0.), C(0.,0.) },
498-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
499-
{ C(N,N), C(U,U), C(1.,-0.), C(1.,0.), C(U,U), C(N,N), C(N,N) },
500-
{ C(N,N), C(U,U), C(1.,-0.), C(1.,0.), C(U,U), C(N,N), C(N,N) },
501-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
502-
{ C(INF,N), C(U,U), C(INF,-0.), C(INF,0.), C(U,U), C(INF,N), C(INF,N) },
503-
{ C(N,N), C(N,N), C(N,-0.), C(N,0.), C(N,N), C(N,N), C(N,N) }
496+
{ {0.,0.}, {U,U}, {0.,-0.}, {0.,0.}, {U,U}, {0.,0.}, {0.,0.} },
497+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
498+
{ {N,N}, {U,U}, {1.,-0.}, {1.,0.}, {U,U}, {N,N}, {N,N} },
499+
{ {N,N}, {U,U}, {1.,-0.}, {1.,0.}, {U,U}, {N,N}, {N,N} },
500+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
501+
{ {INF,N}, {U,U}, {INF,-0.}, {INF,0.}, {U,U}, {INF,N}, {INF,N} },
502+
{ {N,N}, {N,N}, {N,-0.}, {N,0.}, {N,N}, {N,N}, {N,N} }
504503
};
505504

506505
/*[clinic input]
@@ -561,13 +560,13 @@ cmath_exp_impl(PyObject *module, Py_complex z)
561560
}
562561

563562
static Py_complex log_special_values[7][7] = {
564-
{ C(INF,-P34), C(INF,-P), C(INF,-P), C(INF,P), C(INF,P), C(INF,P34), C(INF,N) },
565-
{ C(INF,-P12), C(U,U), C(U,U), C(U,U), C(U,U), C(INF,P12), C(N,N) },
566-
{ C(INF,-P12), C(U,U), C(-INF,-P), C(-INF,P), C(U,U), C(INF,P12), C(N,N) },
567-
{ C(INF,-P12), C(U,U), C(-INF,-0.), C(-INF,0.), C(U,U), C(INF,P12), C(N,N) },
568-
{ C(INF,-P12), C(U,U), C(U,U), C(U,U), C(U,U), C(INF,P12), C(N,N) },
569-
{ C(INF,-P14), C(INF,-0.), C(INF,-0.), C(INF,0.), C(INF,0.), C(INF,P14), C(INF,N) },
570-
{ C(INF,N), C(N,N), C(N,N), C(N,N), C(N,N), C(INF,N), C(N,N) }
563+
{ {INF,-P34}, {INF,-P}, {INF,-P}, {INF,P}, {INF,P}, {INF,P34}, {INF,N} },
564+
{ {INF,-P12}, {U,U}, {U,U}, {U,U}, {U,U}, {INF,P12}, {N,N} },
565+
{ {INF,-P12}, {U,U}, {-INF,-P}, {-INF,P}, {U,U}, {INF,P12}, {N,N} },
566+
{ {INF,-P12}, {U,U}, {-INF,-0.}, {-INF,0.}, {U,U}, {INF,P12}, {N,N} },
567+
{ {INF,-P12}, {U,U}, {U,U}, {U,U}, {U,U}, {INF,P12}, {N,N} },
568+
{ {INF,-P14}, {INF,-0.}, {INF,-0.}, {INF,0.}, {INF,0.}, {INF,P14}, {INF,N} },
569+
{ {INF,N}, {N,N}, {N,N}, {N,N}, {N,N}, {INF,N}, {N,N} }
571570
};
572571

573572
static Py_complex
@@ -685,13 +684,13 @@ cmath_sin_impl(PyObject *module, Py_complex z)
685684

686685
/* sinh(infinity + i*y) needs to be dealt with specially */
687686
static Py_complex sinh_special_values[7][7] = {
688-
{ C(INF,N), C(U,U), C(-INF,-0.), C(-INF,0.), C(U,U), C(INF,N), C(INF,N) },
689-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
690-
{ C(0.,N), C(U,U), C(-0.,-0.), C(-0.,0.), C(U,U), C(0.,N), C(0.,N) },
691-
{ C(0.,N), C(U,U), C(0.,-0.), C(0.,0.), C(U,U), C(0.,N), C(0.,N) },
692-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
693-
{ C(INF,N), C(U,U), C(INF,-0.), C(INF,0.), C(U,U), C(INF,N), C(INF,N) },
694-
{ C(N,N), C(N,N), C(N,-0.), C(N,0.), C(N,N), C(N,N), C(N,N) }
687+
{ {INF,N}, {U,U}, {-INF,-0.}, {-INF,0.}, {U,U}, {INF,N}, {INF,N} },
688+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
689+
{ {0.,N}, {U,U}, {-0.,-0.}, {-0.,0.}, {U,U}, {0.,N}, {0.,N} },
690+
{ {0.,N}, {U,U}, {0.,-0.}, {0.,0.}, {U,U}, {0.,N}, {0.,N} },
691+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
692+
{ {INF,N}, {U,U}, {INF,-0.}, {INF,0.}, {U,U}, {INF,N}, {INF,N} },
693+
{ {N,N}, {N,N}, {N,-0.}, {N,0.}, {N,N}, {N,N}, {N,N} }
695694
};
696695

697696
/*[clinic input]
@@ -752,13 +751,13 @@ cmath_sinh_impl(PyObject *module, Py_complex z)
752751

753752

754753
static Py_complex sqrt_special_values[7][7] = {
755-
{ C(INF,-INF), C(0.,-INF), C(0.,-INF), C(0.,INF), C(0.,INF), C(INF,INF), C(N,INF) },
756-
{ C(INF,-INF), C(U,U), C(U,U), C(U,U), C(U,U), C(INF,INF), C(N,N) },
757-
{ C(INF,-INF), C(U,U), C(0.,-0.), C(0.,0.), C(U,U), C(INF,INF), C(N,N) },
758-
{ C(INF,-INF), C(U,U), C(0.,-0.), C(0.,0.), C(U,U), C(INF,INF), C(N,N) },
759-
{ C(INF,-INF), C(U,U), C(U,U), C(U,U), C(U,U), C(INF,INF), C(N,N) },
760-
{ C(INF,-INF), C(INF,-0.), C(INF,-0.), C(INF,0.), C(INF,0.), C(INF,INF), C(INF,N) },
761-
{ C(INF,-INF), C(N,N), C(N,N), C(N,N), C(N,N), C(INF,INF), C(N,N) }
754+
{ {INF,-INF}, {0.,-INF}, {0.,-INF}, {0.,INF}, {0.,INF}, {INF,INF}, {N,INF} },
755+
{ {INF,-INF}, {U,U}, {U,U}, {U,U}, {U,U}, {INF,INF}, {N,N} },
756+
{ {INF,-INF}, {U,U}, {0.,-0.}, {0.,0.}, {U,U}, {INF,INF}, {N,N} },
757+
{ {INF,-INF}, {U,U}, {0.,-0.}, {0.,0.}, {U,U}, {INF,INF}, {N,N} },
758+
{ {INF,-INF}, {U,U}, {U,U}, {U,U}, {U,U}, {INF,INF}, {N,N} },
759+
{ {INF,-INF}, {INF,-0.}, {INF,-0.}, {INF,0.}, {INF,0.}, {INF,INF}, {INF,N} },
760+
{ {INF,-INF}, {N,N}, {N,N}, {N,N}, {N,N}, {INF,INF}, {N,N} }
762761
};
763762

764763
/*[clinic input]
@@ -859,13 +858,13 @@ cmath_tan_impl(PyObject *module, Py_complex z)
859858

860859
/* tanh(infinity + i*y) needs to be dealt with specially */
861860
static Py_complex tanh_special_values[7][7] = {
862-
{ C(-1.,0.), C(U,U), C(-1.,-0.), C(-1.,0.), C(U,U), C(-1.,0.), C(-1.,0.) },
863-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
864-
{ C(-0.0,N), C(U,U), C(-0.,-0.), C(-0.,0.), C(U,U), C(-0.0,N), C(-0.,N) },
865-
{ C(0.0,N), C(U,U), C(0.,-0.), C(0.,0.), C(U,U), C(0.0,N), C(0.,N) },
866-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
867-
{ C(1.,0.), C(U,U), C(1.,-0.), C(1.,0.), C(U,U), C(1.,0.), C(1.,0.) },
868-
{ C(N,N), C(N,N), C(N,-0.), C(N,0.), C(N,N), C(N,N), C(N,N) }
861+
{ {-1.,0.}, {U,U}, {-1.,-0.}, {-1.,0.}, {U,U}, {-1.,0.}, {-1.,0.} },
862+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
863+
{ {-0.0,N}, {U,U}, {-0.,-0.}, {-0.,0.}, {U,U}, {-0.0,N}, {-0.,N} },
864+
{ {0.0,N}, {U,U}, {0.,-0.}, {0.,0.}, {U,U}, {0.0,N}, {0.,N} },
865+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
866+
{ {1.,0.}, {U,U}, {1.,-0.}, {1.,0.}, {U,U}, {1.,0.}, {1.,0.} },
867+
{ {N,N}, {N,N}, {N,-0.}, {N,0.}, {N,N}, {N,N}, {N,N} }
869868
};
870869

871870
/*[clinic input]
@@ -1050,13 +1049,13 @@ cmath_polar_impl(PyObject *module, Py_complex z)
10501049
*/
10511050

10521051
static Py_complex rect_special_values[7][7] = {
1053-
{ C(INF,N), C(U,U), C(-INF,0.), C(-INF,-0.), C(U,U), C(INF,N), C(INF,N) },
1054-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
1055-
{ C(0.,0.), C(U,U), C(-0.,0.), C(-0.,-0.), C(U,U), C(0.,0.), C(0.,0.) },
1056-
{ C(0.,0.), C(U,U), C(0.,-0.), C(0.,0.), C(U,U), C(0.,0.), C(0.,0.) },
1057-
{ C(N,N), C(U,U), C(U,U), C(U,U), C(U,U), C(N,N), C(N,N) },
1058-
{ C(INF,N), C(U,U), C(INF,-0.), C(INF,0.), C(U,U), C(INF,N), C(INF,N) },
1059-
{ C(N,N), C(N,N), C(N,0.), C(N,0.), C(N,N), C(N,N), C(N,N) }
1052+
{ {INF,N}, {U,U}, {-INF,0.}, {-INF,-0.}, {U,U}, {INF,N}, {INF,N} },
1053+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
1054+
{ {0.,0.}, {U,U}, {-0.,0.}, {-0.,-0.}, {U,U}, {0.,0.}, {0.,0.} },
1055+
{ {0.,0.}, {U,U}, {0.,-0.}, {0.,0.}, {U,U}, {0.,0.}, {0.,0.} },
1056+
{ {N,N}, {U,U}, {U,U}, {U,U}, {U,U}, {N,N}, {N,N} },
1057+
{ {INF,N}, {U,U}, {INF,-0.}, {INF,0.}, {U,U}, {INF,N}, {INF,N} },
1058+
{ {N,N}, {N,N}, {N,0.}, {N,0.}, {N,N}, {N,N}, {N,N} }
10601059
};
10611060

10621061
/*[clinic input]

0 commit comments

Comments
 (0)