mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Changed convert to add '0' or '0x' prefix for oct/hex.

Browse source 
Added NULL function pointers for shift and mask ops.
This commit is contained in:
Guido van Rossum 1991-10-24 14:55:57 +00:00
parent 27acb3379e
commit 3d3037d51a
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Objects/longobject.c
View file

@ -253,7 +253,8 @@ divrem1(a, n, prem)
} }
/* Convert a long int object to a string, using a given conversion base. /* Convert a long int object to a string, using a given conversion base.
Return a string object. */ Return a string object.
If base is 8 or 16, add the proper prefix '0' or '0x'. */
stringobject * stringobject *
long_format(a, base) long_format(a, base)
@ -276,7 +277,7 @@ long_format(a, base)
++bits; ++bits;
i >>= 1; i >>= 1;
} }
i = 1 + (size_a*SHIFT + bits-1) / bits; i = 3 + (size_a*SHIFT + bits-1) / bits;
str = (stringobject *) newsizedstringobject((char *)0, i); str = (stringobject *) newsizedstringobject((char *)0, i);
if (str == NULL) if (str == NULL)
return NULL; return NULL;
@ -310,6 +311,12 @@ long_format(a, base)
}) })
} while (a->ob_size != 0); } while (a->ob_size != 0);
DECREF(a); DECREF(a);
if (base == 8)
*--p = '0';
else if (base == 16) {
*--p = 'x';
*--p = '0';
}
if (sign) if (sign)
*--p = sign; *--p = sign;
if (p != GETSTRINGVALUE(str)) { if (p != GETSTRINGVALUE(str)) {
@ -992,6 +999,12 @@ static number_methods long_as_number = {
long_pos, /*tp_positive*/ long_pos, /*tp_positive*/
long_abs, /*tp_absolute*/ long_abs, /*tp_absolute*/
long_nonzero, /*tp_nonzero*/ long_nonzero, /*tp_nonzero*/
0, /*nb_invert*/
0, /*nb_lshift*/
0, /*nb_rshift*/
0, /*nb_and*/
0, /*nb_xor*/
0, /*nb_or*/
}; };
typeobject Longtype = { typeobject Longtype = {