annotate Python/formatter_unicode.c @ 72493:c4dcb68e0711

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