Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1678380. Fix a bug that identifies 0j and -0j when they appear

Browse source 
in the same code unit. The fix is essentially the same as the fix for a
previous bug identifying 0. and -0.
This commit is contained in:
Mark Dickinson 2008-01-31 22:17:37 +00:00
parent 2df20a3e08
commit 105be7725b
3 changed files with 57 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Python/compile.c
View file

@ -907,24 +907,59 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
{
PyObject *t, *v;
Py_ssize_t arg;
unsigned char *p, *q;
Py_complex z;
double d;
int real_part_zero, imag_part_zero;
/* necessary to make sure types aren't coerced (e.g., int and long) */
/* _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms */
if (PyFloat_Check(o)) {
double d = PyFloat_AS_DOUBLE(o);
unsigned char* p = (unsigned char*) &d;
/* all we need is to make the tuple different in either the 0.0
* or -0.0 case from all others, just to avoid the "coercion".
*/
if (*p==0 && p[sizeof(double)-1]==0)
t = PyTuple_Pack(3, o, o->ob_type, Py_None);
else
t = PyTuple_Pack(2, o, o->ob_type);
} else {
t = PyTuple_Pack(2, o, o->ob_type);
d = PyFloat_AS_DOUBLE(o);
p = (unsigned char*) &d;
/* all we need is to make the tuple different in either the 0.0
* or -0.0 case from all others, just to avoid the "coercion".
*/
if (*p==0 && p[sizeof(double)-1]==0)
t = PyTuple_Pack(3, o, o->ob_type, Py_None);
else
t = PyTuple_Pack(2, o, o->ob_type);
}
else if (PyComplex_Check(o)) {
/* complex case is even messier: we need to make complex(x,
0.) different from complex(x, -0.) and complex(0., y)
different from complex(-0., y), for any x and y. In
particular, all four complex zeros should be
distinguished.*/
z = PyComplex_AsCComplex(o);
p = (unsigned char*) &(z.real);
q = (unsigned char*) &(z.imag);
/* all that matters here is that on IEEE platforms
real_part_zero will be true if z.real == 0., and false if
z.real == -0. In fact, real_part_zero will also be true
for some other rarely occurring nonzero floats, but this
doesn't matter. Similar comments apply to
imag_part_zero. */
real_part_zero = *p==0 && p[sizeof(double)-1]==0;
imag_part_zero = *q==0 && q[sizeof(double)-1]==0;
if (real_part_zero && imag_part_zero) {
t = PyTuple_Pack(4, o, o->ob_type, Py_True, Py_True);
}
else if (real_part_zero && !imag_part_zero) {
t = PyTuple_Pack(4, o, o->ob_type, Py_True, Py_False);
}
else if (!real_part_zero && imag_part_zero) {
t = PyTuple_Pack(4, o, o->ob_type, Py_False, Py_True);
}
else {
t = PyTuple_Pack(2, o, o->ob_type);
}
}
else {
t = PyTuple_Pack(2, o, o->ob_type);
}
if (t == NULL)
return -1;
return -1;
v = PyDict_GetItem(dict, t);
if (!v) {