2007-08-24 23:26:07 -03:00
|
|
|
/* implements the string, long, and float formatters. that is,
|
|
|
|
string.__format__, etc. */
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
#include <locale.h>
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/* Before including this, you must include either:
|
|
|
|
stringlib/unicodedefs.h
|
|
|
|
stringlib/stringdefs.h
|
|
|
|
|
|
|
|
Also, you should define the names:
|
|
|
|
FORMAT_STRING
|
|
|
|
FORMAT_LONG
|
|
|
|
FORMAT_FLOAT
|
2009-04-29 22:00:33 -03:00
|
|
|
FORMAT_COMPLEX
|
2007-08-24 23:26:07 -03:00
|
|
|
to be whatever you want the public names of these functions to
|
|
|
|
be. These are the only non-static functions defined here.
|
|
|
|
*/
|
|
|
|
|
2009-02-20 10:25:03 -04:00
|
|
|
/* Raises an exception about an unknown presentation type for this
|
|
|
|
* type. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
unknown_presentation_type(STRINGLIB_CHAR presentation_type,
|
|
|
|
const char* type_name)
|
|
|
|
{
|
|
|
|
#if STRINGLIB_IS_UNICODE
|
|
|
|
/* If STRINGLIB_CHAR is Py_UNICODE, %c might be out-of-range,
|
|
|
|
hence the two cases. If it is char, gcc complains that the
|
|
|
|
condition below is always true, hence the ifdef. */
|
|
|
|
if (presentation_type > 32 && presentation_type < 128)
|
|
|
|
#endif
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"Unknown format code '%c' "
|
|
|
|
"for object of type '%.200s'",
|
|
|
|
presentation_type,
|
|
|
|
type_name);
|
|
|
|
#if STRINGLIB_IS_UNICODE
|
|
|
|
else
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"Unknown format code '\\x%x' "
|
|
|
|
"for object of type '%.200s'",
|
|
|
|
(unsigned int)presentation_type,
|
|
|
|
type_name);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/*
|
|
|
|
get_integer consumes 0 or more decimal digit characters from an
|
|
|
|
input string, updates *result with the corresponding positive
|
|
|
|
integer, and returns the number of digits consumed.
|
|
|
|
|
|
|
|
returns -1 on error.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
get_integer(STRINGLIB_CHAR **ptr, STRINGLIB_CHAR *end,
|
|
|
|
Py_ssize_t *result)
|
|
|
|
{
|
|
|
|
Py_ssize_t accumulator, digitval, oldaccumulator;
|
|
|
|
int numdigits;
|
|
|
|
accumulator = numdigits = 0;
|
|
|
|
for (;;(*ptr)++, numdigits++) {
|
|
|
|
if (*ptr >= end)
|
|
|
|
break;
|
|
|
|
digitval = STRINGLIB_TODECIMAL(**ptr);
|
|
|
|
if (digitval < 0)
|
|
|
|
break;
|
|
|
|
/*
|
|
|
|
This trick was copied from old Unicode format code. It's cute,
|
|
|
|
but would really suck on an old machine with a slow divide
|
|
|
|
implementation. Fortunately, in the normal case we do not
|
|
|
|
expect too many digits.
|
|
|
|
*/
|
|
|
|
oldaccumulator = accumulator;
|
|
|
|
accumulator *= 10;
|
|
|
|
if ((accumulator+10)/10 != oldaccumulator+1) {
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"Too many decimal digits in format string");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
accumulator += digitval;
|
|
|
|
}
|
|
|
|
*result = accumulator;
|
|
|
|
return numdigits;
|
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/*********** standard format specifier parsing **************************/
|
|
|
|
/************************************************************************/
|
|
|
|
|
|
|
|
/* returns true if this character is a specifier alignment token */
|
|
|
|
Py_LOCAL_INLINE(int)
|
|
|
|
is_alignment_token(STRINGLIB_CHAR c)
|
|
|
|
{
|
|
|
|
switch (c) {
|
|
|
|
case '<': case '>': case '=': case '^':
|
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* returns true if this character is a sign element */
|
|
|
|
Py_LOCAL_INLINE(int)
|
|
|
|
is_sign_element(STRINGLIB_CHAR c)
|
|
|
|
{
|
|
|
|
switch (c) {
|
2007-08-29 09:38:45 -03:00
|
|
|
case ' ': case '+': case '-':
|
2007-08-24 23:26:07 -03:00
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
STRINGLIB_CHAR fill_char;
|
|
|
|
STRINGLIB_CHAR align;
|
2008-07-15 10:02:41 -03:00
|
|
|
int alternate;
|
2007-08-24 23:26:07 -03:00
|
|
|
STRINGLIB_CHAR sign;
|
|
|
|
Py_ssize_t width;
|
2009-04-03 11:45:06 -03:00
|
|
|
int thousands_separators;
|
2007-08-24 23:26:07 -03:00
|
|
|
Py_ssize_t precision;
|
|
|
|
STRINGLIB_CHAR type;
|
|
|
|
} InternalFormatSpec;
|
|
|
|
|
|
|
|
/*
|
|
|
|
ptr points to the start of the format_spec, end points just past its end.
|
|
|
|
fills in format with the parsed information.
|
|
|
|
returns 1 on success, 0 on failure.
|
|
|
|
if failure, sets the exception
|
|
|
|
*/
|
|
|
|
static int
|
2008-05-30 15:10:19 -03:00
|
|
|
parse_internal_render_format_spec(STRINGLIB_CHAR *format_spec,
|
2009-04-03 08:19:31 -03:00
|
|
|
Py_ssize_t format_spec_len,
|
2007-08-24 23:26:07 -03:00
|
|
|
InternalFormatSpec *format,
|
|
|
|
char default_type)
|
|
|
|
{
|
2008-05-30 15:10:19 -03:00
|
|
|
STRINGLIB_CHAR *ptr = format_spec;
|
|
|
|
STRINGLIB_CHAR *end = format_spec + format_spec_len;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
/* end-ptr is used throughout this code to specify the length of
|
|
|
|
the input string */
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
Py_ssize_t consumed;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
format->fill_char = '\0';
|
|
|
|
format->align = '\0';
|
2008-07-15 10:02:41 -03:00
|
|
|
format->alternate = 0;
|
2007-08-24 23:26:07 -03:00
|
|
|
format->sign = '\0';
|
|
|
|
format->width = -1;
|
2009-04-03 11:45:06 -03:00
|
|
|
format->thousands_separators = 0;
|
2007-08-24 23:26:07 -03:00
|
|
|
format->precision = -1;
|
|
|
|
format->type = default_type;
|
|
|
|
|
|
|
|
/* If the second char is an alignment token,
|
|
|
|
then parse the fill char */
|
|
|
|
if (end-ptr >= 2 && is_alignment_token(ptr[1])) {
|
|
|
|
format->align = ptr[1];
|
|
|
|
format->fill_char = ptr[0];
|
|
|
|
ptr += 2;
|
2007-08-27 22:07:27 -03:00
|
|
|
}
|
|
|
|
else if (end-ptr >= 1 && is_alignment_token(ptr[0])) {
|
2007-08-24 23:26:07 -03:00
|
|
|
format->align = ptr[0];
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line
Added PEP 3101.
........
r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines
Fixes contributed by Ori Avtalion.
........
r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line
Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).
........
r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line
Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it.
........
r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines
Close manifest file.
This change doesn't make any difference to CPython, but is a necessary fix for Jython.
........
r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines
Remove news about float repr() -- issue 1580 is still in limbo.
........
r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines
Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
........
r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines
configure.ac: Remove the configure check for _Bool, it is already done in the
top-level Python configure script.
configure, fficonfig.h.in: regenerated.
........
r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines
Replace 'has_key()' with 'in'.
Replace 'raise Error, stuff' with 'raise Error(stuff)'.
........
r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line
Update more instances of has_key().
........
r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines
Fix a few typos and layout glitches (more work is needed).
Move 2.5 news to Misc/HISTORY.
........
r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines
#2079: typo in userdict docs.
........
r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines
Part of #2154: minimal syntax fixes in doc example snippets.
........
r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line
First draft for itertools.product(). Docs and other updates forthcoming.
........
r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line
Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery)
........
r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines
A lot more typo fixes by Ori Avtalion.
........
r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines
Don't reference pyshell.
........
r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines
Another fix.
........
2008-02-22 12:37:40 -04:00
|
|
|
++ptr;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Parse the various sign options */
|
|
|
|
if (end-ptr >= 1 && is_sign_element(ptr[0])) {
|
|
|
|
format->sign = ptr[0];
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line
Added PEP 3101.
........
r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines
Fixes contributed by Ori Avtalion.
........
r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line
Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).
........
r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line
Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it.
........
r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines
Close manifest file.
This change doesn't make any difference to CPython, but is a necessary fix for Jython.
........
r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines
Remove news about float repr() -- issue 1580 is still in limbo.
........
r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines
Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
........
r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines
configure.ac: Remove the configure check for _Bool, it is already done in the
top-level Python configure script.
configure, fficonfig.h.in: regenerated.
........
r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines
Replace 'has_key()' with 'in'.
Replace 'raise Error, stuff' with 'raise Error(stuff)'.
........
r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line
Update more instances of has_key().
........
r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines
Fix a few typos and layout glitches (more work is needed).
Move 2.5 news to Misc/HISTORY.
........
r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines
#2079: typo in userdict docs.
........
r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines
Part of #2154: minimal syntax fixes in doc example snippets.
........
r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line
First draft for itertools.product(). Docs and other updates forthcoming.
........
r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line
Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery)
........
r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines
A lot more typo fixes by Ori Avtalion.
........
r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines
Don't reference pyshell.
........
r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines
Another fix.
........
2008-02-22 12:37:40 -04:00
|
|
|
++ptr;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
2008-07-15 21:15:35 -03:00
|
|
|
/* If the next character is #, we're in alternate mode. This only
|
|
|
|
applies to integers. */
|
|
|
|
if (end-ptr >= 1 && ptr[0] == '#') {
|
2009-04-03 08:19:31 -03:00
|
|
|
format->alternate = 1;
|
|
|
|
++ptr;
|
2008-07-15 21:15:35 -03:00
|
|
|
}
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/* The special case for 0-padding (backwards compat) */
|
2007-08-30 19:23:08 -03:00
|
|
|
if (format->fill_char == '\0' && end-ptr >= 1 && ptr[0] == '0') {
|
2007-08-24 23:26:07 -03:00
|
|
|
format->fill_char = '0';
|
|
|
|
if (format->align == '\0') {
|
|
|
|
format->align = '=';
|
|
|
|
}
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line
Added PEP 3101.
........
r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines
Fixes contributed by Ori Avtalion.
........
r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line
Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).
........
r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line
Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it.
........
r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines
Close manifest file.
This change doesn't make any difference to CPython, but is a necessary fix for Jython.
........
r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines
Remove news about float repr() -- issue 1580 is still in limbo.
........
r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines
Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
........
r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines
configure.ac: Remove the configure check for _Bool, it is already done in the
top-level Python configure script.
configure, fficonfig.h.in: regenerated.
........
r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines
Replace 'has_key()' with 'in'.
Replace 'raise Error, stuff' with 'raise Error(stuff)'.
........
r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line
Update more instances of has_key().
........
r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines
Fix a few typos and layout glitches (more work is needed).
Move 2.5 news to Misc/HISTORY.
........
r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines
#2079: typo in userdict docs.
........
r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines
Part of #2154: minimal syntax fixes in doc example snippets.
........
r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line
First draft for itertools.product(). Docs and other updates forthcoming.
........
r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line
Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery)
........
r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines
A lot more typo fixes by Ori Avtalion.
........
r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines
Don't reference pyshell.
........
r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines
Another fix.
........
2008-02-22 12:37:40 -04:00
|
|
|
++ptr;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
consumed = get_integer(&ptr, end, &format->width);
|
|
|
|
if (consumed == -1)
|
|
|
|
/* Overflow error. Exception already set. */
|
|
|
|
return 0;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* If consumed is 0, we didn't consume any characters for the
|
|
|
|
width. In that case, reset the width to -1, because
|
|
|
|
get_integer() will have set it to zero. -1 is how we record
|
|
|
|
that the width wasn't specified. */
|
|
|
|
if (consumed == 0)
|
2007-08-24 23:26:07 -03:00
|
|
|
format->width = -1;
|
|
|
|
|
2009-04-03 11:45:06 -03:00
|
|
|
/* Comma signifies add thousands separators */
|
|
|
|
if (end-ptr && ptr[0] == ',') {
|
|
|
|
format->thousands_separators = 1;
|
|
|
|
++ptr;
|
|
|
|
}
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/* Parse field precision */
|
|
|
|
if (end-ptr && ptr[0] == '.') {
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line
Added PEP 3101.
........
r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines
Fixes contributed by Ori Avtalion.
........
r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line
Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).
........
r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line
Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it.
........
r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines
Close manifest file.
This change doesn't make any difference to CPython, but is a necessary fix for Jython.
........
r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines
Remove news about float repr() -- issue 1580 is still in limbo.
........
r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines
Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
........
r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines
configure.ac: Remove the configure check for _Bool, it is already done in the
top-level Python configure script.
configure, fficonfig.h.in: regenerated.
........
r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines
Replace 'has_key()' with 'in'.
Replace 'raise Error, stuff' with 'raise Error(stuff)'.
........
r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line
Update more instances of has_key().
........
r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines
Fix a few typos and layout glitches (more work is needed).
Move 2.5 news to Misc/HISTORY.
........
r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines
#2079: typo in userdict docs.
........
r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines
Part of #2154: minimal syntax fixes in doc example snippets.
........
r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line
First draft for itertools.product(). Docs and other updates forthcoming.
........
r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line
Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery)
........
r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines
A lot more typo fixes by Ori Avtalion.
........
r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines
Don't reference pyshell.
........
r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines
Another fix.
........
2008-02-22 12:37:40 -04:00
|
|
|
++ptr;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
consumed = get_integer(&ptr, end, &format->precision);
|
|
|
|
if (consumed == -1)
|
|
|
|
/* Overflow error. Exception already set. */
|
|
|
|
return 0;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Not having a precision after a dot is an error. */
|
|
|
|
if (consumed == 0) {
|
2007-08-24 23:26:07 -03:00
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"Format specifier missing precision");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Finally, parse the type field. */
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
if (end-ptr > 1) {
|
2009-04-16 17:16:10 -03:00
|
|
|
/* More than one char remain, invalid conversion spec. */
|
2007-08-24 23:26:07 -03:00
|
|
|
PyErr_Format(PyExc_ValueError, "Invalid conversion specification");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (end-ptr == 1) {
|
|
|
|
format->type = ptr[0];
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line
Added PEP 3101.
........
r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines
Fixes contributed by Ori Avtalion.
........
r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line
Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).
........
r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line
Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it.
........
r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines
Close manifest file.
This change doesn't make any difference to CPython, but is a necessary fix for Jython.
........
r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines
Remove news about float repr() -- issue 1580 is still in limbo.
........
r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines
Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
........
r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines
configure.ac: Remove the configure check for _Bool, it is already done in the
top-level Python configure script.
configure, fficonfig.h.in: regenerated.
........
r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines
Replace 'has_key()' with 'in'.
Replace 'raise Error, stuff' with 'raise Error(stuff)'.
........
r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line
Update more instances of has_key().
........
r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines
Fix a few typos and layout glitches (more work is needed).
Move 2.5 news to Misc/HISTORY.
........
r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines
#2079: typo in userdict docs.
........
r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines
Part of #2154: minimal syntax fixes in doc example snippets.
........
r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line
First draft for itertools.product(). Docs and other updates forthcoming.
........
r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line
Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery)
........
r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines
A lot more typo fixes by Ori Avtalion.
........
r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines
Don't reference pyshell.
........
r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines
Another fix.
........
2008-02-22 12:37:40 -04:00
|
|
|
++ptr;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Do as much validating as we can, just by looking at the format
|
|
|
|
specifier. Do not take into account what type of formatting
|
|
|
|
we're doing (int, float, string). */
|
|
|
|
|
|
|
|
if (format->thousands_separators) {
|
|
|
|
switch (format->type) {
|
|
|
|
case 'd':
|
|
|
|
case 'e':
|
|
|
|
case 'f':
|
|
|
|
case 'g':
|
|
|
|
case 'E':
|
|
|
|
case 'G':
|
|
|
|
case '%':
|
|
|
|
case 'F':
|
2009-04-22 14:04:27 -03:00
|
|
|
case '\0':
|
2009-04-16 17:16:10 -03:00
|
|
|
/* These are allowed. See PEP 378.*/
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"Cannot specify ',' with '%c'.", format->type);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-04-03 11:45:06 -03:00
|
|
|
}
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-04-29 22:00:33 -03:00
|
|
|
/* Calculate the padding needed. */
|
|
|
|
static void
|
|
|
|
calc_padding(Py_ssize_t nchars, Py_ssize_t width, STRINGLIB_CHAR align,
|
|
|
|
Py_ssize_t *n_lpadding, Py_ssize_t *n_rpadding,
|
|
|
|
Py_ssize_t *n_total)
|
|
|
|
{
|
|
|
|
if (width >= 0) {
|
|
|
|
if (nchars > width)
|
|
|
|
*n_total = nchars;
|
|
|
|
else
|
|
|
|
*n_total = width;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* not specified, use all of the chars and no more */
|
|
|
|
*n_total = nchars;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* figure out how much leading space we need, based on the
|
|
|
|
aligning */
|
|
|
|
if (align == '>')
|
|
|
|
*n_lpadding = *n_total - nchars;
|
|
|
|
else if (align == '^')
|
|
|
|
*n_lpadding = (*n_total - nchars) / 2;
|
|
|
|
else
|
|
|
|
*n_lpadding = 0;
|
|
|
|
|
|
|
|
*n_rpadding = *n_total - nchars - *n_lpadding;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Do the padding, and return a pointer to where the caller-supplied
|
|
|
|
content goes. */
|
|
|
|
static STRINGLIB_CHAR *
|
|
|
|
fill_padding(STRINGLIB_CHAR *p, Py_ssize_t nchars, STRINGLIB_CHAR fill_char,
|
|
|
|
Py_ssize_t n_lpadding, Py_ssize_t n_rpadding)
|
|
|
|
{
|
|
|
|
/* Pad on left. */
|
|
|
|
if (n_lpadding)
|
|
|
|
STRINGLIB_FILL(p, fill_char, n_lpadding);
|
|
|
|
|
|
|
|
/* Pad on right. */
|
|
|
|
if (n_rpadding)
|
|
|
|
STRINGLIB_FILL(p + nchars + n_lpadding, fill_char, n_rpadding);
|
|
|
|
|
|
|
|
/* Pointer to the user content. */
|
|
|
|
return p + n_lpadding;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined FORMAT_FLOAT || defined FORMAT_LONG || defined FORMAT_COMPLEX
|
2007-08-24 23:26:07 -03:00
|
|
|
/************************************************************************/
|
|
|
|
/*********** common routines for numeric formatting *********************/
|
|
|
|
/************************************************************************/
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Locale type codes. */
|
|
|
|
#define LT_CURRENT_LOCALE 0
|
|
|
|
#define LT_DEFAULT_LOCALE 1
|
|
|
|
#define LT_NO_LOCALE 2
|
|
|
|
|
|
|
|
/* Locale info needed for formatting integers and the part of floats
|
|
|
|
before and including the decimal. Note that locales only support
|
|
|
|
8-bit chars, not unicode. */
|
|
|
|
typedef struct {
|
|
|
|
char *decimal_point;
|
|
|
|
char *thousands_sep;
|
|
|
|
char *grouping;
|
|
|
|
} LocaleInfo;
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/* describes the layout for an integer, see the comment in
|
2008-07-15 21:15:35 -03:00
|
|
|
calc_number_widths() for details */
|
2007-08-24 23:26:07 -03:00
|
|
|
typedef struct {
|
|
|
|
Py_ssize_t n_lpadding;
|
2008-07-15 21:15:35 -03:00
|
|
|
Py_ssize_t n_prefix;
|
2007-08-24 23:26:07 -03:00
|
|
|
Py_ssize_t n_spadding;
|
|
|
|
Py_ssize_t n_rpadding;
|
2009-04-16 17:16:10 -03:00
|
|
|
char sign;
|
|
|
|
Py_ssize_t n_sign; /* number of digits needed for sign (0/1) */
|
|
|
|
Py_ssize_t n_grouped_digits; /* Space taken up by the digits, including
|
|
|
|
any grouping chars. */
|
|
|
|
Py_ssize_t n_decimal; /* 0 if only an integer */
|
|
|
|
Py_ssize_t n_remainder; /* Digits in decimal and/or exponent part,
|
|
|
|
excluding the decimal itself, if
|
|
|
|
present. */
|
|
|
|
|
|
|
|
/* These 2 are not the widths of fields, but are needed by
|
|
|
|
STRINGLIB_GROUPING. */
|
|
|
|
Py_ssize_t n_digits; /* The number of digits before a decimal
|
|
|
|
or exponent. */
|
|
|
|
Py_ssize_t n_min_width; /* The min_width we used when we computed
|
|
|
|
the n_grouped_digits width. */
|
2007-08-24 23:26:07 -03:00
|
|
|
} NumberFieldWidths;
|
|
|
|
|
2009-04-29 22:00:33 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Given a number of the form:
|
|
|
|
digits[remainder]
|
|
|
|
where ptr points to the start and end points to the end, find where
|
|
|
|
the integer part ends. This could be a decimal, an exponent, both,
|
|
|
|
or neither.
|
|
|
|
If a decimal point is present, set *has_decimal and increment
|
|
|
|
remainder beyond it.
|
|
|
|
Results are undefined (but shouldn't crash) for improperly
|
|
|
|
formatted strings.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
parse_number(STRINGLIB_CHAR *ptr, Py_ssize_t len,
|
|
|
|
Py_ssize_t *n_remainder, int *has_decimal)
|
|
|
|
{
|
|
|
|
STRINGLIB_CHAR *end = ptr + len;
|
|
|
|
STRINGLIB_CHAR *remainder;
|
|
|
|
|
|
|
|
while (ptr<end && isdigit(*ptr))
|
|
|
|
++ptr;
|
|
|
|
remainder = ptr;
|
|
|
|
|
|
|
|
/* Does remainder start with a decimal point? */
|
|
|
|
*has_decimal = ptr<end && *remainder == '.';
|
|
|
|
|
|
|
|
/* Skip the decimal point. */
|
|
|
|
if (*has_decimal)
|
|
|
|
remainder++;
|
|
|
|
|
|
|
|
*n_remainder = end - remainder;
|
|
|
|
}
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/* not all fields of format are used. for example, precision is
|
|
|
|
unused. should this take discrete params in order to be more clear
|
|
|
|
about what it does? or is passing a single format parameter easier
|
|
|
|
and more efficient enough to justify a little obfuscation? */
|
2009-04-16 17:16:10 -03:00
|
|
|
static Py_ssize_t
|
|
|
|
calc_number_widths(NumberFieldWidths *spec, Py_ssize_t n_prefix,
|
|
|
|
STRINGLIB_CHAR sign_char, STRINGLIB_CHAR *number,
|
|
|
|
Py_ssize_t n_number, Py_ssize_t n_remainder,
|
|
|
|
int has_decimal, const LocaleInfo *locale,
|
2009-04-03 08:19:31 -03:00
|
|
|
const InternalFormatSpec *format)
|
2007-08-24 23:26:07 -03:00
|
|
|
{
|
2009-04-16 17:16:10 -03:00
|
|
|
Py_ssize_t n_non_digit_non_padding;
|
|
|
|
Py_ssize_t n_padding;
|
|
|
|
|
|
|
|
spec->n_digits = n_number - n_remainder - (has_decimal?1:0);
|
2008-07-16 16:41:14 -03:00
|
|
|
spec->n_lpadding = 0;
|
2009-04-16 17:16:10 -03:00
|
|
|
spec->n_prefix = n_prefix;
|
|
|
|
spec->n_decimal = has_decimal ? strlen(locale->decimal_point) : 0;
|
|
|
|
spec->n_remainder = n_remainder;
|
2008-07-16 16:41:14 -03:00
|
|
|
spec->n_spadding = 0;
|
|
|
|
spec->n_rpadding = 0;
|
2009-04-16 17:16:10 -03:00
|
|
|
spec->sign = '\0';
|
|
|
|
spec->n_sign = 0;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
/* the output will look like:
|
2009-04-16 17:16:10 -03:00
|
|
|
| |
|
|
|
|
| <lpadding> <sign> <prefix> <spadding> <grouped_digits> <decimal> <remainder> <rpadding> |
|
|
|
|
| |
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
sign is computed from format->sign and the actual
|
2007-08-24 23:26:07 -03:00
|
|
|
sign of the number
|
|
|
|
|
2008-07-15 10:02:41 -03:00
|
|
|
prefix is given (it's for the '0x' prefix)
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
digits is already known
|
|
|
|
|
|
|
|
the total width is either given, or computed from the
|
|
|
|
actual digits
|
|
|
|
|
|
|
|
only one of lpadding, spadding, and rpadding can be non-zero,
|
|
|
|
and it's calculated from the width and other fields
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* compute the various parts we're going to write */
|
2009-04-16 17:16:10 -03:00
|
|
|
switch (format->sign) {
|
|
|
|
case '+':
|
2007-08-24 23:26:07 -03:00
|
|
|
/* always put a + or - */
|
2009-04-16 17:16:10 -03:00
|
|
|
spec->n_sign = 1;
|
|
|
|
spec->sign = (sign_char == '-' ? '-' : '+');
|
|
|
|
break;
|
|
|
|
case ' ':
|
|
|
|
spec->n_sign = 1;
|
|
|
|
spec->sign = (sign_char == '-' ? '-' : ' ');
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Not specified, or the default (-) */
|
|
|
|
if (sign_char == '-') {
|
|
|
|
spec->n_sign = 1;
|
|
|
|
spec->sign = '-';
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* The number of chars used for non-digits and non-padding. */
|
|
|
|
n_non_digit_non_padding = spec->n_sign + spec->n_prefix + spec->n_decimal +
|
|
|
|
spec->n_remainder;
|
2008-07-15 21:15:35 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* min_width can go negative, that's okay. format->width == -1 means
|
|
|
|
we don't care. */
|
|
|
|
if (format->fill_char == '0')
|
|
|
|
spec->n_min_width = format->width - n_non_digit_non_padding;
|
|
|
|
else
|
|
|
|
spec->n_min_width = 0;
|
|
|
|
|
|
|
|
if (spec->n_digits == 0)
|
|
|
|
/* This case only occurs when using 'c' formatting, we need
|
|
|
|
to special case it because the grouping code always wants
|
|
|
|
to have at least one character. */
|
|
|
|
spec->n_grouped_digits = 0;
|
|
|
|
else
|
|
|
|
spec->n_grouped_digits = STRINGLIB_GROUPING(NULL, 0, NULL,
|
|
|
|
spec->n_digits,
|
|
|
|
spec->n_min_width,
|
|
|
|
locale->grouping,
|
|
|
|
locale->thousands_sep);
|
|
|
|
|
|
|
|
/* Given the desired width and the total of digit and non-digit
|
|
|
|
space we consume, see if we need any padding. format->width can
|
|
|
|
be negative (meaning no padding), but this code still works in
|
|
|
|
that case. */
|
|
|
|
n_padding = format->width -
|
|
|
|
(n_non_digit_non_padding + spec->n_grouped_digits);
|
|
|
|
if (n_padding > 0) {
|
|
|
|
/* Some padding is needed. Determine if it's left, space, or right. */
|
|
|
|
switch (format->align) {
|
|
|
|
case '<':
|
|
|
|
spec->n_rpadding = n_padding;
|
|
|
|
break;
|
|
|
|
case '^':
|
|
|
|
spec->n_lpadding = n_padding / 2;
|
|
|
|
spec->n_rpadding = n_padding - spec->n_lpadding;
|
|
|
|
break;
|
|
|
|
case '=':
|
|
|
|
spec->n_spadding = n_padding;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Handles '>', plus catch-all just in case. */
|
|
|
|
spec->n_lpadding = n_padding;
|
|
|
|
break;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
}
|
2009-04-16 17:16:10 -03:00
|
|
|
return spec->n_lpadding + spec->n_sign + spec->n_prefix +
|
|
|
|
spec->n_spadding + spec->n_grouped_digits + spec->n_decimal +
|
|
|
|
spec->n_remainder + spec->n_rpadding;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Fill in the digit parts of a numbers's string representation,
|
|
|
|
as determined in calc_number_widths().
|
|
|
|
No error checking, since we know the buffer is the correct size. */
|
|
|
|
static void
|
|
|
|
fill_number(STRINGLIB_CHAR *buf, const NumberFieldWidths *spec,
|
|
|
|
STRINGLIB_CHAR *digits, Py_ssize_t n_digits,
|
|
|
|
STRINGLIB_CHAR *prefix, STRINGLIB_CHAR fill_char,
|
|
|
|
LocaleInfo *locale, int toupper)
|
2007-08-24 23:26:07 -03:00
|
|
|
{
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Used to keep track of digits, decimal, and remainder. */
|
|
|
|
STRINGLIB_CHAR *p = digits;
|
|
|
|
|
|
|
|
#ifndef NDEBUG
|
|
|
|
Py_ssize_t r;
|
|
|
|
#endif
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
if (spec->n_lpadding) {
|
2009-04-16 17:16:10 -03:00
|
|
|
STRINGLIB_FILL(buf, fill_char, spec->n_lpadding);
|
|
|
|
buf += spec->n_lpadding;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
2009-04-16 17:16:10 -03:00
|
|
|
if (spec->n_sign == 1) {
|
|
|
|
*buf++ = spec->sign;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
2008-07-15 21:15:35 -03:00
|
|
|
if (spec->n_prefix) {
|
2009-04-16 17:16:10 -03:00
|
|
|
memmove(buf,
|
2009-04-03 08:19:31 -03:00
|
|
|
prefix,
|
|
|
|
spec->n_prefix * sizeof(STRINGLIB_CHAR));
|
2009-04-16 17:16:10 -03:00
|
|
|
if (toupper) {
|
|
|
|
Py_ssize_t t;
|
|
|
|
for (t = 0; t < spec->n_prefix; ++t)
|
|
|
|
buf[t] = STRINGLIB_TOUPPER(buf[t]);
|
|
|
|
}
|
|
|
|
buf += spec->n_prefix;
|
2008-07-15 21:15:35 -03:00
|
|
|
}
|
2007-08-24 23:26:07 -03:00
|
|
|
if (spec->n_spadding) {
|
2009-04-16 17:16:10 -03:00
|
|
|
STRINGLIB_FILL(buf, fill_char, spec->n_spadding);
|
|
|
|
buf += spec->n_spadding;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
2009-04-16 17:16:10 -03:00
|
|
|
|
|
|
|
/* Only for type 'c' special case, it has no digits. */
|
|
|
|
if (spec->n_digits != 0) {
|
|
|
|
/* Fill the digits with InsertThousandsGrouping. */
|
|
|
|
#ifndef NDEBUG
|
|
|
|
r =
|
|
|
|
#endif
|
|
|
|
STRINGLIB_GROUPING(buf, spec->n_grouped_digits, digits,
|
|
|
|
spec->n_digits, spec->n_min_width,
|
|
|
|
locale->grouping, locale->thousands_sep);
|
|
|
|
#ifndef NDEBUG
|
|
|
|
assert(r == spec->n_grouped_digits);
|
|
|
|
#endif
|
|
|
|
p += spec->n_digits;
|
|
|
|
}
|
|
|
|
if (toupper) {
|
|
|
|
Py_ssize_t t;
|
|
|
|
for (t = 0; t < spec->n_grouped_digits; ++t)
|
|
|
|
buf[t] = STRINGLIB_TOUPPER(buf[t]);
|
|
|
|
}
|
|
|
|
buf += spec->n_grouped_digits;
|
|
|
|
|
|
|
|
if (spec->n_decimal) {
|
|
|
|
Py_ssize_t t;
|
|
|
|
for (t = 0; t < spec->n_decimal; ++t)
|
|
|
|
buf[t] = locale->decimal_point[t];
|
|
|
|
buf += spec->n_decimal;
|
|
|
|
p += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (spec->n_remainder) {
|
|
|
|
memcpy(buf, p, spec->n_remainder * sizeof(STRINGLIB_CHAR));
|
|
|
|
buf += spec->n_remainder;
|
|
|
|
p += spec->n_remainder;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
2009-04-16 17:16:10 -03:00
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
if (spec->n_rpadding) {
|
2009-04-16 17:16:10 -03:00
|
|
|
STRINGLIB_FILL(buf, fill_char, spec->n_rpadding);
|
|
|
|
buf += spec->n_rpadding;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static char no_grouping[1] = {CHAR_MAX};
|
|
|
|
|
|
|
|
/* Find the decimal point character(s?), thousands_separator(s?), and
|
|
|
|
grouping description, either for the current locale if type is
|
|
|
|
LT_CURRENT_LOCALE, a hard-coded locale if LT_DEFAULT_LOCALE, or
|
|
|
|
none if LT_NO_LOCALE. */
|
|
|
|
static void
|
|
|
|
get_locale_info(int type, LocaleInfo *locale_info)
|
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case LT_CURRENT_LOCALE: {
|
|
|
|
struct lconv *locale_data = localeconv();
|
|
|
|
locale_info->decimal_point = locale_data->decimal_point;
|
|
|
|
locale_info->thousands_sep = locale_data->thousands_sep;
|
|
|
|
locale_info->grouping = locale_data->grouping;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LT_DEFAULT_LOCALE:
|
|
|
|
locale_info->decimal_point = ".";
|
|
|
|
locale_info->thousands_sep = ",";
|
|
|
|
locale_info->grouping = "\3"; /* Group every 3 characters,
|
|
|
|
trailing 0 means repeat
|
|
|
|
infinitely. */
|
|
|
|
break;
|
|
|
|
case LT_NO_LOCALE:
|
|
|
|
locale_info->decimal_point = ".";
|
|
|
|
locale_info->thousands_sep = "";
|
|
|
|
locale_info->grouping = no_grouping;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
assert(0);
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
}
|
2009-04-16 17:16:10 -03:00
|
|
|
|
2009-04-29 22:00:33 -03:00
|
|
|
#endif /* FORMAT_FLOAT || FORMAT_LONG || FORMAT_COMPLEX */
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/*********** string formatting ******************************************/
|
|
|
|
/************************************************************************/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
format_string_internal(PyObject *value, const InternalFormatSpec *format)
|
|
|
|
{
|
|
|
|
Py_ssize_t lpad;
|
2009-04-29 22:00:33 -03:00
|
|
|
Py_ssize_t rpad;
|
|
|
|
Py_ssize_t total;
|
|
|
|
STRINGLIB_CHAR *p;
|
2007-08-24 23:26:07 -03:00
|
|
|
Py_ssize_t len = STRINGLIB_LEN(value);
|
|
|
|
PyObject *result = NULL;
|
|
|
|
|
|
|
|
/* sign is not allowed on strings */
|
|
|
|
if (format->sign != '\0') {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Sign not allowed in string format specifier");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2008-07-15 10:02:41 -03:00
|
|
|
/* alternate is not allowed on strings */
|
|
|
|
if (format->alternate) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Alternate form (#) not allowed in string format "
|
2009-04-03 08:19:31 -03:00
|
|
|
"specifier");
|
2008-07-15 10:02:41 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/* '=' alignment not allowed on strings */
|
|
|
|
if (format->align == '=') {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"'=' alignment not allowed "
|
|
|
|
"in string format specifier");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if precision is specified, output no more that format.precision
|
|
|
|
characters */
|
|
|
|
if (format->precision >= 0 && len >= format->precision) {
|
|
|
|
len = format->precision;
|
|
|
|
}
|
|
|
|
|
2009-04-29 22:00:33 -03:00
|
|
|
calc_padding(len, format->width, format->align, &lpad, &rpad, &total);
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
/* allocate the resulting string */
|
2009-04-29 22:00:33 -03:00
|
|
|
result = STRINGLIB_NEW(NULL, total);
|
2007-08-24 23:26:07 -03:00
|
|
|
if (result == NULL)
|
|
|
|
goto done;
|
|
|
|
|
2009-04-29 22:00:33 -03:00
|
|
|
/* Write into that space. First the padding. */
|
|
|
|
p = fill_padding(STRINGLIB_STR(result), len,
|
|
|
|
format->fill_char=='\0'?' ':format->fill_char,
|
|
|
|
lpad, rpad);
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-29 22:00:33 -03:00
|
|
|
/* Then the source string. */
|
|
|
|
memcpy(p, STRINGLIB_STR(value), len * sizeof(STRINGLIB_CHAR));
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
done:
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/*********** long formatting ********************************************/
|
|
|
|
/************************************************************************/
|
|
|
|
|
2008-02-17 15:48:00 -04:00
|
|
|
#if defined FORMAT_LONG || defined FORMAT_INT
|
|
|
|
typedef PyObject*
|
|
|
|
(*IntOrLongToString)(PyObject *value, int base);
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
static PyObject *
|
2008-02-17 15:48:00 -04:00
|
|
|
format_int_or_long_internal(PyObject *value, const InternalFormatSpec *format,
|
2009-04-03 08:19:31 -03:00
|
|
|
IntOrLongToString tostring)
|
2007-08-24 23:26:07 -03:00
|
|
|
{
|
|
|
|
PyObject *result = NULL;
|
2008-02-17 15:48:00 -04:00
|
|
|
PyObject *tmp = NULL;
|
|
|
|
STRINGLIB_CHAR *pnumeric_chars;
|
|
|
|
STRINGLIB_CHAR numeric_char;
|
2009-04-16 17:16:10 -03:00
|
|
|
STRINGLIB_CHAR sign_char = '\0';
|
2007-08-24 23:26:07 -03:00
|
|
|
Py_ssize_t n_digits; /* count of digits need from the computed
|
|
|
|
string */
|
2009-04-16 17:16:10 -03:00
|
|
|
Py_ssize_t n_remainder = 0; /* Used only for 'c' formatting, which
|
|
|
|
produces non-digits */
|
2008-07-15 21:15:35 -03:00
|
|
|
Py_ssize_t n_prefix = 0; /* Count of prefix chars, (e.g., '0x') */
|
2009-04-16 17:16:10 -03:00
|
|
|
Py_ssize_t n_total;
|
2008-07-15 21:15:35 -03:00
|
|
|
STRINGLIB_CHAR *prefix = NULL;
|
2007-08-24 23:26:07 -03:00
|
|
|
NumberFieldWidths spec;
|
|
|
|
long x;
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Locale settings, either from the actual locale or
|
|
|
|
from a hard-code pseudo-locale */
|
|
|
|
LocaleInfo locale;
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/* no precision allowed on integers */
|
|
|
|
if (format->precision != -1) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Precision not allowed in integer format specifier");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* special case for character formatting */
|
|
|
|
if (format->type == 'c') {
|
|
|
|
/* error to specify a sign */
|
|
|
|
if (format->sign != '\0') {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Sign not allowed with integer"
|
|
|
|
" format specifier 'c'");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Error to specify a comma. */
|
|
|
|
if (format->thousands_separators) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Thousands separators not allowed with integer"
|
|
|
|
" format specifier 'c'");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/* taken from unicodeobject.c formatchar() */
|
|
|
|
/* Integer input truncated to a character */
|
2008-02-17 15:48:00 -04:00
|
|
|
/* XXX: won't work for int */
|
2007-12-02 10:31:20 -04:00
|
|
|
x = PyLong_AsLong(value);
|
2007-08-24 23:26:07 -03:00
|
|
|
if (x == -1 && PyErr_Occurred())
|
|
|
|
goto done;
|
|
|
|
#ifdef Py_UNICODE_WIDE
|
|
|
|
if (x < 0 || x > 0x10ffff) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"%c arg not in range(0x110000) "
|
|
|
|
"(wide Python build)");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
if (x < 0 || x > 0xffff) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"%c arg not in range(0x10000) "
|
|
|
|
"(narrow Python build)");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
#endif
|
2009-04-03 08:19:31 -03:00
|
|
|
numeric_char = (STRINGLIB_CHAR)x;
|
|
|
|
pnumeric_chars = &numeric_char;
|
2008-02-17 15:48:00 -04:00
|
|
|
n_digits = 1;
|
2009-04-16 17:16:10 -03:00
|
|
|
|
|
|
|
/* As a sort-of hack, we tell calc_number_widths that we only
|
|
|
|
have "remainder" characters. calc_number_widths thinks
|
|
|
|
these are characters that don't get formatted, only copied
|
|
|
|
into the output string. We do this for 'c' formatting,
|
|
|
|
because the characters are likely to be non-digits. */
|
|
|
|
n_remainder = 1;
|
2007-08-27 22:07:27 -03:00
|
|
|
}
|
|
|
|
else {
|
2007-08-24 23:26:07 -03:00
|
|
|
int base;
|
2009-04-03 08:19:31 -03:00
|
|
|
int leading_chars_to_skip = 0; /* Number of characters added by
|
|
|
|
PyNumber_ToBase that we want to
|
|
|
|
skip over. */
|
2008-02-17 15:48:00 -04:00
|
|
|
|
|
|
|
/* Compute the base and how many characters will be added by
|
2007-08-24 23:26:07 -03:00
|
|
|
PyNumber_ToBase */
|
|
|
|
switch (format->type) {
|
|
|
|
case 'b':
|
|
|
|
base = 2;
|
2009-04-03 08:19:31 -03:00
|
|
|
leading_chars_to_skip = 2; /* 0b */
|
2007-08-24 23:26:07 -03:00
|
|
|
break;
|
|
|
|
case 'o':
|
|
|
|
base = 8;
|
2009-04-03 08:19:31 -03:00
|
|
|
leading_chars_to_skip = 2; /* 0o */
|
2007-08-24 23:26:07 -03:00
|
|
|
break;
|
|
|
|
case 'x':
|
|
|
|
case 'X':
|
|
|
|
base = 16;
|
2009-04-03 08:19:31 -03:00
|
|
|
leading_chars_to_skip = 2; /* 0x */
|
2007-08-24 23:26:07 -03:00
|
|
|
break;
|
|
|
|
default: /* shouldn't be needed, but stops a compiler warning */
|
|
|
|
case 'd':
|
Merged revisions 63078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
When forward porting this, I added _PyUnicode_InsertThousandsGrouping.
........
r63078 | eric.smith | 2008-05-11 15:52:48 -0400 (Sun, 11 May 2008) | 14 lines
Addresses issue 2802: 'n' formatting for integers.
Adds 'n' as a format specifier for integers, to mirror the same
specifier which is already available for floats. 'n' is the same as
'd', but inserts the current locale-specific thousands grouping.
I added this as a stringlib function, but it's only used by str type,
not unicode. This is because of an implementation detail in
unicode.format(), which does its own str->unicode conversion. But the
unicode version will be needed in 3.0, and it may be needed by other
code eventually in 2.6 (maybe decimal?), so I left it as a stringlib
implementation. As long as the unicode version isn't instantiated,
there's no overhead for this.
........
2008-05-11 18:00:57 -03:00
|
|
|
case 'n':
|
2007-08-24 23:26:07 -03:00
|
|
|
base = 10;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-04-03 08:19:31 -03:00
|
|
|
/* The number of prefix chars is the same as the leading
|
|
|
|
chars to skip */
|
|
|
|
if (format->alternate)
|
|
|
|
n_prefix = leading_chars_to_skip;
|
2008-07-15 21:15:35 -03:00
|
|
|
|
2008-02-17 15:48:00 -04:00
|
|
|
/* Do the hard part, converting to a string in a given base */
|
2009-04-03 08:19:31 -03:00
|
|
|
tmp = tostring(value, base);
|
2008-02-17 15:48:00 -04:00
|
|
|
if (tmp == NULL)
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
|
2009-04-03 08:19:31 -03:00
|
|
|
pnumeric_chars = STRINGLIB_STR(tmp);
|
2008-02-17 15:48:00 -04:00
|
|
|
n_digits = STRINGLIB_LEN(tmp);
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-03 08:19:31 -03:00
|
|
|
prefix = pnumeric_chars;
|
2008-07-15 21:15:35 -03:00
|
|
|
|
2009-04-03 08:19:31 -03:00
|
|
|
/* Remember not to modify what pnumeric_chars points to. it
|
|
|
|
might be interned. Only modify it after we copy it into a
|
|
|
|
newly allocated output buffer. */
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2008-02-17 15:48:00 -04:00
|
|
|
/* Is a sign character present in the output? If so, remember it
|
2007-08-24 23:26:07 -03:00
|
|
|
and skip it */
|
2009-04-16 17:16:10 -03:00
|
|
|
if (pnumeric_chars[0] == '-') {
|
|
|
|
sign_char = pnumeric_chars[0];
|
2009-04-03 08:19:31 -03:00
|
|
|
++prefix;
|
|
|
|
++leading_chars_to_skip;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
2009-04-03 08:19:31 -03:00
|
|
|
/* Skip over the leading chars (0x, 0b, etc.) */
|
|
|
|
n_digits -= leading_chars_to_skip;
|
|
|
|
pnumeric_chars += leading_chars_to_skip;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Determine the grouping, separator, and decimal point, if any. */
|
|
|
|
get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE :
|
|
|
|
(format->thousands_separators ?
|
|
|
|
LT_DEFAULT_LOCALE :
|
|
|
|
LT_NO_LOCALE),
|
|
|
|
&locale);
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Calculate how much memory we'll need. */
|
|
|
|
n_total = calc_number_widths(&spec, n_prefix, sign_char, pnumeric_chars,
|
|
|
|
n_digits, n_remainder, 0, &locale, format);
|
Merged revisions 63078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
When forward porting this, I added _PyUnicode_InsertThousandsGrouping.
........
r63078 | eric.smith | 2008-05-11 15:52:48 -0400 (Sun, 11 May 2008) | 14 lines
Addresses issue 2802: 'n' formatting for integers.
Adds 'n' as a format specifier for integers, to mirror the same
specifier which is already available for floats. 'n' is the same as
'd', but inserts the current locale-specific thousands grouping.
I added this as a stringlib function, but it's only used by str type,
not unicode. This is because of an implementation detail in
unicode.format(), which does its own str->unicode conversion. But the
unicode version will be needed in 3.0, and it may be needed by other
code eventually in 2.6 (maybe decimal?), so I left it as a stringlib
implementation. As long as the unicode version isn't instantiated,
there's no overhead for this.
........
2008-05-11 18:00:57 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Allocate the memory. */
|
|
|
|
result = STRINGLIB_NEW(NULL, n_total);
|
|
|
|
if (!result)
|
|
|
|
goto done;
|
2008-07-15 21:15:35 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Populate the memory. */
|
|
|
|
fill_number(STRINGLIB_STR(result), &spec, pnumeric_chars, n_digits,
|
|
|
|
prefix, format->fill_char == '\0' ? ' ' : format->fill_char,
|
|
|
|
&locale, format->type == 'X');
|
2008-07-15 21:15:35 -03:00
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
done:
|
2008-02-17 15:48:00 -04:00
|
|
|
Py_XDECREF(tmp);
|
2007-08-24 23:26:07 -03:00
|
|
|
return result;
|
|
|
|
}
|
2008-02-17 15:48:00 -04:00
|
|
|
#endif /* defined FORMAT_LONG || defined FORMAT_INT */
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/*********** float formatting *******************************************/
|
|
|
|
/************************************************************************/
|
|
|
|
|
2008-02-17 15:48:00 -04:00
|
|
|
#ifdef FORMAT_FLOAT
|
|
|
|
#if STRINGLIB_IS_UNICODE
|
2009-04-16 17:16:10 -03:00
|
|
|
static void
|
|
|
|
strtounicode(Py_UNICODE *buffer, const char *charbuffer, Py_ssize_t len)
|
2007-08-24 23:26:07 -03:00
|
|
|
{
|
2009-04-16 17:16:10 -03:00
|
|
|
Py_ssize_t i;
|
|
|
|
for (i = 0; i < len; ++i)
|
|
|
|
buffer[i] = (Py_UNICODE)charbuffer[i];
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
2008-02-17 15:48:00 -04:00
|
|
|
#endif
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
/* much of this is taken from unicodeobject.c */
|
|
|
|
static PyObject *
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line
Added PEP 3101.
........
r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines
Fixes contributed by Ori Avtalion.
........
r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line
Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).
........
r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line
Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it.
........
r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines
Close manifest file.
This change doesn't make any difference to CPython, but is a necessary fix for Jython.
........
r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines
Remove news about float repr() -- issue 1580 is still in limbo.
........
r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines
Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
........
r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines
configure.ac: Remove the configure check for _Bool, it is already done in the
top-level Python configure script.
configure, fficonfig.h.in: regenerated.
........
r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines
Replace 'has_key()' with 'in'.
Replace 'raise Error, stuff' with 'raise Error(stuff)'.
........
r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line
Update more instances of has_key().
........
r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines
Fix a few typos and layout glitches (more work is needed).
Move 2.5 news to Misc/HISTORY.
........
r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines
#2079: typo in userdict docs.
........
r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines
Part of #2154: minimal syntax fixes in doc example snippets.
........
r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line
First draft for itertools.product(). Docs and other updates forthcoming.
........
r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line
Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery)
........
r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines
A lot more typo fixes by Ori Avtalion.
........
r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines
Don't reference pyshell.
........
r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines
Another fix.
........
2008-02-22 12:37:40 -04:00
|
|
|
format_float_internal(PyObject *value,
|
2009-04-03 08:19:31 -03:00
|
|
|
const InternalFormatSpec *format)
|
2007-08-24 23:26:07 -03:00
|
|
|
{
|
2009-04-16 17:16:10 -03:00
|
|
|
char *buf = NULL; /* buffer returned from PyOS_double_to_string */
|
2007-08-24 23:26:07 -03:00
|
|
|
Py_ssize_t n_digits;
|
2009-04-16 17:16:10 -03:00
|
|
|
Py_ssize_t n_remainder;
|
|
|
|
Py_ssize_t n_total;
|
|
|
|
int has_decimal;
|
|
|
|
double val;
|
2007-08-24 23:26:07 -03:00
|
|
|
Py_ssize_t precision = format->precision;
|
2009-05-05 11:04:18 -03:00
|
|
|
Py_ssize_t default_precision = 6;
|
2009-04-16 17:16:10 -03:00
|
|
|
STRINGLIB_CHAR type = format->type;
|
|
|
|
int add_pct = 0;
|
2007-08-24 23:26:07 -03:00
|
|
|
STRINGLIB_CHAR *p;
|
|
|
|
NumberFieldWidths spec;
|
2009-04-16 17:16:10 -03:00
|
|
|
int flags = 0;
|
|
|
|
PyObject *result = NULL;
|
|
|
|
STRINGLIB_CHAR sign_char = '\0';
|
|
|
|
int float_type; /* Used to see if we have a nan, inf, or regular float. */
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
#if STRINGLIB_IS_UNICODE
|
2009-04-16 17:16:10 -03:00
|
|
|
Py_UNICODE *unicode_tmp = NULL;
|
2007-08-24 23:26:07 -03:00
|
|
|
#endif
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Locale settings, either from the actual locale or
|
|
|
|
from a hard-code pseudo-locale */
|
|
|
|
LocaleInfo locale;
|
|
|
|
|
|
|
|
/* Alternate is not allowed on floats. */
|
2008-07-15 10:02:41 -03:00
|
|
|
if (format->alternate) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Alternate form (#) not allowed in float format "
|
2009-04-03 08:19:31 -03:00
|
|
|
"specifier");
|
2008-07-15 10:02:41 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
if (type == '\0') {
|
2009-05-05 11:04:18 -03:00
|
|
|
/* Omitted type specifier. This is like 'g' but with at least one
|
|
|
|
digit after the decimal point, and different default precision.*/
|
2009-04-16 17:16:10 -03:00
|
|
|
type = 'g';
|
2009-05-05 11:04:18 -03:00
|
|
|
default_precision = PyFloat_STR_PRECISION;
|
2009-04-16 17:16:10 -03:00
|
|
|
flags |= Py_DTSF_ADD_DOT_0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type == 'n')
|
|
|
|
/* 'n' is the same as 'g', except for the locale used to
|
|
|
|
format the result. We take care of that later. */
|
|
|
|
type = 'g';
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-07-26 23:12:11 -03:00
|
|
|
#if PY_VERSION_HEX < 0x0301000
|
|
|
|
/* 'F' is the same as 'f', per the PEP */
|
|
|
|
/* This is no longer the case in 3.x */
|
|
|
|
if (type == 'F')
|
|
|
|
type = 'f';
|
|
|
|
#endif
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
val = PyFloat_AsDouble(value);
|
|
|
|
if (val == -1.0 && PyErr_Occurred())
|
2007-08-30 19:23:08 -03:00
|
|
|
goto done;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
if (type == '%') {
|
|
|
|
type = 'f';
|
2009-04-16 17:16:10 -03:00
|
|
|
val *= 100;
|
|
|
|
add_pct = 1;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (precision < 0)
|
2009-05-05 11:04:18 -03:00
|
|
|
precision = default_precision;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-05-02 09:15:39 -03:00
|
|
|
#if PY_VERSION_HEX < 0x03010000
|
|
|
|
/* 3.1 no longer converts large 'f' to 'g'. */
|
2009-07-26 23:12:11 -03:00
|
|
|
if ((type == 'f' || type == 'F') && fabs(val) >= 1e50)
|
|
|
|
type = 'g';
|
2009-05-02 09:15:39 -03:00
|
|
|
#endif
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Cast "type", because if we're in unicode we need to pass a
|
|
|
|
8-bit char. This is safe, because we've restricted what "type"
|
|
|
|
can be. */
|
|
|
|
buf = PyOS_double_to_string(val, (char)type, precision, flags,
|
|
|
|
&float_type);
|
|
|
|
if (buf == NULL)
|
|
|
|
goto done;
|
|
|
|
n_digits = strlen(buf);
|
|
|
|
|
|
|
|
if (add_pct) {
|
|
|
|
/* We know that buf has a trailing zero (since we just called
|
|
|
|
strlen() on it), and we don't use that fact any more. So we
|
|
|
|
can just write over the trailing zero. */
|
|
|
|
buf[n_digits] = '%';
|
|
|
|
n_digits += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Since there is no unicode version of PyOS_double_to_string,
|
|
|
|
just use the 8 bit version and then convert to unicode. */
|
2007-08-24 23:26:07 -03:00
|
|
|
#if STRINGLIB_IS_UNICODE
|
2009-04-16 17:16:10 -03:00
|
|
|
unicode_tmp = (Py_UNICODE*)PyMem_Malloc((n_digits)*sizeof(Py_UNICODE));
|
|
|
|
if (unicode_tmp == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
strtounicode(unicode_tmp, buf, n_digits);
|
|
|
|
p = unicode_tmp;
|
2007-08-24 23:26:07 -03:00
|
|
|
#else
|
2009-04-16 17:16:10 -03:00
|
|
|
p = buf;
|
2007-08-24 23:26:07 -03:00
|
|
|
#endif
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Is a sign character present in the output? If so, remember it
|
2007-08-24 23:26:07 -03:00
|
|
|
and skip it */
|
2009-04-16 17:16:10 -03:00
|
|
|
if (*p == '-') {
|
|
|
|
sign_char = *p;
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line
Added PEP 3101.
........
r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines
Fixes contributed by Ori Avtalion.
........
r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line
Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).
........
r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line
Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it.
........
r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines
Close manifest file.
This change doesn't make any difference to CPython, but is a necessary fix for Jython.
........
r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines
Remove news about float repr() -- issue 1580 is still in limbo.
........
r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines
Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
........
r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines
configure.ac: Remove the configure check for _Bool, it is already done in the
top-level Python configure script.
configure, fficonfig.h.in: regenerated.
........
r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines
Replace 'has_key()' with 'in'.
Replace 'raise Error, stuff' with 'raise Error(stuff)'.
........
r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line
Update more instances of has_key().
........
r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines
Fix a few typos and layout glitches (more work is needed).
Move 2.5 news to Misc/HISTORY.
........
r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines
#2079: typo in userdict docs.
........
r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines
Part of #2154: minimal syntax fixes in doc example snippets.
........
r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line
First draft for itertools.product(). Docs and other updates forthcoming.
........
r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line
Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery)
........
r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines
A lot more typo fixes by Ori Avtalion.
........
r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines
Don't reference pyshell.
........
r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines
Another fix.
........
2008-02-22 12:37:40 -04:00
|
|
|
++p;
|
|
|
|
--n_digits;
|
2007-08-24 23:26:07 -03:00
|
|
|
}
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Determine if we have any "remainder" (after the digits, might include
|
|
|
|
decimal or exponent or both (or neither)) */
|
|
|
|
parse_number(p, n_digits, &n_remainder, &has_decimal);
|
|
|
|
|
|
|
|
/* Determine the grouping, separator, and decimal point, if any. */
|
|
|
|
get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE :
|
|
|
|
(format->thousands_separators ?
|
|
|
|
LT_DEFAULT_LOCALE :
|
|
|
|
LT_NO_LOCALE),
|
|
|
|
&locale);
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Calculate how much memory we'll need. */
|
|
|
|
n_total = calc_number_widths(&spec, 0, sign_char, p, n_digits,
|
|
|
|
n_remainder, has_decimal, &locale, format);
|
|
|
|
|
|
|
|
/* Allocate the memory. */
|
|
|
|
result = STRINGLIB_NEW(NULL, n_total);
|
2007-08-24 23:26:07 -03:00
|
|
|
if (result == NULL)
|
|
|
|
goto done;
|
|
|
|
|
2009-04-16 17:16:10 -03:00
|
|
|
/* Populate the memory. */
|
|
|
|
fill_number(STRINGLIB_STR(result), &spec, p, n_digits, NULL,
|
|
|
|
format->fill_char == '\0' ? ' ' : format->fill_char, &locale,
|
|
|
|
0);
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
done:
|
2009-04-16 17:16:10 -03:00
|
|
|
PyMem_Free(buf);
|
|
|
|
#if STRINGLIB_IS_UNICODE
|
|
|
|
PyMem_Free(unicode_tmp);
|
|
|
|
#endif
|
2007-08-24 23:26:07 -03:00
|
|
|
return result;
|
|
|
|
}
|
2008-02-17 15:48:00 -04:00
|
|
|
#endif /* FORMAT_FLOAT */
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2009-04-29 22:00:33 -03:00
|
|
|
/************************************************************************/
|
|
|
|
/*********** complex formatting *****************************************/
|
|
|
|
/************************************************************************/
|
|
|
|
|
|
|
|
#ifdef FORMAT_COMPLEX
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
format_complex_internal(PyObject *value,
|
|
|
|
const InternalFormatSpec *format)
|
|
|
|
{
|
|
|
|
double re;
|
|
|
|
double im;
|
|
|
|
char *re_buf = NULL; /* buffer returned from PyOS_double_to_string */
|
|
|
|
char *im_buf = NULL; /* buffer returned from PyOS_double_to_string */
|
|
|
|
|
|
|
|
InternalFormatSpec tmp_format = *format;
|
|
|
|
Py_ssize_t n_re_digits;
|
|
|
|
Py_ssize_t n_im_digits;
|
|
|
|
Py_ssize_t n_re_remainder;
|
|
|
|
Py_ssize_t n_im_remainder;
|
|
|
|
Py_ssize_t n_re_total;
|
|
|
|
Py_ssize_t n_im_total;
|
|
|
|
int re_has_decimal;
|
|
|
|
int im_has_decimal;
|
|
|
|
Py_ssize_t precision = format->precision;
|
2009-05-05 11:04:18 -03:00
|
|
|
Py_ssize_t default_precision = 6;
|
2009-04-29 22:00:33 -03:00
|
|
|
STRINGLIB_CHAR type = format->type;
|
|
|
|
STRINGLIB_CHAR *p_re;
|
|
|
|
STRINGLIB_CHAR *p_im;
|
|
|
|
NumberFieldWidths re_spec;
|
|
|
|
NumberFieldWidths im_spec;
|
|
|
|
int flags = 0;
|
|
|
|
PyObject *result = NULL;
|
|
|
|
STRINGLIB_CHAR *p;
|
|
|
|
STRINGLIB_CHAR re_sign_char = '\0';
|
|
|
|
STRINGLIB_CHAR im_sign_char = '\0';
|
|
|
|
int re_float_type; /* Used to see if we have a nan, inf, or regular float. */
|
|
|
|
int im_float_type;
|
|
|
|
int add_parens = 0;
|
|
|
|
int skip_re = 0;
|
|
|
|
Py_ssize_t lpad;
|
|
|
|
Py_ssize_t rpad;
|
|
|
|
Py_ssize_t total;
|
|
|
|
|
|
|
|
#if STRINGLIB_IS_UNICODE
|
|
|
|
Py_UNICODE *re_unicode_tmp = NULL;
|
|
|
|
Py_UNICODE *im_unicode_tmp = NULL;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Locale settings, either from the actual locale or
|
|
|
|
from a hard-code pseudo-locale */
|
|
|
|
LocaleInfo locale;
|
|
|
|
|
|
|
|
/* Alternate is not allowed on complex. */
|
|
|
|
if (format->alternate) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Alternate form (#) not allowed in complex format "
|
|
|
|
"specifier");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Neither is zero pading. */
|
|
|
|
if (format->fill_char == '0') {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Zero padding is not allowed in complex format "
|
|
|
|
"specifier");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Neither is '=' alignment . */
|
|
|
|
if (format->align == '=') {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"'=' alignment flag is not allowed in complex format "
|
|
|
|
"specifier");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
re = PyComplex_RealAsDouble(value);
|
|
|
|
if (re == -1.0 && PyErr_Occurred())
|
|
|
|
goto done;
|
|
|
|
im = PyComplex_ImagAsDouble(value);
|
|
|
|
if (im == -1.0 && PyErr_Occurred())
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
if (type == '\0') {
|
|
|
|
/* Omitted type specifier. Should be like str(self). */
|
|
|
|
type = 'g';
|
2009-05-05 11:04:18 -03:00
|
|
|
default_precision = PyFloat_STR_PRECISION;
|
2009-04-29 22:00:33 -03:00
|
|
|
add_parens = 1;
|
|
|
|
if (re == 0.0)
|
|
|
|
skip_re = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type == 'n')
|
|
|
|
/* 'n' is the same as 'g', except for the locale used to
|
|
|
|
format the result. We take care of that later. */
|
|
|
|
type = 'g';
|
|
|
|
|
2009-07-26 23:12:11 -03:00
|
|
|
#if PY_VERSION_HEX < 0x03010000
|
|
|
|
/* This is no longer the case in 3.x */
|
|
|
|
/* 'F' is the same as 'f', per the PEP */
|
|
|
|
if (type == 'F')
|
|
|
|
type = 'f';
|
|
|
|
#endif
|
|
|
|
|
2009-04-29 22:00:33 -03:00
|
|
|
if (precision < 0)
|
2009-05-05 11:04:18 -03:00
|
|
|
precision = default_precision;
|
2009-04-29 22:00:33 -03:00
|
|
|
|
|
|
|
/* Cast "type", because if we're in unicode we need to pass a
|
|
|
|
8-bit char. This is safe, because we've restricted what "type"
|
|
|
|
can be. */
|
|
|
|
re_buf = PyOS_double_to_string(re, (char)type, precision, flags,
|
|
|
|
&re_float_type);
|
|
|
|
if (re_buf == NULL)
|
|
|
|
goto done;
|
|
|
|
im_buf = PyOS_double_to_string(im, (char)type, precision, flags,
|
|
|
|
&im_float_type);
|
|
|
|
if (im_buf == NULL)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
n_re_digits = strlen(re_buf);
|
|
|
|
n_im_digits = strlen(im_buf);
|
|
|
|
|
|
|
|
/* Since there is no unicode version of PyOS_double_to_string,
|
|
|
|
just use the 8 bit version and then convert to unicode. */
|
|
|
|
#if STRINGLIB_IS_UNICODE
|
|
|
|
re_unicode_tmp = (Py_UNICODE*)PyMem_Malloc((n_re_digits)*sizeof(Py_UNICODE));
|
|
|
|
if (re_unicode_tmp == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
strtounicode(re_unicode_tmp, re_buf, n_re_digits);
|
|
|
|
p_re = re_unicode_tmp;
|
|
|
|
|
|
|
|
im_unicode_tmp = (Py_UNICODE*)PyMem_Malloc((n_im_digits)*sizeof(Py_UNICODE));
|
|
|
|
if (im_unicode_tmp == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
strtounicode(im_unicode_tmp, im_buf, n_im_digits);
|
|
|
|
p_im = im_unicode_tmp;
|
|
|
|
#else
|
|
|
|
p_re = re_buf;
|
|
|
|
p_im = im_buf;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Is a sign character present in the output? If so, remember it
|
|
|
|
and skip it */
|
|
|
|
if (*p_re == '-') {
|
|
|
|
re_sign_char = *p_re;
|
|
|
|
++p_re;
|
|
|
|
--n_re_digits;
|
|
|
|
}
|
|
|
|
if (*p_im == '-') {
|
|
|
|
im_sign_char = *p_im;
|
|
|
|
++p_im;
|
|
|
|
--n_im_digits;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Determine if we have any "remainder" (after the digits, might include
|
|
|
|
decimal or exponent or both (or neither)) */
|
|
|
|
parse_number(p_re, n_re_digits, &n_re_remainder, &re_has_decimal);
|
|
|
|
parse_number(p_im, n_im_digits, &n_im_remainder, &im_has_decimal);
|
|
|
|
|
|
|
|
/* Determine the grouping, separator, and decimal point, if any. */
|
|
|
|
get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE :
|
|
|
|
(format->thousands_separators ?
|
|
|
|
LT_DEFAULT_LOCALE :
|
|
|
|
LT_NO_LOCALE),
|
|
|
|
&locale);
|
|
|
|
|
|
|
|
/* Turn off any padding. We'll do it later after we've composed
|
|
|
|
the numbers without padding. */
|
|
|
|
tmp_format.fill_char = '\0';
|
|
|
|
tmp_format.align = '\0';
|
|
|
|
tmp_format.width = -1;
|
|
|
|
|
|
|
|
/* Calculate how much memory we'll need. */
|
|
|
|
n_re_total = calc_number_widths(&re_spec, 0, re_sign_char, p_re,
|
|
|
|
n_re_digits, n_re_remainder,
|
|
|
|
re_has_decimal, &locale, &tmp_format);
|
|
|
|
|
|
|
|
/* Same formatting, but always include a sign. */
|
|
|
|
tmp_format.sign = '+';
|
|
|
|
n_im_total = calc_number_widths(&im_spec, 0, im_sign_char, p_im,
|
|
|
|
n_im_digits, n_im_remainder,
|
|
|
|
im_has_decimal, &locale, &tmp_format);
|
|
|
|
|
|
|
|
if (skip_re)
|
|
|
|
n_re_total = 0;
|
|
|
|
|
|
|
|
/* Add 1 for the 'j', and optionally 2 for parens. */
|
|
|
|
calc_padding(n_re_total + n_im_total + 1 + add_parens * 2,
|
|
|
|
format->width, format->align, &lpad, &rpad, &total);
|
|
|
|
|
|
|
|
result = STRINGLIB_NEW(NULL, total);
|
|
|
|
if (result == NULL)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* Populate the memory. First, the padding. */
|
|
|
|
p = fill_padding(STRINGLIB_STR(result),
|
|
|
|
n_re_total + n_im_total + 1 + add_parens * 2,
|
|
|
|
format->fill_char=='\0' ? ' ' : format->fill_char,
|
|
|
|
lpad, rpad);
|
|
|
|
|
|
|
|
if (add_parens)
|
|
|
|
*p++ = '(';
|
|
|
|
|
|
|
|
if (!skip_re) {
|
|
|
|
fill_number(p, &re_spec, p_re, n_re_digits, NULL, 0, &locale, 0);
|
|
|
|
p += n_re_total;
|
|
|
|
}
|
|
|
|
fill_number(p, &im_spec, p_im, n_im_digits, NULL, 0, &locale, 0);
|
|
|
|
p += n_im_total;
|
|
|
|
*p++ = 'j';
|
|
|
|
|
|
|
|
if (add_parens)
|
|
|
|
*p++ = ')';
|
|
|
|
|
|
|
|
done:
|
|
|
|
PyMem_Free(re_buf);
|
|
|
|
PyMem_Free(im_buf);
|
|
|
|
#if STRINGLIB_IS_UNICODE
|
|
|
|
PyMem_Free(re_unicode_tmp);
|
|
|
|
PyMem_Free(im_unicode_tmp);
|
|
|
|
#endif
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
#endif /* FORMAT_COMPLEX */
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
/************************************************************************/
|
|
|
|
/*********** built in formatters ****************************************/
|
|
|
|
/************************************************************************/
|
|
|
|
PyObject *
|
2008-05-30 15:10:19 -03:00
|
|
|
FORMAT_STRING(PyObject *obj,
|
2009-04-03 08:19:31 -03:00
|
|
|
STRINGLIB_CHAR *format_spec,
|
|
|
|
Py_ssize_t format_spec_len)
|
2007-08-24 23:26:07 -03:00
|
|
|
{
|
|
|
|
InternalFormatSpec format;
|
2008-05-30 15:10:19 -03:00
|
|
|
PyObject *result = NULL;
|
2007-08-24 23:26:07 -03:00
|
|
|
|
|
|
|
/* check for the special case of zero length format spec, make
|
2008-05-30 15:10:19 -03:00
|
|
|
it equivalent to str(obj) */
|
|
|
|
if (format_spec_len == 0) {
|
|
|
|
result = STRINGLIB_TOSTR(obj);
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse the format_spec */
|
2008-05-30 15:10:19 -03:00
|
|
|
if (!parse_internal_render_format_spec(format_spec, format_spec_len,
|
2009-04-03 08:19:31 -03:00
|
|
|
&format, 's'))
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* type conversion? */
|
|
|
|
switch (format.type) {
|
|
|
|
case 's':
|
|
|
|
/* no type conversion needed, already a string. do the formatting */
|
2008-05-30 15:10:19 -03:00
|
|
|
result = format_string_internal(obj, &format);
|
2007-08-24 23:26:07 -03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* unknown */
|
2009-02-20 10:25:03 -04:00
|
|
|
unknown_presentation_type(format.type, obj->ob_type->tp_name);
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-02-17 15:48:00 -04:00
|
|
|
#if defined FORMAT_LONG || defined FORMAT_INT
|
|
|
|
static PyObject*
|
2008-05-30 15:10:19 -03:00
|
|
|
format_int_or_long(PyObject* obj,
|
2009-04-03 08:19:31 -03:00
|
|
|
STRINGLIB_CHAR *format_spec,
|
|
|
|
Py_ssize_t format_spec_len,
|
|
|
|
IntOrLongToString tostring)
|
2007-08-24 23:26:07 -03:00
|
|
|
{
|
|
|
|
PyObject *result = NULL;
|
|
|
|
PyObject *tmp = NULL;
|
|
|
|
InternalFormatSpec format;
|
|
|
|
|
|
|
|
/* check for the special case of zero length format spec, make
|
2008-05-30 15:10:19 -03:00
|
|
|
it equivalent to str(obj) */
|
|
|
|
if (format_spec_len == 0) {
|
|
|
|
result = STRINGLIB_TOSTR(obj);
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse the format_spec */
|
2008-05-30 15:10:19 -03:00
|
|
|
if (!parse_internal_render_format_spec(format_spec,
|
2009-04-03 08:19:31 -03:00
|
|
|
format_spec_len,
|
|
|
|
&format, 'd'))
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* type conversion? */
|
|
|
|
switch (format.type) {
|
|
|
|
case 'b':
|
|
|
|
case 'c':
|
|
|
|
case 'd':
|
|
|
|
case 'o':
|
|
|
|
case 'x':
|
|
|
|
case 'X':
|
Merged revisions 63078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
When forward porting this, I added _PyUnicode_InsertThousandsGrouping.
........
r63078 | eric.smith | 2008-05-11 15:52:48 -0400 (Sun, 11 May 2008) | 14 lines
Addresses issue 2802: 'n' formatting for integers.
Adds 'n' as a format specifier for integers, to mirror the same
specifier which is already available for floats. 'n' is the same as
'd', but inserts the current locale-specific thousands grouping.
I added this as a stringlib function, but it's only used by str type,
not unicode. This is because of an implementation detail in
unicode.format(), which does its own str->unicode conversion. But the
unicode version will be needed in 3.0, and it may be needed by other
code eventually in 2.6 (maybe decimal?), so I left it as a stringlib
implementation. As long as the unicode version isn't instantiated,
there's no overhead for this.
........
2008-05-11 18:00:57 -03:00
|
|
|
case 'n':
|
2008-02-17 15:48:00 -04:00
|
|
|
/* no type conversion needed, already an int (or long). do
|
2009-04-03 08:19:31 -03:00
|
|
|
the formatting */
|
|
|
|
result = format_int_or_long_internal(obj, &format, tostring);
|
2007-08-24 23:26:07 -03:00
|
|
|
break;
|
|
|
|
|
2008-01-28 06:59:27 -04:00
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
case '%':
|
|
|
|
/* convert to float */
|
2008-05-30 15:10:19 -03:00
|
|
|
tmp = PyNumber_Float(obj);
|
2008-01-28 06:59:27 -04:00
|
|
|
if (tmp == NULL)
|
|
|
|
goto done;
|
2009-04-12 21:50:23 -03:00
|
|
|
result = format_float_internal(tmp, &format);
|
2008-01-28 06:59:27 -04:00
|
|
|
break;
|
|
|
|
|
2007-08-24 23:26:07 -03:00
|
|
|
default:
|
|
|
|
/* unknown */
|
2009-02-20 10:25:03 -04:00
|
|
|
unknown_presentation_type(format.type, obj->ob_type->tp_name);
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
Py_XDECREF(tmp);
|
|
|
|
return result;
|
|
|
|
}
|
2008-02-17 15:48:00 -04:00
|
|
|
#endif /* FORMAT_LONG || defined FORMAT_INT */
|
|
|
|
|
|
|
|
#ifdef FORMAT_LONG
|
|
|
|
/* Need to define long_format as a function that will convert a long
|
|
|
|
to a string. In 3.0, _PyLong_Format has the correct signature. In
|
|
|
|
2.x, we need to fudge a few parameters */
|
|
|
|
#if PY_VERSION_HEX >= 0x03000000
|
|
|
|
#define long_format _PyLong_Format
|
|
|
|
#else
|
|
|
|
static PyObject*
|
|
|
|
long_format(PyObject* value, int base)
|
|
|
|
{
|
|
|
|
/* Convert to base, don't add trailing 'L', and use the new octal
|
|
|
|
format. We already know this is a long object */
|
|
|
|
assert(PyLong_Check(value));
|
|
|
|
/* convert to base, don't add 'L', and use the new octal format */
|
|
|
|
return _PyLong_Format(value, base, 0, 1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
PyObject *
|
2008-05-30 15:10:19 -03:00
|
|
|
FORMAT_LONG(PyObject *obj,
|
2009-04-03 08:19:31 -03:00
|
|
|
STRINGLIB_CHAR *format_spec,
|
|
|
|
Py_ssize_t format_spec_len)
|
2008-02-17 15:48:00 -04:00
|
|
|
{
|
2008-05-30 15:10:19 -03:00
|
|
|
return format_int_or_long(obj, format_spec, format_spec_len,
|
2009-04-03 08:19:31 -03:00
|
|
|
long_format);
|
2008-02-17 15:48:00 -04:00
|
|
|
}
|
|
|
|
#endif /* FORMAT_LONG */
|
|
|
|
|
|
|
|
#ifdef FORMAT_INT
|
|
|
|
/* this is only used for 2.x, not 3.0 */
|
|
|
|
static PyObject*
|
|
|
|
int_format(PyObject* value, int base)
|
|
|
|
{
|
|
|
|
/* Convert to base, and use the new octal format. We already
|
|
|
|
know this is an int object */
|
|
|
|
assert(PyInt_Check(value));
|
|
|
|
return _PyInt_Format((PyIntObject*)value, base, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
2008-05-30 15:10:19 -03:00
|
|
|
FORMAT_INT(PyObject *obj,
|
2009-04-03 08:19:31 -03:00
|
|
|
STRINGLIB_CHAR *format_spec,
|
|
|
|
Py_ssize_t format_spec_len)
|
2008-02-17 15:48:00 -04:00
|
|
|
{
|
2008-05-30 15:10:19 -03:00
|
|
|
return format_int_or_long(obj, format_spec, format_spec_len,
|
2009-04-03 08:19:31 -03:00
|
|
|
int_format);
|
2008-02-17 15:48:00 -04:00
|
|
|
}
|
|
|
|
#endif /* FORMAT_INT */
|
2007-08-24 23:26:07 -03:00
|
|
|
|
2008-02-17 15:48:00 -04:00
|
|
|
#ifdef FORMAT_FLOAT
|
2007-08-24 23:26:07 -03:00
|
|
|
PyObject *
|
2008-05-30 15:10:19 -03:00
|
|
|
FORMAT_FLOAT(PyObject *obj,
|
2009-04-03 08:19:31 -03:00
|
|
|
STRINGLIB_CHAR *format_spec,
|
|
|
|
Py_ssize_t format_spec_len)
|
2007-08-24 23:26:07 -03:00
|
|
|
{
|
|
|
|
PyObject *result = NULL;
|
|
|
|
InternalFormatSpec format;
|
|
|
|
|
|
|
|
/* check for the special case of zero length format spec, make
|
2008-05-30 15:10:19 -03:00
|
|
|
it equivalent to str(obj) */
|
|
|
|
if (format_spec_len == 0) {
|
|
|
|
result = STRINGLIB_TOSTR(obj);
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse the format_spec */
|
2008-05-30 15:10:19 -03:00
|
|
|
if (!parse_internal_render_format_spec(format_spec,
|
2009-04-03 08:19:31 -03:00
|
|
|
format_spec_len,
|
|
|
|
&format, '\0'))
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* type conversion? */
|
|
|
|
switch (format.type) {
|
2009-04-16 17:16:10 -03:00
|
|
|
case '\0': /* No format code: like 'g', but with at least one decimal. */
|
2007-08-24 23:26:07 -03:00
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
case 'n':
|
|
|
|
case '%':
|
|
|
|
/* no conversion, already a float. do the formatting */
|
2008-05-30 15:10:19 -03:00
|
|
|
result = format_float_internal(obj, &format);
|
2007-08-24 23:26:07 -03:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* unknown */
|
2009-02-20 10:25:03 -04:00
|
|
|
unknown_presentation_type(format.type, obj->ob_type->tp_name);
|
2007-08-24 23:26:07 -03:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
return result;
|
|
|
|
}
|
2008-02-17 15:48:00 -04:00
|
|
|
#endif /* FORMAT_FLOAT */
|
2009-04-29 22:00:33 -03:00
|
|
|
|
|
|
|
#ifdef FORMAT_COMPLEX
|
|
|
|
PyObject *
|
|
|
|
FORMAT_COMPLEX(PyObject *obj,
|
|
|
|
STRINGLIB_CHAR *format_spec,
|
|
|
|
Py_ssize_t format_spec_len)
|
|
|
|
{
|
|
|
|
PyObject *result = NULL;
|
|
|
|
InternalFormatSpec format;
|
|
|
|
|
|
|
|
/* check for the special case of zero length format spec, make
|
|
|
|
it equivalent to str(obj) */
|
|
|
|
if (format_spec_len == 0) {
|
|
|
|
result = STRINGLIB_TOSTR(obj);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parse the format_spec */
|
|
|
|
if (!parse_internal_render_format_spec(format_spec,
|
|
|
|
format_spec_len,
|
|
|
|
&format, '\0'))
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* type conversion? */
|
|
|
|
switch (format.type) {
|
|
|
|
case '\0': /* No format code: like 'g', but with at least one decimal. */
|
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
case 'n':
|
|
|
|
/* no conversion, already a complex. do the formatting */
|
|
|
|
result = format_complex_internal(obj, &format);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* unknown */
|
|
|
|
unknown_presentation_type(format.type, obj->ob_type->tp_name);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
#endif /* FORMAT_COMPLEX */
|