mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Implement stage B0 of PEP 237: add warnings for operations that

Browse source 
currently return inconsistent results for ints and longs; in
particular: hex/oct/%u/%o/%x/%X of negative short ints, and x<<n that
either loses bits or changes sign.  (No warnings for repr() of a long,
though that will also change to lose the trailing 'L' eventually.)

This introduces some warnings in the test suite; I'll take care of
those later.
This commit is contained in:
Guido van Rossum 2002-08-11 04:24:12 +00:00
parent d92ae840e9
commit 078151da90
4 changed files with 50 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Objects/intobject.c
View file

@ -659,7 +659,7 @@ int_invert(PyIntObject *v)
static PyObject *
int_lshift(PyIntObject *v, PyIntObject *w)
{
register long a, b;
long a, b, c;
CONVERT_TO_LONG(v, a);
CONVERT_TO_LONG(w, b);
if (b < 0) {
@ -669,10 +669,20 @@ int_lshift(PyIntObject *v, PyIntObject *w)
if (a == 0 || b == 0)
return int_pos(v);
if (b >= LONG_BIT) {
if (PyErr_Warn(PyExc_DeprecationWarning,
"x<<y losing bits or changing sign "
"will return a long in Python 2.4 and up") < 0)
return NULL;
return PyInt_FromLong(0L);
}
a = (long)((unsigned long)a << b);
return PyInt_FromLong(a);
c = (long)((unsigned long)a << b);
if ((c >> b) != a || (c < 0 && a > 0)) {
if (PyErr_Warn(PyExc_DeprecationWarning,
"x<<y losing bits or changing sign "
"will return a long in Python 2.4 and up") < 0)
return NULL;
}
return PyInt_FromLong(c);
}
static PyObject *
@ -761,6 +771,12 @@ int_oct(PyIntObject *v)
{
char buf[100];
long x = v -> ob_ival;
if (x < 0) {
if (PyErr_Warn(PyExc_DeprecationWarning,
"hex()/oct() of negative int will return "
"a signed string in Python 2.4 and up") < 0)
return NULL;
}
if (x == 0)
strcpy(buf, "0");
else
@ -773,6 +789,12 @@ int_hex(PyIntObject *v)
{
char buf[100];
long x = v -> ob_ival;
if (x < 0) {
if (PyErr_Warn(PyExc_DeprecationWarning,
"hex()/oct() of negative int will return "
"a signed string in Python 2.4 and up") < 0)
return NULL;
}
PyOS_snprintf(buf, sizeof(buf), "0x%lx", x);
return PyString_FromString(buf);
}