cpython-lru_cache-weakref: Objects/stringlib/formatter.h annotate

annotate Objects/stringlib/formatter.h @ 54294:dba767bc3155 legacy-trunk

remove mention of old ctypes version

author	Benjamin Peterson <benjamin@python.org>
date	Sat, 23 May 2009 20:59:09 +0000
parents	1d8f24d40c2c
children	0d203ca3ac78

rev	line source
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1 /* implements the string, long, and float formatters. that is,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	2 string.__format__, etc. */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	3
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	4 #include <locale.h>
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	5
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	6 /* Before including this, you must include either:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	7 stringlib/unicodedefs.h
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	8 stringlib/stringdefs.h
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	9
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	10 Also, you should define the names:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	11 FORMAT_STRING
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	12 FORMAT_LONG
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	13 FORMAT_FLOAT
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	14 FORMAT_COMPLEX
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	15 to be whatever you want the public names of these functions to
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	16 be. These are the only non-static functions defined here.
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	17 */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	18
51756 164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	19 /* Raises an exception about an unknown presentation type for this
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	20 * type. */
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	21
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	22 static void
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	23 unknown_presentation_type(STRINGLIB_CHAR presentation_type,
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	24 const char* type_name)
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	25 {
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	26 #if STRINGLIB_IS_UNICODE
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	27 /* If STRINGLIB_CHAR is Py_UNICODE, %c might be out-of-range,
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	28 hence the two cases. If it is char, gcc complains that the
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	29 condition below is always true, hence the ifdef. */
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	30 if (presentation_type > 32 && presentation_type < 128)
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	31 #endif
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	32 PyErr_Format(PyExc_ValueError,
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	33 "Unknown format code '%c' "
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	34 "for object of type '%.200s'",
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	35 presentation_type,
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	36 type_name);
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	37 #if STRINGLIB_IS_UNICODE
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	38 else
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	39 PyErr_Format(PyExc_ValueError,
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	40 "Unknown format code '\\x%x' "
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	41 "for object of type '%.200s'",
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	42 (unsigned int)presentation_type,
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	43 type_name);
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	44 #endif
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	45 }
164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	46
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	47 /*
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	48 get_integer consumes 0 or more decimal digit characters from an
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	49 input string, updates *result with the corresponding positive
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	50 integer, and returns the number of digits consumed.
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	51
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	52 returns -1 on error.
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	53 */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	54 static int
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	55 get_integer(STRINGLIB_CHAR *ptr, STRINGLIB_CHAR end,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	56 Py_ssize_t *result)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	57 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	58 Py_ssize_t accumulator, digitval, oldaccumulator;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	59 int numdigits;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	60 accumulator = numdigits = 0;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	61 for (;;(*ptr)++, numdigits++) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	62 if (*ptr >= end)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	63 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	64 digitval = STRINGLIB_TODECIMAL(**ptr);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	65 if (digitval < 0)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	66 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	67 /*
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	68 This trick was copied from old Unicode format code. It's cute,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	69 but would really suck on an old machine with a slow divide
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	70 implementation. Fortunately, in the normal case we do not
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	71 expect too many digits.
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	72 */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	73 oldaccumulator = accumulator;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	74 accumulator *= 10;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	75 if ((accumulator+10)/10 != oldaccumulator+1) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	76 PyErr_Format(PyExc_ValueError,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	77 "Too many decimal digits in format string");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	78 return -1;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	79 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	80 accumulator += digitval;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	81 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	82 *result = accumulator;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	83 return numdigits;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	84 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	85
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	86 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	87 /********* standard format specifier parsing ************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	88 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	89
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	90 /* returns true if this character is a specifier alignment token */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	91 Py_LOCAL_INLINE(int)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	92 is_alignment_token(STRINGLIB_CHAR c)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	93 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	94 switch (c) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	95 case '<': case '>': case '=': case '^':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	96 return 1;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	97 default:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	98 return 0;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	99 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	100 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	101
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	102 /* returns true if this character is a sign element */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	103 Py_LOCAL_INLINE(int)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	104 is_sign_element(STRINGLIB_CHAR c)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	105 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	106 switch (c) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	107 case ' ': case '+': case '-':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	108 return 1;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	109 default:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	110 return 0;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	111 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	112 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	113
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	114
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	115 typedef struct {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	116 STRINGLIB_CHAR fill_char;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	117 STRINGLIB_CHAR align;
47959 c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	118 int alternate;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	119 STRINGLIB_CHAR sign;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	120 Py_ssize_t width;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	121 int thousands_separators;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	122 Py_ssize_t precision;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	123 STRINGLIB_CHAR type;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	124 } InternalFormatSpec;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	125
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	126 /*
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	127 ptr points to the start of the format_spec, end points just past its end.
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	128 fills in format with the parsed information.
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	129 returns 1 on success, 0 on failure.
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	130 if failure, sets the exception
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	131 */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	132 static int
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	133 parse_internal_render_format_spec(STRINGLIB_CHAR *format_spec,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	134 Py_ssize_t format_spec_len,
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	135 InternalFormatSpec *format,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	136 char default_type)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	137 {
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	138 STRINGLIB_CHAR *ptr = format_spec;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	139 STRINGLIB_CHAR *end = format_spec + format_spec_len;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	140
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	141 /* end-ptr is used throughout this code to specify the length of
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	142 the input string */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	143
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	144 Py_ssize_t consumed;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	145
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	146 format->fill_char = '\0';
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	147 format->align = '\0';
47959 c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	148 format->alternate = 0;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	149 format->sign = '\0';
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	150 format->width = -1;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	151 format->thousands_separators = 0;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	152 format->precision = -1;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	153 format->type = default_type;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	154
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	155 /* If the second char is an alignment token,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	156 then parse the fill char */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	157 if (end-ptr >= 2 && is_alignment_token(ptr[1])) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	158 format->align = ptr[1];
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	159 format->fill_char = ptr[0];
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	160 ptr += 2;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	161 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	162 else if (end-ptr >= 1 && is_alignment_token(ptr[0])) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	163 format->align = ptr[0];
45404 5d726da21d75 Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	164 ++ptr;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	165 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	166
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	167 /* Parse the various sign options */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	168 if (end-ptr >= 1 && is_sign_element(ptr[0])) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	169 format->sign = ptr[0];
45404 5d726da21d75 Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	170 ++ptr;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	171 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	172
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	173 /* If the next character is #, we're in alternate mode. This only
3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	174 applies to integers. */
3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	175 if (end-ptr >= 1 && ptr[0] == '#') {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	176 format->alternate = 1;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	177 ++ptr;
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	178 }
3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	179
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	180 /* The special case for 0-padding (backwards compat) */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	181 if (format->fill_char == '\0' && end-ptr >= 1 && ptr[0] == '0') {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	182 format->fill_char = '0';
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	183 if (format->align == '\0') {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	184 format->align = '=';
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	185 }
45404 5d726da21d75 Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	186 ++ptr;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	187 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	188
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	189 consumed = get_integer(&ptr, end, &format->width);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	190 if (consumed == -1)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	191 /* Overflow error. Exception already set. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	192 return 0;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	193
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	194 /* If consumed is 0, we didn't consume any characters for the
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	195 width. In that case, reset the width to -1, because
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	196 get_integer() will have set it to zero. -1 is how we record
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	197 that the width wasn't specified. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	198 if (consumed == 0)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	199 format->width = -1;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	200
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	201 /* Comma signifies add thousands separators */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	202 if (end-ptr && ptr[0] == ',') {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	203 format->thousands_separators = 1;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	204 ++ptr;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	205 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	206
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	207 /* Parse field precision */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	208 if (end-ptr && ptr[0] == '.') {
45404 5d726da21d75 Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	209 ++ptr;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	210
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	211 consumed = get_integer(&ptr, end, &format->precision);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	212 if (consumed == -1)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	213 /* Overflow error. Exception already set. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	214 return 0;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	215
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	216 /* Not having a precision after a dot is an error. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	217 if (consumed == 0) {
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	218 PyErr_Format(PyExc_ValueError,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	219 "Format specifier missing precision");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	220 return 0;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	221 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	222
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	223 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	224
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	225 /* Finally, parse the type field. */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	226
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	227 if (end-ptr > 1) {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	228 /* More than one char remain, invalid conversion spec. */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	229 PyErr_Format(PyExc_ValueError, "Invalid conversion specification");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	230 return 0;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	231 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	232
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	233 if (end-ptr == 1) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	234 format->type = ptr[0];
45404 5d726da21d75 Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	235 ++ptr;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	236 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	237
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	238 /* Do as much validating as we can, just by looking at the format
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	239 specifier. Do not take into account what type of formatting
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	240 we're doing (int, float, string). */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	241
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	242 if (format->thousands_separators) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	243 switch (format->type) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	244 case 'd':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	245 case 'e':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	246 case 'f':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	247 case 'g':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	248 case 'E':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	249 case 'G':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	250 case '%':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	251 case 'F':
53318 44a8a525eceb Fixed issue 5782: formatting with commas didn't work if no specifier type code was given. Eric Smith <eric@trueblade.com> parents: 53312 diff changeset	252 case '\0':
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	253 /* These are allowed. See PEP 378.*/
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	254 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	255 default:
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	256 PyErr_Format(PyExc_ValueError,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	257 "Cannot specify ',' with '%c'.", format->type);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	258 return 0;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	259 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	260 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	261
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	262 return 1;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	263 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	264
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	265 /* Calculate the padding needed. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	266 static void
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	267 calc_padding(Py_ssize_t nchars, Py_ssize_t width, STRINGLIB_CHAR align,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	268 Py_ssize_t n_lpadding, Py_ssize_t n_rpadding,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	269 Py_ssize_t *n_total)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	270 {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	271 if (width >= 0) {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	272 if (nchars > width)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	273 *n_total = nchars;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	274 else
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	275 *n_total = width;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	276 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	277 else {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	278 /* not specified, use all of the chars and no more */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	279 *n_total = nchars;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	280 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	281
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	282 /* figure out how much leading space we need, based on the
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	283 aligning */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	284 if (align == '>')
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	285 n_lpadding = n_total - nchars;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	286 else if (align == '^')
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	287 n_lpadding = (n_total - nchars) / 2;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	288 else
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	289 *n_lpadding = 0;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	290
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	291 n_rpadding = n_total - nchars - *n_lpadding;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	292 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	293
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	294 /* Do the padding, and return a pointer to where the caller-supplied
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	295 content goes. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	296 static STRINGLIB_CHAR *
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	297 fill_padding(STRINGLIB_CHAR *p, Py_ssize_t nchars, STRINGLIB_CHAR fill_char,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	298 Py_ssize_t n_lpadding, Py_ssize_t n_rpadding)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	299 {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	300 /* Pad on left. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	301 if (n_lpadding)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	302 STRINGLIB_FILL(p, fill_char, n_lpadding);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	303
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	304 /* Pad on right. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	305 if (n_rpadding)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	306 STRINGLIB_FILL(p + nchars + n_lpadding, fill_char, n_rpadding);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	307
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	308 /* Pointer to the user content. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	309 return p + n_lpadding;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	310 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	311
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	312 #if defined FORMAT_FLOAT \|\| defined FORMAT_LONG \|\| defined FORMAT_COMPLEX
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	313 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	314 /********* common routines for numeric formatting *******************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	315 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	316
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	317 /* Locale type codes. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	318 #define LT_CURRENT_LOCALE 0
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	319 #define LT_DEFAULT_LOCALE 1
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	320 #define LT_NO_LOCALE 2
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	321
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	322 /* Locale info needed for formatting integers and the part of floats
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	323 before and including the decimal. Note that locales only support
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	324 8-bit chars, not unicode. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	325 typedef struct {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	326 char *decimal_point;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	327 char *thousands_sep;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	328 char *grouping;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	329 } LocaleInfo;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	330
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	331 /* describes the layout for an integer, see the comment in
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	332 calc_number_widths() for details */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	333 typedef struct {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	334 Py_ssize_t n_lpadding;
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	335 Py_ssize_t n_prefix;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	336 Py_ssize_t n_spadding;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	337 Py_ssize_t n_rpadding;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	338 char sign;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	339 Py_ssize_t n_sign; /* number of digits needed for sign (0/1) */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	340 Py_ssize_t n_grouped_digits; /* Space taken up by the digits, including
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	341 any grouping chars. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	342 Py_ssize_t n_decimal; /* 0 if only an integer */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	343 Py_ssize_t n_remainder; /* Digits in decimal and/or exponent part,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	344 excluding the decimal itself, if
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	345 present. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	346
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	347 /* These 2 are not the widths of fields, but are needed by
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	348 STRINGLIB_GROUPING. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	349 Py_ssize_t n_digits; /* The number of digits before a decimal
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	350 or exponent. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	351 Py_ssize_t n_min_width; /* The min_width we used when we computed
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	352 the n_grouped_digits width. */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	353 } NumberFieldWidths;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	354
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	355
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	356 /* Given a number of the form:
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	357 digits[remainder]
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	358 where ptr points to the start and end points to the end, find where
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	359 the integer part ends. This could be a decimal, an exponent, both,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	360 or neither.
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	361 If a decimal point is present, set *has_decimal and increment
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	362 remainder beyond it.
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	363 Results are undefined (but shouldn't crash) for improperly
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	364 formatted strings.
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	365 */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	366 static void
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	367 parse_number(STRINGLIB_CHAR *ptr, Py_ssize_t len,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	368 Py_ssize_t n_remainder, int has_decimal)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	369 {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	370 STRINGLIB_CHAR *end = ptr + len;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	371 STRINGLIB_CHAR *remainder;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	372
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	373 while (ptr<end && isdigit(*ptr))
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	374 ++ptr;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	375 remainder = ptr;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	376
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	377 /* Does remainder start with a decimal point? */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	378 has_decimal = ptr<end && remainder == '.';
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	379
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	380 /* Skip the decimal point. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	381 if (*has_decimal)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	382 remainder++;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	383
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	384 *n_remainder = end - remainder;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	385 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	386
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	387 /* not all fields of format are used. for example, precision is
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	388 unused. should this take discrete params in order to be more clear
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	389 about what it does? or is passing a single format parameter easier
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	390 and more efficient enough to justify a little obfuscation? */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	391 static Py_ssize_t
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	392 calc_number_widths(NumberFieldWidths *spec, Py_ssize_t n_prefix,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	393 STRINGLIB_CHAR sign_char, STRINGLIB_CHAR *number,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	394 Py_ssize_t n_number, Py_ssize_t n_remainder,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	395 int has_decimal, const LocaleInfo *locale,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	396 const InternalFormatSpec *format)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	397 {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	398 Py_ssize_t n_non_digit_non_padding;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	399 Py_ssize_t n_padding;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	400
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	401 spec->n_digits = n_number - n_remainder - (has_decimal?1:0);
47983 a0963e46f43e Renamed a parameter in calc_number_widths, for consistency with the same parameter in fill_non_digits. Eric Smith <eric@trueblade.com> parents: 47973 diff changeset	402 spec->n_lpadding = 0;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	403 spec->n_prefix = n_prefix;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	404 spec->n_decimal = has_decimal ? strlen(locale->decimal_point) : 0;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	405 spec->n_remainder = n_remainder;
47983 a0963e46f43e Renamed a parameter in calc_number_widths, for consistency with the same parameter in fill_non_digits. Eric Smith <eric@trueblade.com> parents: 47973 diff changeset	406 spec->n_spadding = 0;
a0963e46f43e Renamed a parameter in calc_number_widths, for consistency with the same parameter in fill_non_digits. Eric Smith <eric@trueblade.com> parents: 47973 diff changeset	407 spec->n_rpadding = 0;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	408 spec->sign = '\0';
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	409 spec->n_sign = 0;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	410
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	411 /* the output will look like:
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	412 \| \|
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	413 \| <lpadding> <sign> <prefix> <spadding> <grouped_digits> <decimal> <remainder> <rpadding> \|
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	414 \| \|
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	415
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	416 sign is computed from format->sign and the actual
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	417 sign of the number
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	418
47959 c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	419 prefix is given (it's for the '0x' prefix)
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	420
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	421 digits is already known
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	422
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	423 the total width is either given, or computed from the
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	424 actual digits
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	425
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	426 only one of lpadding, spadding, and rpadding can be non-zero,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	427 and it's calculated from the width and other fields
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	428 */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	429
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	430 /* compute the various parts we're going to write */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	431 switch (format->sign) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	432 case '+':
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	433 /* always put a + or - */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	434 spec->n_sign = 1;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	435 spec->sign = (sign_char == '-' ? '-' : '+');
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	436 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	437 case ' ':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	438 spec->n_sign = 1;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	439 spec->sign = (sign_char == '-' ? '-' : ' ');
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	440 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	441 default:
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	442 /* Not specified, or the default (-) */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	443 if (sign_char == '-') {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	444 spec->n_sign = 1;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	445 spec->sign = '-';
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	446 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	447 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	448
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	449 /* The number of chars used for non-digits and non-padding. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	450 n_non_digit_non_padding = spec->n_sign + spec->n_prefix + spec->n_decimal +
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	451 spec->n_remainder;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	452
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	453 /* min_width can go negative, that's okay. format->width == -1 means
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	454 we don't care. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	455 if (format->fill_char == '0')
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	456 spec->n_min_width = format->width - n_non_digit_non_padding;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	457 else
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	458 spec->n_min_width = 0;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	459
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	460 if (spec->n_digits == 0)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	461 /* This case only occurs when using 'c' formatting, we need
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	462 to special case it because the grouping code always wants
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	463 to have at least one character. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	464 spec->n_grouped_digits = 0;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	465 else
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	466 spec->n_grouped_digits = STRINGLIB_GROUPING(NULL, 0, NULL,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	467 spec->n_digits,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	468 spec->n_min_width,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	469 locale->grouping,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	470 locale->thousands_sep);
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	471
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	472 /* Given the desired width and the total of digit and non-digit
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	473 space we consume, see if we need any padding. format->width can
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	474 be negative (meaning no padding), but this code still works in
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	475 that case. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	476 n_padding = format->width -
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	477 (n_non_digit_non_padding + spec->n_grouped_digits);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	478 if (n_padding > 0) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	479 /* Some padding is needed. Determine if it's left, space, or right. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	480 switch (format->align) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	481 case '<':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	482 spec->n_rpadding = n_padding;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	483 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	484 case '^':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	485 spec->n_lpadding = n_padding / 2;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	486 spec->n_rpadding = n_padding - spec->n_lpadding;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	487 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	488 case '=':
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	489 spec->n_spadding = n_padding;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	490 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	491 default:
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	492 /* Handles '>', plus catch-all just in case. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	493 spec->n_lpadding = n_padding;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	494 break;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	495 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	496 }
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	497 return spec->n_lpadding + spec->n_sign + spec->n_prefix +
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	498 spec->n_spadding + spec->n_grouped_digits + spec->n_decimal +
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	499 spec->n_remainder + spec->n_rpadding;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	500 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	501
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	502 /* Fill in the digit parts of a numbers's string representation,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	503 as determined in calc_number_widths().
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	504 No error checking, since we know the buffer is the correct size. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	505 static void
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	506 fill_number(STRINGLIB_CHAR buf, const NumberFieldWidths spec,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	507 STRINGLIB_CHAR *digits, Py_ssize_t n_digits,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	508 STRINGLIB_CHAR *prefix, STRINGLIB_CHAR fill_char,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	509 LocaleInfo *locale, int toupper)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	510 {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	511 /* Used to keep track of digits, decimal, and remainder. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	512 STRINGLIB_CHAR *p = digits;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	513
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	514 #ifndef NDEBUG
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	515 Py_ssize_t r;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	516 #endif
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	517
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	518 if (spec->n_lpadding) {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	519 STRINGLIB_FILL(buf, fill_char, spec->n_lpadding);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	520 buf += spec->n_lpadding;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	521 }
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	522 if (spec->n_sign == 1) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	523 *buf++ = spec->sign;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	524 }
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	525 if (spec->n_prefix) {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	526 memmove(buf,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	527 prefix,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	528 spec->n_prefix * sizeof(STRINGLIB_CHAR));
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	529 if (toupper) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	530 Py_ssize_t t;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	531 for (t = 0; t < spec->n_prefix; ++t)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	532 buf[t] = STRINGLIB_TOUPPER(buf[t]);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	533 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	534 buf += spec->n_prefix;
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	535 }
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	536 if (spec->n_spadding) {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	537 STRINGLIB_FILL(buf, fill_char, spec->n_spadding);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	538 buf += spec->n_spadding;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	539 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	540
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	541 /* Only for type 'c' special case, it has no digits. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	542 if (spec->n_digits != 0) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	543 /* Fill the digits with InsertThousandsGrouping. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	544 #ifndef NDEBUG
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	545 r =
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	546 #endif
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	547 STRINGLIB_GROUPING(buf, spec->n_grouped_digits, digits,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	548 spec->n_digits, spec->n_min_width,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	549 locale->grouping, locale->thousands_sep);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	550 #ifndef NDEBUG
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	551 assert(r == spec->n_grouped_digits);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	552 #endif
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	553 p += spec->n_digits;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	554 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	555 if (toupper) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	556 Py_ssize_t t;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	557 for (t = 0; t < spec->n_grouped_digits; ++t)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	558 buf[t] = STRINGLIB_TOUPPER(buf[t]);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	559 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	560 buf += spec->n_grouped_digits;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	561
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	562 if (spec->n_decimal) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	563 Py_ssize_t t;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	564 for (t = 0; t < spec->n_decimal; ++t)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	565 buf[t] = locale->decimal_point[t];
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	566 buf += spec->n_decimal;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	567 p += 1;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	568 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	569
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	570 if (spec->n_remainder) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	571 memcpy(buf, p, spec->n_remainder * sizeof(STRINGLIB_CHAR));
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	572 buf += spec->n_remainder;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	573 p += spec->n_remainder;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	574 }
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	575
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	576 if (spec->n_rpadding) {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	577 STRINGLIB_FILL(buf, fill_char, spec->n_rpadding);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	578 buf += spec->n_rpadding;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	579 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	580 }
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	581
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	582 static char no_grouping[1] = {CHAR_MAX};
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	583
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	584 /* Find the decimal point character(s?), thousands_separator(s?), and
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	585 grouping description, either for the current locale if type is
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	586 LT_CURRENT_LOCALE, a hard-coded locale if LT_DEFAULT_LOCALE, or
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	587 none if LT_NO_LOCALE. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	588 static void
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	589 get_locale_info(int type, LocaleInfo *locale_info)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	590 {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	591 switch (type) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	592 case LT_CURRENT_LOCALE: {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	593 struct lconv *locale_data = localeconv();
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	594 locale_info->decimal_point = locale_data->decimal_point;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	595 locale_info->thousands_sep = locale_data->thousands_sep;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	596 locale_info->grouping = locale_data->grouping;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	597 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	598 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	599 case LT_DEFAULT_LOCALE:
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	600 locale_info->decimal_point = ".";
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	601 locale_info->thousands_sep = ",";
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	602 locale_info->grouping = "\3"; /* Group every 3 characters,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	603 trailing 0 means repeat
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	604 infinitely. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	605 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	606 case LT_NO_LOCALE:
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	607 locale_info->decimal_point = ".";
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	608 locale_info->thousands_sep = "";
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	609 locale_info->grouping = no_grouping;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	610 break;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	611 default:
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	612 assert(0);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	613 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	614 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	615
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	616 #endif /* FORMAT_FLOAT \|\| FORMAT_LONG \|\| FORMAT_COMPLEX */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	617
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	618 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	619 /********* string formatting ****************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	620 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	621
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	622 static PyObject *
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	623 format_string_internal(PyObject value, const InternalFormatSpec format)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	624 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	625 Py_ssize_t lpad;
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	626 Py_ssize_t rpad;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	627 Py_ssize_t total;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	628 STRINGLIB_CHAR *p;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	629 Py_ssize_t len = STRINGLIB_LEN(value);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	630 PyObject *result = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	631
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	632 /* sign is not allowed on strings */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	633 if (format->sign != '\0') {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	634 PyErr_SetString(PyExc_ValueError,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	635 "Sign not allowed in string format specifier");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	636 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	637 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	638
47959 c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	639 /* alternate is not allowed on strings */
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	640 if (format->alternate) {
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	641 PyErr_SetString(PyExc_ValueError,
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	642 "Alternate form (#) not allowed in string format "
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	643 "specifier");
47959 c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	644 goto done;
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	645 }
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	646
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	647 /* '=' alignment not allowed on strings */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	648 if (format->align == '=') {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	649 PyErr_SetString(PyExc_ValueError,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	650 "'=' alignment not allowed "
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	651 "in string format specifier");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	652 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	653 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	654
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	655 /* if precision is specified, output no more that format.precision
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	656 characters */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	657 if (format->precision >= 0 && len >= format->precision) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	658 len = format->precision;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	659 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	660
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	661 calc_padding(len, format->width, format->align, &lpad, &rpad, &total);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	662
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	663 /* allocate the resulting string */
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	664 result = STRINGLIB_NEW(NULL, total);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	665 if (result == NULL)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	666 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	667
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	668 /* Write into that space. First the padding. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	669 p = fill_padding(STRINGLIB_STR(result), len,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	670 format->fill_char=='\0'?' ':format->fill_char,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	671 lpad, rpad);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	672
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	673 /* Then the source string. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	674 memcpy(p, STRINGLIB_STR(value), len * sizeof(STRINGLIB_CHAR));
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	675
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	676 done:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	677 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	678 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	679
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	680
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	681 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	682 /********* long formatting ******************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	683 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	684
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	685 #if defined FORMAT_LONG \|\| defined FORMAT_INT
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	686 typedef PyObject*
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	687 (IntOrLongToString)(PyObject value, int base);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	688
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	689 static PyObject *
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	690 format_int_or_long_internal(PyObject value, const InternalFormatSpec format,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	691 IntOrLongToString tostring)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	692 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	693 PyObject *result = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	694 PyObject *tmp = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	695 STRINGLIB_CHAR *pnumeric_chars;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	696 STRINGLIB_CHAR numeric_char;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	697 STRINGLIB_CHAR sign_char = '\0';
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	698 Py_ssize_t n_digits; /* count of digits need from the computed
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	699 string */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	700 Py_ssize_t n_remainder = 0; /* Used only for 'c' formatting, which
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	701 produces non-digits */
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	702 Py_ssize_t n_prefix = 0; /* Count of prefix chars, (e.g., '0x') */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	703 Py_ssize_t n_total;
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	704 STRINGLIB_CHAR *prefix = NULL;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	705 NumberFieldWidths spec;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	706 long x;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	707
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	708 /* Locale settings, either from the actual locale or
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	709 from a hard-code pseudo-locale */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	710 LocaleInfo locale;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	711
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	712 /* no precision allowed on integers */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	713 if (format->precision != -1) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	714 PyErr_SetString(PyExc_ValueError,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	715 "Precision not allowed in integer format specifier");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	716 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	717 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	718
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	719 /* special case for character formatting */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	720 if (format->type == 'c') {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	721 /* error to specify a sign */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	722 if (format->sign != '\0') {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	723 PyErr_SetString(PyExc_ValueError,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	724 "Sign not allowed with integer"
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	725 " format specifier 'c'");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	726 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	727 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	728
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	729 /* Error to specify a comma. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	730 if (format->thousands_separators) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	731 PyErr_SetString(PyExc_ValueError,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	732 "Thousands separators not allowed with integer"
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	733 " format specifier 'c'");
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	734 goto done;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	735 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	736
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	737 /* taken from unicodeobject.c formatchar() */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	738 /* Integer input truncated to a character */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	739 /* XXX: won't work for int */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	740 x = PyLong_AsLong(value);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	741 if (x == -1 && PyErr_Occurred())
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	742 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	743 #ifdef Py_UNICODE_WIDE
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	744 if (x < 0 \|\| x > 0x10ffff) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	745 PyErr_SetString(PyExc_OverflowError,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	746 "%c arg not in range(0x110000) "
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	747 "(wide Python build)");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	748 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	749 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	750 #else
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	751 if (x < 0 \|\| x > 0xffff) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	752 PyErr_SetString(PyExc_OverflowError,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	753 "%c arg not in range(0x10000) "
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	754 "(narrow Python build)");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	755 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	756 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	757 #endif
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	758 numeric_char = (STRINGLIB_CHAR)x;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	759 pnumeric_chars = &numeric_char;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	760 n_digits = 1;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	761
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	762 /* As a sort-of hack, we tell calc_number_widths that we only
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	763 have "remainder" characters. calc_number_widths thinks
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	764 these are characters that don't get formatted, only copied
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	765 into the output string. We do this for 'c' formatting,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	766 because the characters are likely to be non-digits. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	767 n_remainder = 1;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	768 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	769 else {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	770 int base;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	771 int leading_chars_to_skip = 0; /* Number of characters added by
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	772 PyNumber_ToBase that we want to
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	773 skip over. */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	774
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	775 /* Compute the base and how many characters will be added by
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	776 PyNumber_ToBase */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	777 switch (format->type) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	778 case 'b':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	779 base = 2;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	780 leading_chars_to_skip = 2; /* 0b */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	781 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	782 case 'o':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	783 base = 8;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	784 leading_chars_to_skip = 2; /* 0o */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	785 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	786 case 'x':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	787 case 'X':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	788 base = 16;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	789 leading_chars_to_skip = 2; /* 0x */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	790 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	791 default: /* shouldn't be needed, but stops a compiler warning */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	792 case 'd':
46898 206700d749f0 Addresses issue 2802: 'n' formatting for integers. Eric Smith <eric@trueblade.com> parents: 46333 diff changeset	793 case 'n':
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	794 base = 10;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	795 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	796 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	797
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	798 /* The number of prefix chars is the same as the leading
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	799 chars to skip */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	800 if (format->alternate)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	801 n_prefix = leading_chars_to_skip;
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	802
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	803 /* Do the hard part, converting to a string in a given base */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	804 tmp = tostring(value, base);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	805 if (tmp == NULL)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	806 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	807
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	808 pnumeric_chars = STRINGLIB_STR(tmp);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	809 n_digits = STRINGLIB_LEN(tmp);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	810
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	811 prefix = pnumeric_chars;
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	812
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	813 /* Remember not to modify what pnumeric_chars points to. it
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	814 might be interned. Only modify it after we copy it into a
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	815 newly allocated output buffer. */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	816
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	817 /* Is a sign character present in the output? If so, remember it
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	818 and skip it */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	819 if (pnumeric_chars[0] == '-') {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	820 sign_char = pnumeric_chars[0];
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	821 ++prefix;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	822 ++leading_chars_to_skip;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	823 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	824
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	825 /* Skip over the leading chars (0x, 0b, etc.) */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	826 n_digits -= leading_chars_to_skip;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	827 pnumeric_chars += leading_chars_to_skip;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	828 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	829
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	830 /* Determine the grouping, separator, and decimal point, if any. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	831 get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE :
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	832 (format->thousands_separators ?
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	833 LT_DEFAULT_LOCALE :
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	834 LT_NO_LOCALE),
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	835 &locale);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	836
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	837 /* Calculate how much memory we'll need. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	838 n_total = calc_number_widths(&spec, n_prefix, sign_char, pnumeric_chars,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	839 n_digits, n_remainder, 0, &locale, format);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	840
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	841 /* Allocate the memory. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	842 result = STRINGLIB_NEW(NULL, n_total);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	843 if (!result)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	844 goto done;
46898 206700d749f0 Addresses issue 2802: 'n' formatting for integers. Eric Smith <eric@trueblade.com> parents: 46333 diff changeset	845
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	846 /* Populate the memory. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	847 fill_number(STRINGLIB_STR(result), &spec, pnumeric_chars, n_digits,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	848 prefix, format->fill_char == '\0' ? ' ' : format->fill_char,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	849 &locale, format->type == 'X');
47973 3fa44e5e4e2b Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format(). Eric Smith <eric@trueblade.com> parents: 47959 diff changeset	850
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	851 done:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	852 Py_XDECREF(tmp);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	853 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	854 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	855 #endif /* defined FORMAT_LONG \|\| defined FORMAT_INT */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	856
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	857 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	858 /********* float formatting *****************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	859 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	860
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	861 #ifdef FORMAT_FLOAT
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	862 #if STRINGLIB_IS_UNICODE
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	863 static void
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	864 strtounicode(Py_UNICODE buffer, const char charbuffer, Py_ssize_t len)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	865 {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	866 Py_ssize_t i;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	867 for (i = 0; i < len; ++i)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	868 buffer[i] = (Py_UNICODE)charbuffer[i];
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	869 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	870 #endif
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	871
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	872 /* much of this is taken from unicodeobject.c */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	873 static PyObject *
45404 5d726da21d75 Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	874 format_float_internal(PyObject *value,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	875 const InternalFormatSpec *format)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	876 {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	877 char buf = NULL; / buffer returned from PyOS_double_to_string */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	878 Py_ssize_t n_digits;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	879 Py_ssize_t n_remainder;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	880 Py_ssize_t n_total;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	881 int has_decimal;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	882 double val;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	883 Py_ssize_t precision = format->precision;
53802 1d8f24d40c2c Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53662 diff changeset	884 Py_ssize_t default_precision = 6;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	885 STRINGLIB_CHAR type = format->type;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	886 int add_pct = 0;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	887 STRINGLIB_CHAR *p;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	888 NumberFieldWidths spec;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	889 int flags = 0;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	890 PyObject *result = NULL;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	891 STRINGLIB_CHAR sign_char = '\0';
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	892 int float_type; /* Used to see if we have a nan, inf, or regular float. */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	893
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	894 #if STRINGLIB_IS_UNICODE
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	895 Py_UNICODE *unicode_tmp = NULL;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	896 #endif
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	897
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	898 /* Locale settings, either from the actual locale or
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	899 from a hard-code pseudo-locale */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	900 LocaleInfo locale;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	901
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	902 /* Alternate is not allowed on floats. */
47959 c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	903 if (format->alternate) {
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	904 PyErr_SetString(PyExc_ValueError,
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	905 "Alternate form (#) not allowed in float format "
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	906 "specifier");
47959 c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	907 goto done;
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	908 }
c2b114d0e1cf Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today. Eric Smith <eric@trueblade.com> parents: 47819 diff changeset	909
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	910 if (type == '\0') {
53802 1d8f24d40c2c Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53662 diff changeset	911 /* Omitted type specifier. This is like 'g' but with at least one
1d8f24d40c2c Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53662 diff changeset	912 digit after the decimal point, and different default precision.*/
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	913 type = 'g';
53802 1d8f24d40c2c Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53662 diff changeset	914 default_precision = PyFloat_STR_PRECISION;
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	915 flags \|= Py_DTSF_ADD_DOT_0;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	916 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	917
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	918 if (type == 'n')
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	919 /* 'n' is the same as 'g', except for the locale used to
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	920 format the result. We take care of that later. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	921 type = 'g';
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	922
48003 5c33009994b4 Backed out r65069, pending fixing it in Windows. Eric Smith <eric@trueblade.com> parents: 48001 diff changeset	923 /* 'F' is the same as 'f', per the PEP */
5c33009994b4 Backed out r65069, pending fixing it in Windows. Eric Smith <eric@trueblade.com> parents: 48001 diff changeset	924 if (type == 'F')
5c33009994b4 Backed out r65069, pending fixing it in Windows. Eric Smith <eric@trueblade.com> parents: 48001 diff changeset	925 type = 'f';
5c33009994b4 Backed out r65069, pending fixing it in Windows. Eric Smith <eric@trueblade.com> parents: 48001 diff changeset	926
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	927 val = PyFloat_AsDouble(value);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	928 if (val == -1.0 && PyErr_Occurred())
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	929 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	930
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	931 if (type == '%') {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	932 type = 'f';
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	933 val *= 100;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	934 add_pct = 1;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	935 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	936
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	937 if (precision < 0)
53802 1d8f24d40c2c Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53662 diff changeset	938 precision = default_precision;
53662 23bc4b391c10 Keep py3k and trunk code in sync. Eric Smith <eric@trueblade.com> parents: 53629 diff changeset	939
23bc4b391c10 Keep py3k and trunk code in sync. Eric Smith <eric@trueblade.com> parents: 53629 diff changeset	940 #if PY_VERSION_HEX < 0x03010000
23bc4b391c10 Keep py3k and trunk code in sync. Eric Smith <eric@trueblade.com> parents: 53629 diff changeset	941 /* 3.1 no longer converts large 'f' to 'g'. */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	942 if ((type == 'f' \|\| type == 'F') && fabs(val) >= 1e50)
48003 5c33009994b4 Backed out r65069, pending fixing it in Windows. Eric Smith <eric@trueblade.com> parents: 48001 diff changeset	943 type = 'g';
53662 23bc4b391c10 Keep py3k and trunk code in sync. Eric Smith <eric@trueblade.com> parents: 53629 diff changeset	944 #endif
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	945
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	946 /* Cast "type", because if we're in unicode we need to pass a
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	947 8-bit char. This is safe, because we've restricted what "type"
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	948 can be. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	949 buf = PyOS_double_to_string(val, (char)type, precision, flags,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	950 &float_type);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	951 if (buf == NULL)
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	952 goto done;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	953 n_digits = strlen(buf);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	954
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	955 if (add_pct) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	956 /* We know that buf has a trailing zero (since we just called
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	957 strlen() on it), and we don't use that fact any more. So we
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	958 can just write over the trailing zero. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	959 buf[n_digits] = '%';
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	960 n_digits += 1;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	961 }
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	962
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	963 /* Since there is no unicode version of PyOS_double_to_string,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	964 just use the 8 bit version and then convert to unicode. */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	965 #if STRINGLIB_IS_UNICODE
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	966 unicode_tmp = (Py_UNICODE)PyMem_Malloc((n_digits)sizeof(Py_UNICODE));
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	967 if (unicode_tmp == NULL) {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	968 PyErr_NoMemory();
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	969 goto done;
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	970 }
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	971 strtounicode(unicode_tmp, buf, n_digits);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	972 p = unicode_tmp;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	973 #else
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	974 p = buf;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	975 #endif
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	976
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	977 /* Is a sign character present in the output? If so, remember it
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	978 and skip it */
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	979 if (*p == '-') {
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	980 sign_char = *p;
45404 5d726da21d75 Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	981 ++p;
5d726da21d75 Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	982 --n_digits;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	983 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	984
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	985 /* Determine if we have any "remainder" (after the digits, might include
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	986 decimal or exponent or both (or neither)) */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	987 parse_number(p, n_digits, &n_remainder, &has_decimal);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	988
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	989 /* Determine the grouping, separator, and decimal point, if any. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	990 get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE :
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	991 (format->thousands_separators ?
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	992 LT_DEFAULT_LOCALE :
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	993 LT_NO_LOCALE),
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	994 &locale);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	995
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	996 /* Calculate how much memory we'll need. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	997 n_total = calc_number_widths(&spec, 0, sign_char, p, n_digits,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	998 n_remainder, has_decimal, &locale, format);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	999
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1000 /* Allocate the memory. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1001 result = STRINGLIB_NEW(NULL, n_total);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1002 if (result == NULL)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1003 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1004
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1005 /* Populate the memory. */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1006 fill_number(STRINGLIB_STR(result), &spec, p, n_digits, NULL,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1007 format->fill_char == '\0' ? ' ' : format->fill_char, &locale,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1008 0);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1009
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1010 done:
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1011 PyMem_Free(buf);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1012 #if STRINGLIB_IS_UNICODE
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1013 PyMem_Free(unicode_tmp);
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1014 #endif
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1015 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1016 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1017 #endif /* FORMAT_FLOAT */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1018
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1019 /************************************************************************/
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1020 /********* complex formatting ***************************************/
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1021 /************************************************************************/
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1022
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1023 #ifdef FORMAT_COMPLEX
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1024
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1025 static PyObject *
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1026 format_complex_internal(PyObject *value,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1027 const InternalFormatSpec *format)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1028 {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1029 double re;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1030 double im;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1031 char re_buf = NULL; / buffer returned from PyOS_double_to_string */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1032 char im_buf = NULL; / buffer returned from PyOS_double_to_string */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1033
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1034 InternalFormatSpec tmp_format = *format;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1035 Py_ssize_t n_re_digits;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1036 Py_ssize_t n_im_digits;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1037 Py_ssize_t n_re_remainder;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1038 Py_ssize_t n_im_remainder;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1039 Py_ssize_t n_re_total;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1040 Py_ssize_t n_im_total;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1041 int re_has_decimal;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1042 int im_has_decimal;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1043 Py_ssize_t precision = format->precision;
53802 1d8f24d40c2c Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53662 diff changeset	1044 Py_ssize_t default_precision = 6;
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1045 STRINGLIB_CHAR type = format->type;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1046 STRINGLIB_CHAR *p_re;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1047 STRINGLIB_CHAR *p_im;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1048 NumberFieldWidths re_spec;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1049 NumberFieldWidths im_spec;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1050 int flags = 0;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1051 PyObject *result = NULL;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1052 STRINGLIB_CHAR *p;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1053 STRINGLIB_CHAR re_sign_char = '\0';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1054 STRINGLIB_CHAR im_sign_char = '\0';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1055 int re_float_type; /* Used to see if we have a nan, inf, or regular float. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1056 int im_float_type;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1057 int add_parens = 0;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1058 int skip_re = 0;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1059 Py_ssize_t lpad;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1060 Py_ssize_t rpad;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1061 Py_ssize_t total;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1062
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1063 #if STRINGLIB_IS_UNICODE
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1064 Py_UNICODE *re_unicode_tmp = NULL;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1065 Py_UNICODE *im_unicode_tmp = NULL;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1066 #endif
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1067
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1068 /* Locale settings, either from the actual locale or
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1069 from a hard-code pseudo-locale */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1070 LocaleInfo locale;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1071
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1072 /* Alternate is not allowed on complex. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1073 if (format->alternate) {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1074 PyErr_SetString(PyExc_ValueError,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1075 "Alternate form (#) not allowed in complex format "
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1076 "specifier");
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1077 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1078 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1079
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1080 /* Neither is zero pading. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1081 if (format->fill_char == '0') {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1082 PyErr_SetString(PyExc_ValueError,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1083 "Zero padding is not allowed in complex format "
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1084 "specifier");
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1085 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1086 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1087
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1088 /* Neither is '=' alignment . */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1089 if (format->align == '=') {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1090 PyErr_SetString(PyExc_ValueError,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1091 "'=' alignment flag is not allowed in complex format "
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1092 "specifier");
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1093 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1094 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1095
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1096 re = PyComplex_RealAsDouble(value);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1097 if (re == -1.0 && PyErr_Occurred())
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1098 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1099 im = PyComplex_ImagAsDouble(value);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1100 if (im == -1.0 && PyErr_Occurred())
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1101 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1102
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1103 if (type == '\0') {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1104 /* Omitted type specifier. Should be like str(self). */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1105 type = 'g';
53802 1d8f24d40c2c Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53662 diff changeset	1106 default_precision = PyFloat_STR_PRECISION;
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1107 add_parens = 1;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1108 if (re == 0.0)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1109 skip_re = 1;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1110 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1111
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1112 if (type == 'n')
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1113 /* 'n' is the same as 'g', except for the locale used to
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1114 format the result. We take care of that later. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1115 type = 'g';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1116
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1117 /* 'F' is the same as 'f', per the PEP */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1118 if (type == 'F')
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1119 type = 'f';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1120
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1121 if (precision < 0)
53802 1d8f24d40c2c Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53662 diff changeset	1122 precision = default_precision;
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1123
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1124 /* Cast "type", because if we're in unicode we need to pass a
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1125 8-bit char. This is safe, because we've restricted what "type"
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1126 can be. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1127 re_buf = PyOS_double_to_string(re, (char)type, precision, flags,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1128 &re_float_type);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1129 if (re_buf == NULL)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1130 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1131 im_buf = PyOS_double_to_string(im, (char)type, precision, flags,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1132 &im_float_type);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1133 if (im_buf == NULL)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1134 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1135
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1136 n_re_digits = strlen(re_buf);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1137 n_im_digits = strlen(im_buf);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1138
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1139 /* Since there is no unicode version of PyOS_double_to_string,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1140 just use the 8 bit version and then convert to unicode. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1141 #if STRINGLIB_IS_UNICODE
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1142 re_unicode_tmp = (Py_UNICODE)PyMem_Malloc((n_re_digits)sizeof(Py_UNICODE));
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1143 if (re_unicode_tmp == NULL) {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1144 PyErr_NoMemory();
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1145 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1146 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1147 strtounicode(re_unicode_tmp, re_buf, n_re_digits);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1148 p_re = re_unicode_tmp;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1149
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1150 im_unicode_tmp = (Py_UNICODE)PyMem_Malloc((n_im_digits)sizeof(Py_UNICODE));
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1151 if (im_unicode_tmp == NULL) {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1152 PyErr_NoMemory();
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1153 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1154 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1155 strtounicode(im_unicode_tmp, im_buf, n_im_digits);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1156 p_im = im_unicode_tmp;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1157 #else
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1158 p_re = re_buf;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1159 p_im = im_buf;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1160 #endif
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1161
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1162 /* Is a sign character present in the output? If so, remember it
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1163 and skip it */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1164 if (*p_re == '-') {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1165 re_sign_char = *p_re;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1166 ++p_re;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1167 --n_re_digits;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1168 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1169 if (*p_im == '-') {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1170 im_sign_char = *p_im;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1171 ++p_im;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1172 --n_im_digits;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1173 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1174
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1175 /* Determine if we have any "remainder" (after the digits, might include
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1176 decimal or exponent or both (or neither)) */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1177 parse_number(p_re, n_re_digits, &n_re_remainder, &re_has_decimal);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1178 parse_number(p_im, n_im_digits, &n_im_remainder, &im_has_decimal);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1179
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1180 /* Determine the grouping, separator, and decimal point, if any. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1181 get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE :
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1182 (format->thousands_separators ?
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1183 LT_DEFAULT_LOCALE :
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1184 LT_NO_LOCALE),
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1185 &locale);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1186
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1187 /* Turn off any padding. We'll do it later after we've composed
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1188 the numbers without padding. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1189 tmp_format.fill_char = '\0';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1190 tmp_format.align = '\0';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1191 tmp_format.width = -1;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1192
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1193 /* Calculate how much memory we'll need. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1194 n_re_total = calc_number_widths(&re_spec, 0, re_sign_char, p_re,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1195 n_re_digits, n_re_remainder,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1196 re_has_decimal, &locale, &tmp_format);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1197
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1198 /* Same formatting, but always include a sign. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1199 tmp_format.sign = '+';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1200 n_im_total = calc_number_widths(&im_spec, 0, im_sign_char, p_im,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1201 n_im_digits, n_im_remainder,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1202 im_has_decimal, &locale, &tmp_format);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1203
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1204 if (skip_re)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1205 n_re_total = 0;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1206
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1207 /* Add 1 for the 'j', and optionally 2 for parens. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1208 calc_padding(n_re_total + n_im_total + 1 + add_parens * 2,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1209 format->width, format->align, &lpad, &rpad, &total);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1210
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1211 result = STRINGLIB_NEW(NULL, total);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1212 if (result == NULL)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1213 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1214
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1215 /* Populate the memory. First, the padding. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1216 p = fill_padding(STRINGLIB_STR(result),
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1217 n_re_total + n_im_total + 1 + add_parens * 2,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1218 format->fill_char=='\0' ? ' ' : format->fill_char,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1219 lpad, rpad);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1220
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1221 if (add_parens)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1222 *p++ = '(';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1223
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1224 if (!skip_re) {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1225 fill_number(p, &re_spec, p_re, n_re_digits, NULL, 0, &locale, 0);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1226 p += n_re_total;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1227 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1228 fill_number(p, &im_spec, p_im, n_im_digits, NULL, 0, &locale, 0);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1229 p += n_im_total;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1230 *p++ = 'j';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1231
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1232 if (add_parens)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1233 *p++ = ')';
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1234
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1235 done:
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1236 PyMem_Free(re_buf);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1237 PyMem_Free(im_buf);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1238 #if STRINGLIB_IS_UNICODE
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1239 PyMem_Free(re_unicode_tmp);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1240 PyMem_Free(im_unicode_tmp);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1241 #endif
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1242 return result;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1243 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1244 #endif /* FORMAT_COMPLEX */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1245
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1246 /************************************************************************/
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1247 /********* built in formatters **************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1248 /************************************************************************/
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1249 PyObject *
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1250 FORMAT_STRING(PyObject *obj,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1251 STRINGLIB_CHAR *format_spec,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1252 Py_ssize_t format_spec_len)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1253 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1254 InternalFormatSpec format;
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1255 PyObject *result = NULL;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1256
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1257 /* check for the special case of zero length format spec, make
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1258 it equivalent to str(obj) */
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1259 if (format_spec_len == 0) {
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1260 result = STRINGLIB_TOSTR(obj);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1261 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1262 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1263
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1264 /* parse the format_spec */
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1265 if (!parse_internal_render_format_spec(format_spec, format_spec_len,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1266 &format, 's'))
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1267 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1268
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1269 /* type conversion? */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1270 switch (format.type) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1271 case 's':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1272 /* no type conversion needed, already a string. do the formatting */
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1273 result = format_string_internal(obj, &format);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1274 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1275 default:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1276 /* unknown */
51756 164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	1277 unknown_presentation_type(format.type, obj->ob_type->tp_name);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1278 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1279 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1280
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1281 done:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1282 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1283 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1284
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1285 #if defined FORMAT_LONG \|\| defined FORMAT_INT
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1286 static PyObject*
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1287 format_int_or_long(PyObject* obj,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1288 STRINGLIB_CHAR *format_spec,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1289 Py_ssize_t format_spec_len,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1290 IntOrLongToString tostring)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1291 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1292 PyObject *result = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1293 PyObject *tmp = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1294 InternalFormatSpec format;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1295
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1296 /* check for the special case of zero length format spec, make
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1297 it equivalent to str(obj) */
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1298 if (format_spec_len == 0) {
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1299 result = STRINGLIB_TOSTR(obj);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1300 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1301 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1302
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1303 /* parse the format_spec */
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1304 if (!parse_internal_render_format_spec(format_spec,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1305 format_spec_len,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1306 &format, 'd'))
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1307 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1308
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1309 /* type conversion? */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1310 switch (format.type) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1311 case 'b':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1312 case 'c':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1313 case 'd':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1314 case 'o':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1315 case 'x':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1316 case 'X':
46898 206700d749f0 Addresses issue 2802: 'n' formatting for integers. Eric Smith <eric@trueblade.com> parents: 46333 diff changeset	1317 case 'n':
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1318 /* no type conversion needed, already an int (or long). do
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1319 the formatting */
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1320 result = format_int_or_long_internal(obj, &format, tostring);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1321 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1322
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1323 case 'e':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1324 case 'E':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1325 case 'f':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1326 case 'F':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1327 case 'g':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1328 case 'G':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1329 case '%':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1330 /* convert to float */
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1331 tmp = PyNumber_Float(obj);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1332 if (tmp == NULL)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1333 goto done;
53116 12a8d1947167 Merged revisions 71548 via svnmerge from Eric Smith <eric@trueblade.com> parents: 52405 diff changeset	1334 result = format_float_internal(tmp, &format);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1335 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1336
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1337 default:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1338 /* unknown */
51756 164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	1339 unknown_presentation_type(format.type, obj->ob_type->tp_name);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1340 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1341 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1342
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1343 done:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1344 Py_XDECREF(tmp);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1345 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1346 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1347 #endif /* FORMAT_LONG \|\| defined FORMAT_INT */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1348
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1349 #ifdef FORMAT_LONG
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1350 /* Need to define long_format as a function that will convert a long
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1351 to a string. In 3.0, _PyLong_Format has the correct signature. In
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1352 2.x, we need to fudge a few parameters */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1353 #if PY_VERSION_HEX >= 0x03000000
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1354 #define long_format _PyLong_Format
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1355 #else
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1356 static PyObject*
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1357 long_format(PyObject* value, int base)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1358 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1359 /* Convert to base, don't add trailing 'L', and use the new octal
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1360 format. We already know this is a long object */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1361 assert(PyLong_Check(value));
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1362 /* convert to base, don't add 'L', and use the new octal format */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1363 return _PyLong_Format(value, base, 0, 1);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1364 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1365 #endif
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1366
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1367 PyObject *
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1368 FORMAT_LONG(PyObject *obj,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1369 STRINGLIB_CHAR *format_spec,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1370 Py_ssize_t format_spec_len)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1371 {
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1372 return format_int_or_long(obj, format_spec, format_spec_len,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1373 long_format);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1374 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1375 #endif /* FORMAT_LONG */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1376
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1377 #ifdef FORMAT_INT
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1378 /* this is only used for 2.x, not 3.0 */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1379 static PyObject*
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1380 int_format(PyObject* value, int base)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1381 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1382 /* Convert to base, and use the new octal format. We already
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1383 know this is an int object */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1384 assert(PyInt_Check(value));
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1385 return _PyInt_Format((PyIntObject*)value, base, 1);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1386 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1387
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1388 PyObject *
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1389 FORMAT_INT(PyObject *obj,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1390 STRINGLIB_CHAR *format_spec,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1391 Py_ssize_t format_spec_len)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1392 {
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1393 return format_int_or_long(obj, format_spec, format_spec_len,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1394 int_format);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1395 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1396 #endif /* FORMAT_INT */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1397
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1398 #ifdef FORMAT_FLOAT
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1399 PyObject *
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1400 FORMAT_FLOAT(PyObject *obj,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1401 STRINGLIB_CHAR *format_spec,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1402 Py_ssize_t format_spec_len)
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1403 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1404 PyObject *result = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1405 InternalFormatSpec format;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1406
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1407 /* check for the special case of zero length format spec, make
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1408 it equivalent to str(obj) */
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1409 if (format_spec_len == 0) {
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1410 result = STRINGLIB_TOSTR(obj);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1411 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1412 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1413
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1414 /* parse the format_spec */
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1415 if (!parse_internal_render_format_spec(format_spec,
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1416 format_spec_len,
c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1417 &format, '\0'))
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1418 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1419
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1420 /* type conversion? */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1421 switch (format.type) {
53312 c5e0d9beebf9 Backport of some of the work in r71665 to trunk. This reworks much of Eric Smith <eric@trueblade.com> parents: 53116 diff changeset	1422 case '\0': /* No format code: like 'g', but with at least one decimal. */
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1423 case 'e':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1424 case 'E':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1425 case 'f':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1426 case 'F':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1427 case 'g':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1428 case 'G':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1429 case 'n':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1430 case '%':
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1431 /* no conversion, already a float. do the formatting */
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1432 result = format_float_internal(obj, &format);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1433 break;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1434
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1435 default:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1436 /* unknown */
51756 164ba7ffa0ee Merged revisions 69806 via svnmerge from Eric Smith <eric@trueblade.com> parents: 48847 diff changeset	1437 unknown_presentation_type(format.type, obj->ob_type->tp_name);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1438 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1439 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1440
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1441 done:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1442 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1443 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: diff changeset	1444 #endif /* FORMAT_FLOAT */
53629 34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1445
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1446 #ifdef FORMAT_COMPLEX
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1447 PyObject *
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1448 FORMAT_COMPLEX(PyObject *obj,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1449 STRINGLIB_CHAR *format_spec,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1450 Py_ssize_t format_spec_len)
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1451 {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1452 PyObject *result = NULL;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1453 InternalFormatSpec format;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1454
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1455 /* check for the special case of zero length format spec, make
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1456 it equivalent to str(obj) */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1457 if (format_spec_len == 0) {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1458 result = STRINGLIB_TOSTR(obj);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1459 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1460 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1461
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1462 /* parse the format_spec */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1463 if (!parse_internal_render_format_spec(format_spec,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1464 format_spec_len,
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1465 &format, '\0'))
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1466 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1467
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1468 /* type conversion? */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1469 switch (format.type) {
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1470 case '\0': /* No format code: like 'g', but with at least one decimal. */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1471 case 'e':
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1472 case 'E':
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1473 case 'f':
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1474 case 'F':
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1475 case 'g':
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1476 case 'G':
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1477 case 'n':
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1478 /* no conversion, already a complex. do the formatting */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1479 result = format_complex_internal(obj, &format);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1480 break;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1481
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1482 default:
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1483 /* unknown */
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1484 unknown_presentation_type(format.type, obj->ob_type->tp_name);
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1485 goto done;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1486 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1487
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1488 done:
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1489 return result;
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1490 }
34e7c1b14495 Issue #1588: Add complex.__format__. Eric Smith <eric@trueblade.com> parents: 53318 diff changeset	1491 #endif /* FORMAT_COMPLEX */

Mercurial > cpython-lru_cache-weakref

annotate Objects/stringlib/formatter.h @ 54294:dba767bc3155 legacy-trunk