bpo-46656: Remove Py_NO_NAN macro (GH-31160) · python/cpython@c8946ad · GitHub
Skip to content

Commit c8946ad

Browse files
vstinnerasvetlov
vstinner
authored and
asvetlov
committed
bpo-46656: Remove Py_NO_NAN macro (GH-31160)
Building Python now requires support for floating point Not-a-Number (NaN): remove the Py_NO_NAN macro.
1 parent 919acfe commit c8946ad

9 files changed

Lines changed: 16 additions & 28 deletions

File tree

‎Doc/whatsnew/3.11.rst‎

Lines changed: 5 additions & 3 deletions

‎Include/floatobject.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ PyAPI_DATA(PyTypeObject) PyFloat_Type;
1616
#define PyFloat_Check(op) PyObject_TypeCheck(op, &PyFloat_Type)
1717
#define PyFloat_CheckExact(op) Py_IS_TYPE(op, &PyFloat_Type)
1818

19-
#ifdef Py_NAN
20-
# define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN)
21-
#endif
19+
#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN)
2220

2321
#define Py_RETURN_INF(sign) \
2422
do { \

‎Include/pymath.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,8 @@
5050
# define Py_HUGE_VAL HUGE_VAL
5151
#endif
5252

53-
/* Py_NAN
54-
* A value that evaluates to a quiet Not-a-Number (NaN).
55-
* Define Py_NO_NAN in pyconfig.h if your platform doesn't support NaNs.
56-
*/
57-
#if !defined(Py_NAN) && !defined(Py_NO_NAN)
53+
// Py_NAN: Value that evaluates to a quiet Not-a-Number (NaN).
54+
#if !defined(Py_NAN)
5855
# if _Py__has_builtin(__builtin_nan)
5956
// Built-in implementation of the ISO C99 function nan(): quiet NaN.
6057
# define Py_NAN (__builtin_nan(""))

‎Misc/NEWS.d/next/Build/2022-02-04-21-26-50.bpo-46640.HXUmQp.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
Building Python now requires a C99 ``<math.h>`` header file providing a ``NAN``
2-
constant, or the ``__builtin_nan()`` built-in function. If a platform does not
3-
support Not-a-Number (NaN), the ``Py_NO_NAN`` macro can be defined in the
4-
``pyconfig.h`` file. Patch by Victor Stinner.
2+
constant, or the ``__builtin_nan()`` built-in function.
3+
Patch by Victor Stinner.

‎Misc/NEWS.d/next/Build/2022-02-06-14-04-20.bpo-46656.ajJjkh.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Building Python now requires support for floating point Not-a-Number (NaN):
2+
remove the ``Py_NO_NAN`` macro. Patch by by Victor Stinner.

‎Modules/cmathmodule.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ c_infj(void)
113113
return r;
114114
}
115115

116-
#if _PY_SHORT_FLOAT_REPR == 1 || defined(Py_NAN)
116+
#if _PY_SHORT_FLOAT_REPR == 1
117117

118118
static double
119119
m_nan(void)
@@ -1282,7 +1282,7 @@ cmath_exec(PyObject *mod)
12821282
PyComplex_FromCComplex(c_infj())) < 0) {
12831283
return -1;
12841284
}
1285-
#if _PY_SHORT_FLOAT_REPR == 1 || defined(Py_NAN)
1285+
#if _PY_SHORT_FLOAT_REPR == 1
12861286
if (PyModule_AddObject(mod, "nan", PyFloat_FromDouble(m_nan())) < 0) {
12871287
return -1;
12881288
}

‎Modules/mathmodule.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ m_inf(void)
283283
/* Constant nan value, generated in the same way as float('nan'). */
284284
/* We don't currently assume that Py_NAN is defined everywhere. */
285285

286-
#if _PY_SHORT_FLOAT_REPR == 1 || defined(Py_NAN)
286+
#if _PY_SHORT_FLOAT_REPR == 1
287287

288288
static double
289289
m_nan(void)
@@ -3838,7 +3838,7 @@ math_exec(PyObject *module)
38383838
if (PyModule_AddObject(module, "inf", PyFloat_FromDouble(m_inf())) < 0) {
38393839
return -1;
38403840
}
3841-
#if _PY_SHORT_FLOAT_REPR == 1 || defined(Py_NAN)
3841+
#if _PY_SHORT_FLOAT_REPR == 1
38423842
if (PyModule_AddObject(module, "nan", PyFloat_FromDouble(m_nan())) < 0) {
38433843
return -1;
38443844
}

‎Objects/floatobject.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2486,15 +2486,7 @@ _PyFloat_Unpack2(const unsigned char *p, int le)
24862486
}
24872487
else {
24882488
/* NaN */
2489-
#ifdef Py_NAN
24902489
return sign ? -Py_NAN : Py_NAN;
2491-
#else
2492-
PyErr_SetString(
2493-
PyExc_ValueError,
2494-
"can't unpack IEEE 754 NaN "
2495-
"on platform that does not support NaNs");
2496-
return -1;
2497-
#endif // !defined(Py_NAN)
24982490
}
24992491
#else // _PY_SHORT_FLOAT_REPR == 1
25002492
if (f == 0) {

‎Python/pystrtod.c‎

Lines changed: 0 additions & 2 deletions

0 commit comments

Comments
 (0)