Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 1 | /* |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 2 | unicode_format.h -- implementation of str.format(). |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 3 | */ |
| 4 | |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 5 | /************************************************************************/ |
| 6 | /*********** Global data structures and forward declarations *********/ |
| 7 | /************************************************************************/ |
| 8 | |
| 9 | /* |
| 10 | A SubString consists of the characters between two string or |
| 11 | unicode pointers. |
| 12 | */ |
| 13 | typedef struct { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 14 | PyObject *str; /* borrowed reference */ |
| 15 | Py_ssize_t start, end; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 16 | } SubString; |
| 17 | |
| 18 | |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 19 | typedef enum { |
| 20 | ANS_INIT, |
| 21 | ANS_AUTO, |
Georg Brandl | fb526ac | 2009-05-01 08:59:13 +0000 | [diff] [blame] | 22 | ANS_MANUAL |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 23 | } AutoNumberState; /* Keep track if we're auto-numbering fields */ |
| 24 | |
| 25 | /* Keeps track of our auto-numbering state, and which number field we're on */ |
| 26 | typedef struct { |
| 27 | AutoNumberState an_state; |
| 28 | int an_field_number; |
| 29 | } AutoNumber; |
| 30 | |
| 31 | |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 32 | /* forward declaration for recursion */ |
| 33 | static PyObject * |
| 34 | build_string(SubString *input, PyObject *args, PyObject *kwargs, |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 35 | int recursion_depth, AutoNumber *auto_number); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 36 | |
| 37 | |
| 38 | |
| 39 | /************************************************************************/ |
| 40 | /************************** Utility functions ************************/ |
| 41 | /************************************************************************/ |
| 42 | |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 43 | static void |
| 44 | AutoNumber_Init(AutoNumber *auto_number) |
| 45 | { |
| 46 | auto_number->an_state = ANS_INIT; |
| 47 | auto_number->an_field_number = 0; |
| 48 | } |
| 49 | |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 50 | /* fill in a SubString from a pointer and length */ |
| 51 | Py_LOCAL_INLINE(void) |
Antoine Pitrou | dbf697a | 2011-10-06 15:34:41 +0200 | [diff] [blame] | 52 | SubString_init(SubString *str, PyObject *s, Py_ssize_t start, Py_ssize_t end) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 53 | { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 54 | str->str = s; |
| 55 | str->start = start; |
| 56 | str->end = end; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 57 | } |
| 58 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 59 | /* return a new string. if str->str is NULL, return None */ |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 60 | Py_LOCAL_INLINE(PyObject *) |
| 61 | SubString_new_object(SubString *str) |
| 62 | { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 63 | if (str->str == NULL) { |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 64 | Py_INCREF(Py_None); |
| 65 | return Py_None; |
| 66 | } |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 67 | return PyUnicode_Substring(str->str, str->start, str->end); |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 68 | } |
| 69 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 70 | /* return a new string. if str->str is NULL, return None */ |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 71 | Py_LOCAL_INLINE(PyObject *) |
| 72 | SubString_new_object_or_empty(SubString *str) |
| 73 | { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 74 | if (str->str == NULL) { |
Victor Stinner | b37b174 | 2011-12-01 03:18:59 +0100 | [diff] [blame] | 75 | return PyUnicode_New(0, 0); |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 76 | } |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 77 | return SubString_new_object(str); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 78 | } |
| 79 | |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 80 | /* Return 1 if an error has been detected switching between automatic |
| 81 | field numbering and manual field specification, else return 0. Set |
| 82 | ValueError on error. */ |
| 83 | static int |
| 84 | autonumber_state_error(AutoNumberState state, int field_name_is_empty) |
| 85 | { |
| 86 | if (state == ANS_MANUAL) { |
| 87 | if (field_name_is_empty) { |
| 88 | PyErr_SetString(PyExc_ValueError, "cannot switch from " |
| 89 | "manual field specification to " |
| 90 | "automatic field numbering"); |
| 91 | return 1; |
| 92 | } |
| 93 | } |
| 94 | else { |
| 95 | if (!field_name_is_empty) { |
| 96 | PyErr_SetString(PyExc_ValueError, "cannot switch from " |
| 97 | "automatic field numbering to " |
| 98 | "manual field specification"); |
| 99 | return 1; |
| 100 | } |
| 101 | } |
| 102 | return 0; |
| 103 | } |
| 104 | |
| 105 | |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 106 | /************************************************************************/ |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 107 | /*********** Format string parsing -- integers and identifiers *********/ |
| 108 | /************************************************************************/ |
| 109 | |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 110 | static Py_ssize_t |
| 111 | get_integer(const SubString *str) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 112 | { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 113 | Py_ssize_t accumulator = 0; |
| 114 | Py_ssize_t digitval; |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 115 | Py_ssize_t i; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 116 | |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 117 | /* empty string is an error */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 118 | if (str->start >= str->end) |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 119 | return -1; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 120 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 121 | for (i = str->start; i < str->end; i++) { |
| 122 | digitval = Py_UNICODE_TODECIMAL(PyUnicode_READ_CHAR(str->str, i)); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 123 | if (digitval < 0) |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 124 | return -1; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 125 | /* |
Mark Dickinson | c7d93b7 | 2011-09-25 15:34:32 +0100 | [diff] [blame] | 126 | Detect possible overflow before it happens: |
| 127 | |
| 128 | accumulator * 10 + digitval > PY_SSIZE_T_MAX if and only if |
| 129 | accumulator > (PY_SSIZE_T_MAX - digitval) / 10. |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 130 | */ |
Mark Dickinson | c7d93b7 | 2011-09-25 15:34:32 +0100 | [diff] [blame] | 131 | if (accumulator > (PY_SSIZE_T_MAX - digitval) / 10) { |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 132 | PyErr_Format(PyExc_ValueError, |
| 133 | "Too many decimal digits in format string"); |
| 134 | return -1; |
| 135 | } |
Mark Dickinson | c7d93b7 | 2011-09-25 15:34:32 +0100 | [diff] [blame] | 136 | accumulator = accumulator * 10 + digitval; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 137 | } |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 138 | return accumulator; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 139 | } |
| 140 | |
| 141 | /************************************************************************/ |
| 142 | /******** Functions to get field objects and specification strings ******/ |
| 143 | /************************************************************************/ |
| 144 | |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 145 | /* do the equivalent of obj.name */ |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 146 | static PyObject * |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 147 | getattr(PyObject *obj, SubString *name) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 148 | { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 149 | PyObject *newobj; |
Eric Smith | 7a6dd29 | 2007-08-27 23:30:47 +0000 | [diff] [blame] | 150 | PyObject *str = SubString_new_object(name); |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 151 | if (str == NULL) |
| 152 | return NULL; |
| 153 | newobj = PyObject_GetAttr(obj, str); |
| 154 | Py_DECREF(str); |
| 155 | return newobj; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 156 | } |
| 157 | |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 158 | /* do the equivalent of obj[idx], where obj is a sequence */ |
| 159 | static PyObject * |
| 160 | getitem_sequence(PyObject *obj, Py_ssize_t idx) |
| 161 | { |
| 162 | return PySequence_GetItem(obj, idx); |
| 163 | } |
| 164 | |
| 165 | /* do the equivalent of obj[idx], where obj is not a sequence */ |
| 166 | static PyObject * |
| 167 | getitem_idx(PyObject *obj, Py_ssize_t idx) |
| 168 | { |
| 169 | PyObject *newobj; |
Christian Heimes | 217cfd1 | 2007-12-02 14:31:20 +0000 | [diff] [blame] | 170 | PyObject *idx_obj = PyLong_FromSsize_t(idx); |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 171 | if (idx_obj == NULL) |
| 172 | return NULL; |
| 173 | newobj = PyObject_GetItem(obj, idx_obj); |
| 174 | Py_DECREF(idx_obj); |
| 175 | return newobj; |
| 176 | } |
| 177 | |
| 178 | /* do the equivalent of obj[name] */ |
| 179 | static PyObject * |
| 180 | getitem_str(PyObject *obj, SubString *name) |
| 181 | { |
| 182 | PyObject *newobj; |
Eric Smith | 7a6dd29 | 2007-08-27 23:30:47 +0000 | [diff] [blame] | 183 | PyObject *str = SubString_new_object(name); |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 184 | if (str == NULL) |
| 185 | return NULL; |
| 186 | newobj = PyObject_GetItem(obj, str); |
| 187 | Py_DECREF(str); |
| 188 | return newobj; |
| 189 | } |
| 190 | |
| 191 | typedef struct { |
| 192 | /* the entire string we're parsing. we assume that someone else |
| 193 | is managing its lifetime, and that it will exist for the |
| 194 | lifetime of the iterator. can be empty */ |
| 195 | SubString str; |
| 196 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 197 | /* index to where we are inside field_name */ |
| 198 | Py_ssize_t index; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 199 | } FieldNameIterator; |
| 200 | |
| 201 | |
| 202 | static int |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 203 | FieldNameIterator_init(FieldNameIterator *self, PyObject *s, |
| 204 | Py_ssize_t start, Py_ssize_t end) |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 205 | { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 206 | SubString_init(&self->str, s, start, end); |
| 207 | self->index = start; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 208 | return 1; |
| 209 | } |
| 210 | |
| 211 | static int |
| 212 | _FieldNameIterator_attr(FieldNameIterator *self, SubString *name) |
| 213 | { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 214 | Py_UCS4 c; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 215 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 216 | name->str = self->str.str; |
| 217 | name->start = self->index; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 218 | |
| 219 | /* return everything until '.' or '[' */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 220 | while (self->index < self->str.end) { |
| 221 | c = PyUnicode_READ_CHAR(self->str.str, self->index++); |
| 222 | switch (c) { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 223 | case '[': |
| 224 | case '.': |
| 225 | /* backup so that we this character will be seen next time */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 226 | self->index--; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 227 | break; |
| 228 | default: |
| 229 | continue; |
| 230 | } |
| 231 | break; |
| 232 | } |
| 233 | /* end of string is okay */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 234 | name->end = self->index; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 235 | return 1; |
| 236 | } |
| 237 | |
| 238 | static int |
| 239 | _FieldNameIterator_item(FieldNameIterator *self, SubString *name) |
| 240 | { |
Eric Smith | 4cb4e4e | 2007-09-03 08:40:29 +0000 | [diff] [blame] | 241 | int bracket_seen = 0; |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 242 | Py_UCS4 c; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 243 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 244 | name->str = self->str.str; |
| 245 | name->start = self->index; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 246 | |
| 247 | /* return everything until ']' */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 248 | while (self->index < self->str.end) { |
| 249 | c = PyUnicode_READ_CHAR(self->str.str, self->index++); |
| 250 | switch (c) { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 251 | case ']': |
Eric Smith | 4cb4e4e | 2007-09-03 08:40:29 +0000 | [diff] [blame] | 252 | bracket_seen = 1; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 253 | break; |
| 254 | default: |
| 255 | continue; |
| 256 | } |
| 257 | break; |
| 258 | } |
Eric Smith | 4cb4e4e | 2007-09-03 08:40:29 +0000 | [diff] [blame] | 259 | /* make sure we ended with a ']' */ |
| 260 | if (!bracket_seen) { |
| 261 | PyErr_SetString(PyExc_ValueError, "Missing ']' in format string"); |
| 262 | return 0; |
| 263 | } |
| 264 | |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 265 | /* end of string is okay */ |
| 266 | /* don't include the ']' */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 267 | name->end = self->index-1; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 268 | return 1; |
| 269 | } |
| 270 | |
| 271 | /* returns 0 on error, 1 on non-error termination, and 2 if it returns a value */ |
| 272 | static int |
| 273 | FieldNameIterator_next(FieldNameIterator *self, int *is_attribute, |
| 274 | Py_ssize_t *name_idx, SubString *name) |
| 275 | { |
| 276 | /* check at end of input */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 277 | if (self->index >= self->str.end) |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 278 | return 1; |
| 279 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 280 | switch (PyUnicode_READ_CHAR(self->str.str, self->index++)) { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 281 | case '.': |
| 282 | *is_attribute = 1; |
Eric Smith | 4cb4e4e | 2007-09-03 08:40:29 +0000 | [diff] [blame] | 283 | if (_FieldNameIterator_attr(self, name) == 0) |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 284 | return 0; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 285 | *name_idx = -1; |
| 286 | break; |
| 287 | case '[': |
| 288 | *is_attribute = 0; |
Eric Smith | 4cb4e4e | 2007-09-03 08:40:29 +0000 | [diff] [blame] | 289 | if (_FieldNameIterator_item(self, name) == 0) |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 290 | return 0; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 291 | *name_idx = get_integer(name); |
Benjamin Peterson | 59a1b2f | 2010-06-07 22:31:26 +0000 | [diff] [blame] | 292 | if (*name_idx == -1 && PyErr_Occurred()) |
| 293 | return 0; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 294 | break; |
| 295 | default: |
Eric Smith | 41669ca | 2009-05-23 14:23:22 +0000 | [diff] [blame] | 296 | /* Invalid character follows ']' */ |
| 297 | PyErr_SetString(PyExc_ValueError, "Only '.' or '[' may " |
| 298 | "follow ']' in format field specifier"); |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 299 | return 0; |
| 300 | } |
| 301 | |
| 302 | /* empty string is an error */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 303 | if (name->start == name->end) { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 304 | PyErr_SetString(PyExc_ValueError, "Empty attribute in format string"); |
| 305 | return 0; |
| 306 | } |
| 307 | |
| 308 | return 2; |
| 309 | } |
| 310 | |
| 311 | |
| 312 | /* input: field_name |
| 313 | output: 'first' points to the part before the first '[' or '.' |
| 314 | 'first_idx' is -1 if 'first' is not an integer, otherwise |
| 315 | it's the value of first converted to an integer |
| 316 | 'rest' is an iterator to return the rest |
| 317 | */ |
| 318 | static int |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 319 | field_name_split(PyObject *str, Py_ssize_t start, Py_ssize_t end, SubString *first, |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 320 | Py_ssize_t *first_idx, FieldNameIterator *rest, |
| 321 | AutoNumber *auto_number) |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 322 | { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 323 | Py_UCS4 c; |
| 324 | Py_ssize_t i = start; |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 325 | int field_name_is_empty; |
| 326 | int using_numeric_index; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 327 | |
| 328 | /* find the part up until the first '.' or '[' */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 329 | while (i < end) { |
| 330 | switch (c = PyUnicode_READ_CHAR(str, i++)) { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 331 | case '[': |
| 332 | case '.': |
| 333 | /* backup so that we this character is available to the |
| 334 | "rest" iterator */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 335 | i--; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 336 | break; |
| 337 | default: |
| 338 | continue; |
| 339 | } |
| 340 | break; |
| 341 | } |
| 342 | |
| 343 | /* set up the return values */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 344 | SubString_init(first, str, start, i); |
| 345 | FieldNameIterator_init(rest, str, i, end); |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 346 | |
| 347 | /* see if "first" is an integer, in which case it's used as an index */ |
| 348 | *first_idx = get_integer(first); |
Benjamin Peterson | 59a1b2f | 2010-06-07 22:31:26 +0000 | [diff] [blame] | 349 | if (*first_idx == -1 && PyErr_Occurred()) |
| 350 | return 0; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 351 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 352 | field_name_is_empty = first->start >= first->end; |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 353 | |
| 354 | /* If the field name is omitted or if we have a numeric index |
| 355 | specified, then we're doing numeric indexing into args. */ |
| 356 | using_numeric_index = field_name_is_empty || *first_idx != -1; |
| 357 | |
| 358 | /* We always get here exactly one time for each field we're |
| 359 | processing. And we get here in field order (counting by left |
| 360 | braces). So this is the perfect place to handle automatic field |
| 361 | numbering if the field name is omitted. */ |
| 362 | |
| 363 | /* Check if we need to do the auto-numbering. It's not needed if |
| 364 | we're called from string.Format routines, because it's handled |
| 365 | in that class by itself. */ |
| 366 | if (auto_number) { |
| 367 | /* Initialize our auto numbering state if this is the first |
| 368 | time we're either auto-numbering or manually numbering. */ |
| 369 | if (auto_number->an_state == ANS_INIT && using_numeric_index) |
| 370 | auto_number->an_state = field_name_is_empty ? |
| 371 | ANS_AUTO : ANS_MANUAL; |
| 372 | |
| 373 | /* Make sure our state is consistent with what we're doing |
| 374 | this time through. Only check if we're using a numeric |
| 375 | index. */ |
| 376 | if (using_numeric_index) |
| 377 | if (autonumber_state_error(auto_number->an_state, |
| 378 | field_name_is_empty)) |
| 379 | return 0; |
| 380 | /* Zero length field means we want to do auto-numbering of the |
| 381 | fields. */ |
| 382 | if (field_name_is_empty) |
| 383 | *first_idx = (auto_number->an_field_number)++; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 384 | } |
| 385 | |
| 386 | return 1; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 387 | } |
| 388 | |
| 389 | |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 390 | /* |
| 391 | get_field_object returns the object inside {}, before the |
| 392 | format_spec. It handles getindex and getattr lookups and consumes |
| 393 | the entire input string. |
| 394 | */ |
| 395 | static PyObject * |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 396 | get_field_object(SubString *input, PyObject *args, PyObject *kwargs, |
| 397 | AutoNumber *auto_number) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 398 | { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 399 | PyObject *obj = NULL; |
| 400 | int ok; |
| 401 | int is_attribute; |
| 402 | SubString name; |
| 403 | SubString first; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 404 | Py_ssize_t index; |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 405 | FieldNameIterator rest; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 406 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 407 | if (!field_name_split(input->str, input->start, input->end, &first, |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 408 | &index, &rest, auto_number)) { |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 409 | goto error; |
| 410 | } |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 411 | |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 412 | if (index == -1) { |
| 413 | /* look up in kwargs */ |
Eric Smith | 7a6dd29 | 2007-08-27 23:30:47 +0000 | [diff] [blame] | 414 | PyObject *key = SubString_new_object(&first); |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 415 | if (key == NULL) |
| 416 | goto error; |
Eric Smith | 27bbca6 | 2010-11-04 17:06:58 +0000 | [diff] [blame] | 417 | |
| 418 | /* Use PyObject_GetItem instead of PyDict_GetItem because this |
| 419 | code is no longer just used with kwargs. It might be passed |
| 420 | a non-dict when called through format_map. */ |
| 421 | if ((kwargs == NULL) || (obj = PyObject_GetItem(kwargs, key)) == NULL) { |
Eric Smith | 1152919 | 2007-09-04 23:04:22 +0000 | [diff] [blame] | 422 | PyErr_SetObject(PyExc_KeyError, key); |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 423 | Py_DECREF(key); |
| 424 | goto error; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 425 | } |
Neal Norwitz | 8a4eb29 | 2007-08-27 07:24:17 +0000 | [diff] [blame] | 426 | Py_DECREF(key); |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 427 | } |
| 428 | else { |
Eric V. Smith | 12ebefc | 2011-07-18 14:03:41 -0400 | [diff] [blame] | 429 | /* If args is NULL, we have a format string with a positional field |
| 430 | with only kwargs to retrieve it from. This can only happen when |
| 431 | used with format_map(), where positional arguments are not |
| 432 | allowed. */ |
| 433 | if (args == NULL) { |
| 434 | PyErr_SetString(PyExc_ValueError, "Format string contains " |
| 435 | "positional fields"); |
| 436 | goto error; |
| 437 | } |
| 438 | |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 439 | /* look up in args */ |
| 440 | obj = PySequence_GetItem(args, index); |
Eric Smith | 1152919 | 2007-09-04 23:04:22 +0000 | [diff] [blame] | 441 | if (obj == NULL) |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 442 | goto error; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 443 | } |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 444 | |
| 445 | /* iterate over the rest of the field_name */ |
| 446 | while ((ok = FieldNameIterator_next(&rest, &is_attribute, &index, |
| 447 | &name)) == 2) { |
| 448 | PyObject *tmp; |
| 449 | |
| 450 | if (is_attribute) |
| 451 | /* getattr lookup "." */ |
| 452 | tmp = getattr(obj, &name); |
| 453 | else |
| 454 | /* getitem lookup "[]" */ |
| 455 | if (index == -1) |
| 456 | tmp = getitem_str(obj, &name); |
| 457 | else |
| 458 | if (PySequence_Check(obj)) |
| 459 | tmp = getitem_sequence(obj, index); |
| 460 | else |
| 461 | /* not a sequence */ |
| 462 | tmp = getitem_idx(obj, index); |
| 463 | if (tmp == NULL) |
| 464 | goto error; |
| 465 | |
| 466 | /* assign to obj */ |
| 467 | Py_DECREF(obj); |
| 468 | obj = tmp; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 469 | } |
Eric Smith | 7ade648 | 2007-08-26 22:27:13 +0000 | [diff] [blame] | 470 | /* end of iterator, this is the non-error case */ |
| 471 | if (ok == 1) |
| 472 | return obj; |
| 473 | error: |
| 474 | Py_XDECREF(obj); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 475 | return NULL; |
| 476 | } |
| 477 | |
| 478 | /************************************************************************/ |
| 479 | /***************** Field rendering functions **************************/ |
| 480 | /************************************************************************/ |
| 481 | |
| 482 | /* |
| 483 | render_field() is the main function in this section. It takes the |
| 484 | field object and field specification string generated by |
| 485 | get_field_and_spec, and renders the field into the output string. |
| 486 | |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 487 | render_field calls fieldobj.__format__(format_spec) method, and |
| 488 | appends to the output. |
| 489 | */ |
| 490 | static int |
Victor Stinner | 3b1a74a | 2012-05-09 22:25:00 +0200 | [diff] [blame] | 491 | render_field(PyObject *fieldobj, SubString *format_spec, _PyUnicodeWriter *writer) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 492 | { |
| 493 | int ok = 0; |
Eric Smith | 8fd3eba | 2008-02-17 19:48:00 +0000 | [diff] [blame] | 494 | PyObject *result = NULL; |
Eric Smith | 1d138f1 | 2008-05-31 01:40:08 +0000 | [diff] [blame] | 495 | PyObject *format_spec_object = NULL; |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 496 | int (*formatter) (_PyUnicodeWriter*, PyObject *, PyObject *, Py_ssize_t, Py_ssize_t) = NULL; |
| 497 | int err; |
Victor Stinner | 7931d9a | 2011-11-04 00:22:48 +0100 | [diff] [blame] | 498 | |
Eric Smith | 1d138f1 | 2008-05-31 01:40:08 +0000 | [diff] [blame] | 499 | /* If we know the type exactly, skip the lookup of __format__ and just |
| 500 | call the formatter directly. */ |
| 501 | if (PyUnicode_CheckExact(fieldobj)) |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 502 | formatter = _PyUnicode_FormatAdvancedWriter; |
Eric Smith | 1d138f1 | 2008-05-31 01:40:08 +0000 | [diff] [blame] | 503 | else if (PyLong_CheckExact(fieldobj)) |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 504 | formatter = _PyLong_FormatAdvancedWriter; |
Eric Smith | 1d138f1 | 2008-05-31 01:40:08 +0000 | [diff] [blame] | 505 | else if (PyFloat_CheckExact(fieldobj)) |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 506 | formatter = _PyFloat_FormatAdvancedWriter; |
| 507 | else if (PyComplex_CheckExact(fieldobj)) |
| 508 | formatter = _PyComplex_FormatAdvancedWriter; |
Eric Smith | ba8c028 | 2008-06-02 14:57:32 +0000 | [diff] [blame] | 509 | |
| 510 | if (formatter) { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 511 | /* we know exactly which formatter will be called when __format__ is |
| 512 | looked up, so call it directly, instead. */ |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 513 | err = formatter(writer, fieldobj, format_spec->str, |
| 514 | format_spec->start, format_spec->end); |
| 515 | return (err == 0); |
Eric Smith | ba8c028 | 2008-06-02 14:57:32 +0000 | [diff] [blame] | 516 | } |
Eric Smith | 1d138f1 | 2008-05-31 01:40:08 +0000 | [diff] [blame] | 517 | else { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 518 | /* We need to create an object out of the pointers we have, because |
| 519 | __format__ takes a string/unicode object for format_spec. */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 520 | if (format_spec->str) |
| 521 | format_spec_object = PyUnicode_Substring(format_spec->str, |
| 522 | format_spec->start, |
| 523 | format_spec->end); |
| 524 | else |
| 525 | format_spec_object = PyUnicode_New(0, 0); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 526 | if (format_spec_object == NULL) |
| 527 | goto done; |
Eric Smith | 1d138f1 | 2008-05-31 01:40:08 +0000 | [diff] [blame] | 528 | |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 529 | result = PyObject_Format(fieldobj, format_spec_object); |
Eric Smith | 1d138f1 | 2008-05-31 01:40:08 +0000 | [diff] [blame] | 530 | } |
Victor Stinner | ee4544c | 2012-05-09 22:24:08 +0200 | [diff] [blame] | 531 | if (result == NULL) |
| 532 | goto done; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 533 | |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 534 | if (_PyUnicodeWriter_WriteStr(writer, result) == -1) |
Victor Stinner | ee4544c | 2012-05-09 22:24:08 +0200 | [diff] [blame] | 535 | goto done; |
Victor Stinner | ee4544c | 2012-05-09 22:24:08 +0200 | [diff] [blame] | 536 | ok = 1; |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 537 | |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 538 | done: |
Eric Smith | 1d138f1 | 2008-05-31 01:40:08 +0000 | [diff] [blame] | 539 | Py_XDECREF(format_spec_object); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 540 | Py_XDECREF(result); |
| 541 | return ok; |
| 542 | } |
| 543 | |
| 544 | static int |
| 545 | parse_field(SubString *str, SubString *field_name, SubString *format_spec, |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 546 | Py_UCS4 *conversion) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 547 | { |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 548 | /* Note this function works if the field name is zero length, |
| 549 | which is good. Zero length field names are handled later, in |
| 550 | field_name_split. */ |
| 551 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 552 | Py_UCS4 c = 0; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 553 | |
| 554 | /* initialize these, as they may be empty */ |
| 555 | *conversion = '\0'; |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 556 | SubString_init(format_spec, NULL, 0, 0); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 557 | |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 558 | /* Search for the field name. it's terminated by the end of |
| 559 | the string, or a ':' or '!' */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 560 | field_name->str = str->str; |
| 561 | field_name->start = str->start; |
| 562 | while (str->start < str->end) { |
| 563 | switch ((c = PyUnicode_READ_CHAR(str->str, str->start++))) { |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 564 | case ':': |
| 565 | case '!': |
| 566 | break; |
| 567 | default: |
| 568 | continue; |
| 569 | } |
| 570 | break; |
| 571 | } |
| 572 | |
| 573 | if (c == '!' || c == ':') { |
| 574 | /* we have a format specifier and/or a conversion */ |
| 575 | /* don't include the last character */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 576 | field_name->end = str->start-1; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 577 | |
| 578 | /* the format specifier is the rest of the string */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 579 | format_spec->str = str->str; |
| 580 | format_spec->start = str->start; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 581 | format_spec->end = str->end; |
| 582 | |
| 583 | /* see if there's a conversion specifier */ |
| 584 | if (c == '!') { |
| 585 | /* there must be another character present */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 586 | if (format_spec->start >= format_spec->end) { |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 587 | PyErr_SetString(PyExc_ValueError, |
| 588 | "end of format while looking for conversion " |
| 589 | "specifier"); |
| 590 | return 0; |
| 591 | } |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 592 | *conversion = PyUnicode_READ_CHAR(format_spec->str, format_spec->start++); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 593 | |
| 594 | /* if there is another character, it must be a colon */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 595 | if (format_spec->start < format_spec->end) { |
| 596 | c = PyUnicode_READ_CHAR(format_spec->str, format_spec->start++); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 597 | if (c != ':') { |
| 598 | PyErr_SetString(PyExc_ValueError, |
| 599 | "expected ':' after format specifier"); |
| 600 | return 0; |
| 601 | } |
| 602 | } |
| 603 | } |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 604 | } |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 605 | else |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 606 | /* end of string, there's no format_spec or conversion */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 607 | field_name->end = str->start; |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 608 | |
| 609 | return 1; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 610 | } |
| 611 | |
| 612 | /************************************************************************/ |
| 613 | /******* Output string allocation and escape-to-markup processing ******/ |
| 614 | /************************************************************************/ |
| 615 | |
| 616 | /* MarkupIterator breaks the string into pieces of either literal |
| 617 | text, or things inside {} that need to be marked up. it is |
| 618 | designed to make it easy to wrap a Python iterator around it, for |
| 619 | use with the Formatter class */ |
| 620 | |
| 621 | typedef struct { |
| 622 | SubString str; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 623 | } MarkupIterator; |
| 624 | |
| 625 | static int |
Victor Stinner | 7931d9a | 2011-11-04 00:22:48 +0100 | [diff] [blame] | 626 | MarkupIterator_init(MarkupIterator *self, PyObject *str, |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 627 | Py_ssize_t start, Py_ssize_t end) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 628 | { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 629 | SubString_init(&self->str, str, start, end); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 630 | return 1; |
| 631 | } |
| 632 | |
| 633 | /* returns 0 on error, 1 on non-error termination, and 2 if it got a |
| 634 | string (or something to be expanded) */ |
| 635 | static int |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 636 | MarkupIterator_next(MarkupIterator *self, SubString *literal, |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 637 | int *field_present, SubString *field_name, |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 638 | SubString *format_spec, Py_UCS4 *conversion, |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 639 | int *format_spec_needs_expanding) |
| 640 | { |
| 641 | int at_end; |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 642 | Py_UCS4 c = 0; |
| 643 | Py_ssize_t start; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 644 | int count; |
| 645 | Py_ssize_t len; |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 646 | int markup_follows = 0; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 647 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 648 | /* initialize all of the output variables */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 649 | SubString_init(literal, NULL, 0, 0); |
| 650 | SubString_init(field_name, NULL, 0, 0); |
| 651 | SubString_init(format_spec, NULL, 0, 0); |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 652 | *conversion = '\0'; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 653 | *format_spec_needs_expanding = 0; |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 654 | *field_present = 0; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 655 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 656 | /* No more input, end of iterator. This is the normal exit |
| 657 | path. */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 658 | if (self->str.start >= self->str.end) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 659 | return 1; |
| 660 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 661 | start = self->str.start; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 662 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 663 | /* First read any literal text. Read until the end of string, an |
| 664 | escaped '{' or '}', or an unescaped '{'. In order to never |
| 665 | allocate memory and so I can just pass pointers around, if |
| 666 | there's an escaped '{' or '}' then we'll return the literal |
| 667 | including the brace, but no format object. The next time |
| 668 | through, we'll return the rest of the literal, skipping past |
| 669 | the second consecutive brace. */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 670 | while (self->str.start < self->str.end) { |
| 671 | switch (c = PyUnicode_READ_CHAR(self->str.str, self->str.start++)) { |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 672 | case '{': |
| 673 | case '}': |
| 674 | markup_follows = 1; |
| 675 | break; |
| 676 | default: |
| 677 | continue; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 678 | } |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 679 | break; |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 680 | } |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 681 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 682 | at_end = self->str.start >= self->str.end; |
| 683 | len = self->str.start - start; |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 684 | |
Victor Stinner | 7931d9a | 2011-11-04 00:22:48 +0100 | [diff] [blame] | 685 | if ((c == '}') && (at_end || |
| 686 | (c != PyUnicode_READ_CHAR(self->str.str, |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 687 | self->str.start)))) { |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 688 | PyErr_SetString(PyExc_ValueError, "Single '}' encountered " |
| 689 | "in format string"); |
| 690 | return 0; |
| 691 | } |
| 692 | if (at_end && c == '{') { |
| 693 | PyErr_SetString(PyExc_ValueError, "Single '{' encountered " |
| 694 | "in format string"); |
| 695 | return 0; |
| 696 | } |
| 697 | if (!at_end) { |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 698 | if (c == PyUnicode_READ_CHAR(self->str.str, self->str.start)) { |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 699 | /* escaped } or {, skip it in the input. there is no |
| 700 | markup object following us, just this literal text */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 701 | self->str.start++; |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 702 | markup_follows = 0; |
| 703 | } |
| 704 | else |
| 705 | len--; |
| 706 | } |
| 707 | |
| 708 | /* record the literal text */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 709 | literal->str = self->str.str; |
| 710 | literal->start = start; |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 711 | literal->end = start + len; |
| 712 | |
| 713 | if (!markup_follows) |
| 714 | return 2; |
| 715 | |
| 716 | /* this is markup, find the end of the string by counting nested |
| 717 | braces. note that this prohibits escaped braces, so that |
| 718 | format_specs cannot have braces in them. */ |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 719 | *field_present = 1; |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 720 | count = 1; |
| 721 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 722 | start = self->str.start; |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 723 | |
| 724 | /* we know we can't have a zero length string, so don't worry |
| 725 | about that case */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 726 | while (self->str.start < self->str.end) { |
| 727 | switch (c = PyUnicode_READ_CHAR(self->str.str, self->str.start++)) { |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 728 | case '{': |
| 729 | /* the format spec needs to be recursively expanded. |
| 730 | this is an optimization, and not strictly needed */ |
| 731 | *format_spec_needs_expanding = 1; |
| 732 | count++; |
| 733 | break; |
| 734 | case '}': |
| 735 | count--; |
| 736 | if (count <= 0) { |
| 737 | /* we're done. parse and get out */ |
| 738 | SubString s; |
| 739 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 740 | SubString_init(&s, self->str.str, start, self->str.start - 1); |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 741 | if (parse_field(&s, field_name, format_spec, conversion) == 0) |
| 742 | return 0; |
| 743 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 744 | /* success */ |
| 745 | return 2; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 746 | } |
| 747 | break; |
| 748 | } |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 749 | } |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 750 | |
| 751 | /* end of string while searching for matching '}' */ |
| 752 | PyErr_SetString(PyExc_ValueError, "unmatched '{' in format"); |
| 753 | return 0; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 754 | } |
| 755 | |
| 756 | |
| 757 | /* do the !r or !s conversion on obj */ |
| 758 | static PyObject * |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 759 | do_conversion(PyObject *obj, Py_UCS4 conversion) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 760 | { |
| 761 | /* XXX in pre-3.0, do we need to convert this to unicode, since it |
| 762 | might have returned a string? */ |
| 763 | switch (conversion) { |
| 764 | case 'r': |
| 765 | return PyObject_Repr(obj); |
| 766 | case 's': |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 767 | return PyObject_Str(obj); |
Georg Brandl | 559e5d7 | 2008-06-11 18:37:52 +0000 | [diff] [blame] | 768 | case 'a': |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 769 | return PyObject_ASCII(obj); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 770 | default: |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 771 | if (conversion > 32 && conversion < 127) { |
| 772 | /* It's the ASCII subrange; casting to char is safe |
| 773 | (assuming the execution character set is an ASCII |
| 774 | superset). */ |
| 775 | PyErr_Format(PyExc_ValueError, |
Martin v. Löwis | 5a6f458 | 2008-04-07 03:22:07 +0000 | [diff] [blame] | 776 | "Unknown conversion specifier %c", |
| 777 | (char)conversion); |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 778 | } else |
| 779 | PyErr_Format(PyExc_ValueError, |
| 780 | "Unknown conversion specifier \\x%x", |
| 781 | (unsigned int)conversion); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 782 | return NULL; |
| 783 | } |
| 784 | } |
| 785 | |
| 786 | /* given: |
| 787 | |
| 788 | {field_name!conversion:format_spec} |
| 789 | |
| 790 | compute the result and write it to output. |
| 791 | format_spec_needs_expanding is an optimization. if it's false, |
| 792 | just output the string directly, otherwise recursively expand the |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 793 | format_spec string. |
| 794 | |
| 795 | field_name is allowed to be zero length, in which case we |
| 796 | are doing auto field numbering. |
| 797 | */ |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 798 | |
| 799 | static int |
| 800 | output_markup(SubString *field_name, SubString *format_spec, |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 801 | int format_spec_needs_expanding, Py_UCS4 conversion, |
Victor Stinner | 3b1a74a | 2012-05-09 22:25:00 +0200 | [diff] [blame] | 802 | _PyUnicodeWriter *writer, PyObject *args, PyObject *kwargs, |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 803 | int recursion_depth, AutoNumber *auto_number) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 804 | { |
| 805 | PyObject *tmp = NULL; |
| 806 | PyObject *fieldobj = NULL; |
| 807 | SubString expanded_format_spec; |
| 808 | SubString *actual_format_spec; |
| 809 | int result = 0; |
| 810 | |
| 811 | /* convert field_name to an object */ |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 812 | fieldobj = get_field_object(field_name, args, kwargs, auto_number); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 813 | if (fieldobj == NULL) |
| 814 | goto done; |
| 815 | |
| 816 | if (conversion != '\0') { |
| 817 | tmp = do_conversion(fieldobj, conversion); |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 818 | if (tmp == NULL || PyUnicode_READY(tmp) == -1) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 819 | goto done; |
| 820 | |
| 821 | /* do the assignment, transferring ownership: fieldobj = tmp */ |
| 822 | Py_DECREF(fieldobj); |
| 823 | fieldobj = tmp; |
| 824 | tmp = NULL; |
| 825 | } |
| 826 | |
| 827 | /* if needed, recurively compute the format_spec */ |
| 828 | if (format_spec_needs_expanding) { |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 829 | tmp = build_string(format_spec, args, kwargs, recursion_depth-1, |
| 830 | auto_number); |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 831 | if (tmp == NULL || PyUnicode_READY(tmp) == -1) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 832 | goto done; |
| 833 | |
| 834 | /* note that in the case we're expanding the format string, |
| 835 | tmp must be kept around until after the call to |
| 836 | render_field. */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 837 | SubString_init(&expanded_format_spec, tmp, 0, PyUnicode_GET_LENGTH(tmp)); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 838 | actual_format_spec = &expanded_format_spec; |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 839 | } |
| 840 | else |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 841 | actual_format_spec = format_spec; |
| 842 | |
Victor Stinner | 202fdca | 2012-05-07 12:47:02 +0200 | [diff] [blame] | 843 | if (render_field(fieldobj, actual_format_spec, writer) == 0) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 844 | goto done; |
| 845 | |
| 846 | result = 1; |
| 847 | |
| 848 | done: |
| 849 | Py_XDECREF(fieldobj); |
| 850 | Py_XDECREF(tmp); |
| 851 | |
| 852 | return result; |
| 853 | } |
| 854 | |
| 855 | /* |
Eric Smith | 8fd3eba | 2008-02-17 19:48:00 +0000 | [diff] [blame] | 856 | do_markup is the top-level loop for the format() method. It |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 857 | searches through the format string for escapes to markup codes, and |
| 858 | calls other functions to move non-markup text to the output, |
| 859 | and to perform the markup to the output. |
| 860 | */ |
| 861 | static int |
| 862 | do_markup(SubString *input, PyObject *args, PyObject *kwargs, |
Victor Stinner | 3b1a74a | 2012-05-09 22:25:00 +0200 | [diff] [blame] | 863 | _PyUnicodeWriter *writer, int recursion_depth, AutoNumber *auto_number) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 864 | { |
| 865 | MarkupIterator iter; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 866 | int format_spec_needs_expanding; |
| 867 | int result; |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 868 | int field_present; |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 869 | SubString literal; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 870 | SubString field_name; |
| 871 | SubString format_spec; |
Victor Stinner | ee4544c | 2012-05-09 22:24:08 +0200 | [diff] [blame] | 872 | Py_UCS4 conversion, maxchar; |
| 873 | Py_ssize_t sublen; |
Victor Stinner | 202fdca | 2012-05-07 12:47:02 +0200 | [diff] [blame] | 874 | int err; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 875 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 876 | MarkupIterator_init(&iter, input->str, input->start, input->end); |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 877 | while ((result = MarkupIterator_next(&iter, &literal, &field_present, |
| 878 | &field_name, &format_spec, |
| 879 | &conversion, |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 880 | &format_spec_needs_expanding)) == 2) { |
Victor Stinner | ee4544c | 2012-05-09 22:24:08 +0200 | [diff] [blame] | 881 | sublen = literal.end - literal.start; |
| 882 | if (sublen) { |
| 883 | maxchar = _PyUnicode_FindMaxChar(literal.str, |
| 884 | literal.start, literal.end); |
Victor Stinner | 3b1a74a | 2012-05-09 22:25:00 +0200 | [diff] [blame] | 885 | err = _PyUnicodeWriter_Prepare(writer, sublen, maxchar); |
Victor Stinner | ee4544c | 2012-05-09 22:24:08 +0200 | [diff] [blame] | 886 | if (err == -1) |
| 887 | return 0; |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 888 | _PyUnicode_FastCopyCharacters(writer->buffer, writer->pos, |
| 889 | literal.str, literal.start, sublen); |
Victor Stinner | ee4544c | 2012-05-09 22:24:08 +0200 | [diff] [blame] | 890 | writer->pos += sublen; |
| 891 | } |
| 892 | |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 893 | if (field_present) { |
| 894 | if (iter.str.start == iter.str.end) |
Victor Stinner | d7b7c74 | 2012-06-04 22:52:12 +0200 | [diff] [blame] | 895 | writer->overallocate = 0; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 896 | if (!output_markup(&field_name, &format_spec, |
Victor Stinner | 202fdca | 2012-05-07 12:47:02 +0200 | [diff] [blame] | 897 | format_spec_needs_expanding, conversion, writer, |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 898 | args, kwargs, recursion_depth, auto_number)) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 899 | return 0; |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 900 | } |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 901 | } |
| 902 | return result; |
| 903 | } |
| 904 | |
| 905 | |
| 906 | /* |
| 907 | build_string allocates the output string and then |
| 908 | calls do_markup to do the heavy lifting. |
| 909 | */ |
| 910 | static PyObject * |
| 911 | build_string(SubString *input, PyObject *args, PyObject *kwargs, |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 912 | int recursion_depth, AutoNumber *auto_number) |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 913 | { |
Victor Stinner | 3b1a74a | 2012-05-09 22:25:00 +0200 | [diff] [blame] | 914 | _PyUnicodeWriter writer; |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 915 | Py_ssize_t minlen; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 916 | |
| 917 | /* check the recursion level */ |
Eric Smith | 45c0787 | 2007-09-05 02:02:43 +0000 | [diff] [blame] | 918 | if (recursion_depth <= 0) { |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 919 | PyErr_SetString(PyExc_ValueError, |
| 920 | "Max string recursion exceeded"); |
Antoine Pitrou | 4574e62 | 2011-10-07 02:26:47 +0200 | [diff] [blame] | 921 | return NULL; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 922 | } |
| 923 | |
Victor Stinner | d3f0882 | 2012-05-29 12:57:52 +0200 | [diff] [blame] | 924 | minlen = PyUnicode_GET_LENGTH(input->str) + 100; |
| 925 | _PyUnicodeWriter_Init(&writer, minlen); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 926 | |
Victor Stinner | 202fdca | 2012-05-07 12:47:02 +0200 | [diff] [blame] | 927 | if (!do_markup(input, args, kwargs, &writer, recursion_depth, |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 928 | auto_number)) { |
Victor Stinner | 3b1a74a | 2012-05-09 22:25:00 +0200 | [diff] [blame] | 929 | _PyUnicodeWriter_Dealloc(&writer); |
Antoine Pitrou | 4574e62 | 2011-10-07 02:26:47 +0200 | [diff] [blame] | 930 | return NULL; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 931 | } |
| 932 | |
Victor Stinner | 3b1a74a | 2012-05-09 22:25:00 +0200 | [diff] [blame] | 933 | return _PyUnicodeWriter_Finish(&writer); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 934 | } |
| 935 | |
| 936 | /************************************************************************/ |
| 937 | /*********** main routine ***********************************************/ |
| 938 | /************************************************************************/ |
| 939 | |
| 940 | /* this is the main entry point */ |
| 941 | static PyObject * |
| 942 | do_string_format(PyObject *self, PyObject *args, PyObject *kwargs) |
| 943 | { |
| 944 | SubString input; |
| 945 | |
| 946 | /* PEP 3101 says only 2 levels, so that |
| 947 | "{0:{1}}".format('abc', 's') # works |
| 948 | "{0:{1:{2}}}".format('abc', 's', '') # fails |
| 949 | */ |
Eric Smith | 45c0787 | 2007-09-05 02:02:43 +0000 | [diff] [blame] | 950 | int recursion_depth = 2; |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 951 | |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 952 | AutoNumber auto_number; |
| 953 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 954 | if (PyUnicode_READY(self) == -1) |
| 955 | return NULL; |
| 956 | |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 957 | AutoNumber_Init(&auto_number); |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 958 | SubString_init(&input, self, 0, PyUnicode_GET_LENGTH(self)); |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 959 | return build_string(&input, args, kwargs, recursion_depth, &auto_number); |
Eric Smith | 8c66326 | 2007-08-25 02:26:07 +0000 | [diff] [blame] | 960 | } |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 961 | |
Eric Smith | 27bbca6 | 2010-11-04 17:06:58 +0000 | [diff] [blame] | 962 | static PyObject * |
| 963 | do_string_format_map(PyObject *self, PyObject *obj) |
| 964 | { |
| 965 | return do_string_format(self, NULL, obj); |
| 966 | } |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 967 | |
| 968 | |
| 969 | /************************************************************************/ |
| 970 | /*********** formatteriterator ******************************************/ |
| 971 | /************************************************************************/ |
| 972 | |
| 973 | /* This is used to implement string.Formatter.vparse(). It exists so |
| 974 | Formatter can share code with the built in unicode.format() method. |
| 975 | It's really just a wrapper around MarkupIterator that is callable |
| 976 | from Python. */ |
| 977 | |
| 978 | typedef struct { |
| 979 | PyObject_HEAD |
Victor Stinner | 7931d9a | 2011-11-04 00:22:48 +0100 | [diff] [blame] | 980 | PyObject *str; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 981 | MarkupIterator it_markup; |
| 982 | } formatteriterobject; |
| 983 | |
| 984 | static void |
| 985 | formatteriter_dealloc(formatteriterobject *it) |
| 986 | { |
| 987 | Py_XDECREF(it->str); |
| 988 | PyObject_FREE(it); |
| 989 | } |
| 990 | |
| 991 | /* returns a tuple: |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 992 | (literal, field_name, format_spec, conversion) |
| 993 | |
| 994 | literal is any literal text to output. might be zero length |
| 995 | field_name is the string before the ':'. might be None |
| 996 | format_spec is the string after the ':'. mibht be None |
| 997 | conversion is either None, or the string after the '!' |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 998 | */ |
| 999 | static PyObject * |
| 1000 | formatteriter_next(formatteriterobject *it) |
| 1001 | { |
| 1002 | SubString literal; |
| 1003 | SubString field_name; |
| 1004 | SubString format_spec; |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1005 | Py_UCS4 conversion; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1006 | int format_spec_needs_expanding; |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 1007 | int field_present; |
| 1008 | int result = MarkupIterator_next(&it->it_markup, &literal, &field_present, |
| 1009 | &field_name, &format_spec, &conversion, |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1010 | &format_spec_needs_expanding); |
| 1011 | |
| 1012 | /* all of the SubString objects point into it->str, so no |
| 1013 | memory management needs to be done on them */ |
| 1014 | assert(0 <= result && result <= 2); |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 1015 | if (result == 0 || result == 1) |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1016 | /* if 0, error has already been set, if 1, iterator is empty */ |
| 1017 | return NULL; |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 1018 | else { |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1019 | PyObject *literal_str = NULL; |
| 1020 | PyObject *field_name_str = NULL; |
| 1021 | PyObject *format_spec_str = NULL; |
| 1022 | PyObject *conversion_str = NULL; |
| 1023 | PyObject *tuple = NULL; |
| 1024 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1025 | literal_str = SubString_new_object(&literal); |
| 1026 | if (literal_str == NULL) |
| 1027 | goto done; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1028 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1029 | field_name_str = SubString_new_object(&field_name); |
| 1030 | if (field_name_str == NULL) |
| 1031 | goto done; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1032 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1033 | /* if field_name is non-zero length, return a string for |
| 1034 | format_spec (even if zero length), else return None */ |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 1035 | format_spec_str = (field_present ? |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1036 | SubString_new_object_or_empty : |
| 1037 | SubString_new_object)(&format_spec); |
| 1038 | if (format_spec_str == NULL) |
| 1039 | goto done; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1040 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1041 | /* if the conversion is not specified, return a None, |
| 1042 | otherwise create a one length string with the conversion |
| 1043 | character */ |
| 1044 | if (conversion == '\0') { |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1045 | conversion_str = Py_None; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1046 | Py_INCREF(conversion_str); |
| 1047 | } |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1048 | else |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1049 | conversion_str = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, |
| 1050 | &conversion, 1); |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1051 | if (conversion_str == NULL) |
| 1052 | goto done; |
| 1053 | |
Eric Smith | 9e7c8da | 2007-08-28 11:15:20 +0000 | [diff] [blame] | 1054 | tuple = PyTuple_Pack(4, literal_str, field_name_str, format_spec_str, |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1055 | conversion_str); |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1056 | done: |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1057 | Py_XDECREF(literal_str); |
| 1058 | Py_XDECREF(field_name_str); |
| 1059 | Py_XDECREF(format_spec_str); |
| 1060 | Py_XDECREF(conversion_str); |
| 1061 | return tuple; |
| 1062 | } |
| 1063 | } |
| 1064 | |
| 1065 | static PyMethodDef formatteriter_methods[] = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1066 | {NULL, NULL} /* sentinel */ |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1067 | }; |
| 1068 | |
Eric Smith | 8fd3eba | 2008-02-17 19:48:00 +0000 | [diff] [blame] | 1069 | static PyTypeObject PyFormatterIter_Type = { |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1070 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1071 | "formatteriterator", /* tp_name */ |
| 1072 | sizeof(formatteriterobject), /* tp_basicsize */ |
| 1073 | 0, /* tp_itemsize */ |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1074 | /* methods */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1075 | (destructor)formatteriter_dealloc, /* tp_dealloc */ |
| 1076 | 0, /* tp_print */ |
| 1077 | 0, /* tp_getattr */ |
| 1078 | 0, /* tp_setattr */ |
| 1079 | 0, /* tp_reserved */ |
| 1080 | 0, /* tp_repr */ |
| 1081 | 0, /* tp_as_number */ |
| 1082 | 0, /* tp_as_sequence */ |
| 1083 | 0, /* tp_as_mapping */ |
| 1084 | 0, /* tp_hash */ |
| 1085 | 0, /* tp_call */ |
| 1086 | 0, /* tp_str */ |
| 1087 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 1088 | 0, /* tp_setattro */ |
| 1089 | 0, /* tp_as_buffer */ |
| 1090 | Py_TPFLAGS_DEFAULT, /* tp_flags */ |
| 1091 | 0, /* tp_doc */ |
| 1092 | 0, /* tp_traverse */ |
| 1093 | 0, /* tp_clear */ |
| 1094 | 0, /* tp_richcompare */ |
| 1095 | 0, /* tp_weaklistoffset */ |
| 1096 | PyObject_SelfIter, /* tp_iter */ |
| 1097 | (iternextfunc)formatteriter_next, /* tp_iternext */ |
| 1098 | formatteriter_methods, /* tp_methods */ |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1099 | 0, |
| 1100 | }; |
| 1101 | |
| 1102 | /* unicode_formatter_parser is used to implement |
| 1103 | string.Formatter.vformat. it parses a string and returns tuples |
| 1104 | describing the parsed elements. It's a wrapper around |
| 1105 | stringlib/string_format.h's MarkupIterator */ |
| 1106 | static PyObject * |
Victor Stinner | 7931d9a | 2011-11-04 00:22:48 +0100 | [diff] [blame] | 1107 | formatter_parser(PyObject *ignored, PyObject *self) |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1108 | { |
| 1109 | formatteriterobject *it; |
| 1110 | |
Eric Smith | a1eac72 | 2011-01-29 11:15:35 +0000 | [diff] [blame] | 1111 | if (!PyUnicode_Check(self)) { |
| 1112 | PyErr_Format(PyExc_TypeError, "expected str, got %s", Py_TYPE(self)->tp_name); |
| 1113 | return NULL; |
| 1114 | } |
| 1115 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1116 | if (PyUnicode_READY(self) == -1) |
| 1117 | return NULL; |
| 1118 | |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1119 | it = PyObject_New(formatteriterobject, &PyFormatterIter_Type); |
| 1120 | if (it == NULL) |
| 1121 | return NULL; |
| 1122 | |
| 1123 | /* take ownership, give the object to the iterator */ |
| 1124 | Py_INCREF(self); |
| 1125 | it->str = self; |
| 1126 | |
| 1127 | /* initialize the contained MarkupIterator */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1128 | MarkupIterator_init(&it->it_markup, (PyObject*)self, 0, PyUnicode_GET_LENGTH(self)); |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1129 | return (PyObject *)it; |
| 1130 | } |
| 1131 | |
| 1132 | |
| 1133 | /************************************************************************/ |
| 1134 | /*********** fieldnameiterator ******************************************/ |
| 1135 | /************************************************************************/ |
| 1136 | |
| 1137 | |
| 1138 | /* This is used to implement string.Formatter.vparse(). It parses the |
| 1139 | field name into attribute and item values. It's a Python-callable |
| 1140 | wrapper around FieldNameIterator */ |
| 1141 | |
| 1142 | typedef struct { |
| 1143 | PyObject_HEAD |
Victor Stinner | 7931d9a | 2011-11-04 00:22:48 +0100 | [diff] [blame] | 1144 | PyObject *str; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1145 | FieldNameIterator it_field; |
| 1146 | } fieldnameiterobject; |
| 1147 | |
| 1148 | static void |
| 1149 | fieldnameiter_dealloc(fieldnameiterobject *it) |
| 1150 | { |
| 1151 | Py_XDECREF(it->str); |
| 1152 | PyObject_FREE(it); |
| 1153 | } |
| 1154 | |
| 1155 | /* returns a tuple: |
| 1156 | (is_attr, value) |
| 1157 | is_attr is true if we used attribute syntax (e.g., '.foo') |
| 1158 | false if we used index syntax (e.g., '[foo]') |
| 1159 | value is an integer or string |
| 1160 | */ |
| 1161 | static PyObject * |
| 1162 | fieldnameiter_next(fieldnameiterobject *it) |
| 1163 | { |
| 1164 | int result; |
| 1165 | int is_attr; |
| 1166 | Py_ssize_t idx; |
| 1167 | SubString name; |
| 1168 | |
| 1169 | result = FieldNameIterator_next(&it->it_field, &is_attr, |
| 1170 | &idx, &name); |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 1171 | if (result == 0 || result == 1) |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1172 | /* if 0, error has already been set, if 1, iterator is empty */ |
| 1173 | return NULL; |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 1174 | else { |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1175 | PyObject* result = NULL; |
| 1176 | PyObject* is_attr_obj = NULL; |
| 1177 | PyObject* obj = NULL; |
| 1178 | |
| 1179 | is_attr_obj = PyBool_FromLong(is_attr); |
| 1180 | if (is_attr_obj == NULL) |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1181 | goto done; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1182 | |
| 1183 | /* either an integer or a string */ |
| 1184 | if (idx != -1) |
Christian Heimes | 217cfd1 | 2007-12-02 14:31:20 +0000 | [diff] [blame] | 1185 | obj = PyLong_FromSsize_t(idx); |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1186 | else |
| 1187 | obj = SubString_new_object(&name); |
| 1188 | if (obj == NULL) |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1189 | goto done; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1190 | |
| 1191 | /* return a tuple of values */ |
| 1192 | result = PyTuple_Pack(2, is_attr_obj, obj); |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1193 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1194 | done: |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1195 | Py_XDECREF(is_attr_obj); |
| 1196 | Py_XDECREF(obj); |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1197 | return result; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1198 | } |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1199 | } |
| 1200 | |
| 1201 | static PyMethodDef fieldnameiter_methods[] = { |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1202 | {NULL, NULL} /* sentinel */ |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1203 | }; |
| 1204 | |
| 1205 | static PyTypeObject PyFieldNameIter_Type = { |
| 1206 | PyVarObject_HEAD_INIT(&PyType_Type, 0) |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1207 | "fieldnameiterator", /* tp_name */ |
| 1208 | sizeof(fieldnameiterobject), /* tp_basicsize */ |
| 1209 | 0, /* tp_itemsize */ |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1210 | /* methods */ |
Antoine Pitrou | f95a1b3 | 2010-05-09 15:52:27 +0000 | [diff] [blame] | 1211 | (destructor)fieldnameiter_dealloc, /* tp_dealloc */ |
| 1212 | 0, /* tp_print */ |
| 1213 | 0, /* tp_getattr */ |
| 1214 | 0, /* tp_setattr */ |
| 1215 | 0, /* tp_reserved */ |
| 1216 | 0, /* tp_repr */ |
| 1217 | 0, /* tp_as_number */ |
| 1218 | 0, /* tp_as_sequence */ |
| 1219 | 0, /* tp_as_mapping */ |
| 1220 | 0, /* tp_hash */ |
| 1221 | 0, /* tp_call */ |
| 1222 | 0, /* tp_str */ |
| 1223 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 1224 | 0, /* tp_setattro */ |
| 1225 | 0, /* tp_as_buffer */ |
| 1226 | Py_TPFLAGS_DEFAULT, /* tp_flags */ |
| 1227 | 0, /* tp_doc */ |
| 1228 | 0, /* tp_traverse */ |
| 1229 | 0, /* tp_clear */ |
| 1230 | 0, /* tp_richcompare */ |
| 1231 | 0, /* tp_weaklistoffset */ |
| 1232 | PyObject_SelfIter, /* tp_iter */ |
| 1233 | (iternextfunc)fieldnameiter_next, /* tp_iternext */ |
| 1234 | fieldnameiter_methods, /* tp_methods */ |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1235 | 0}; |
| 1236 | |
| 1237 | /* unicode_formatter_field_name_split is used to implement |
| 1238 | string.Formatter.vformat. it takes an PEP 3101 "field name", and |
| 1239 | returns a tuple of (first, rest): "first", the part before the |
| 1240 | first '.' or '['; and "rest", an iterator for the rest of the field |
| 1241 | name. it's a wrapper around stringlib/string_format.h's |
| 1242 | field_name_split. The iterator it returns is a |
| 1243 | FieldNameIterator */ |
| 1244 | static PyObject * |
Victor Stinner | 7931d9a | 2011-11-04 00:22:48 +0100 | [diff] [blame] | 1245 | formatter_field_name_split(PyObject *ignored, PyObject *self) |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1246 | { |
| 1247 | SubString first; |
| 1248 | Py_ssize_t first_idx; |
| 1249 | fieldnameiterobject *it; |
| 1250 | |
| 1251 | PyObject *first_obj = NULL; |
| 1252 | PyObject *result = NULL; |
| 1253 | |
Eric Smith | a1eac72 | 2011-01-29 11:15:35 +0000 | [diff] [blame] | 1254 | if (!PyUnicode_Check(self)) { |
| 1255 | PyErr_Format(PyExc_TypeError, "expected str, got %s", Py_TYPE(self)->tp_name); |
| 1256 | return NULL; |
| 1257 | } |
| 1258 | |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1259 | if (PyUnicode_READY(self) == -1) |
| 1260 | return NULL; |
| 1261 | |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1262 | it = PyObject_New(fieldnameiterobject, &PyFieldNameIter_Type); |
| 1263 | if (it == NULL) |
| 1264 | return NULL; |
| 1265 | |
| 1266 | /* take ownership, give the object to the iterator. this is |
| 1267 | just to keep the field_name alive */ |
| 1268 | Py_INCREF(self); |
| 1269 | it->str = self; |
| 1270 | |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 1271 | /* Pass in auto_number = NULL. We'll return an empty string for |
| 1272 | first_obj in that case. */ |
Martin v. Löwis | d63a3b8 | 2011-09-28 07:41:54 +0200 | [diff] [blame] | 1273 | if (!field_name_split((PyObject*)self, 0, PyUnicode_GET_LENGTH(self), |
Eric Smith | 8ec9044 | 2009-03-14 12:29:34 +0000 | [diff] [blame] | 1274 | &first, &first_idx, &it->it_field, NULL)) |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1275 | goto done; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1276 | |
Eric Smith | 0cb431c | 2007-08-28 01:07:27 +0000 | [diff] [blame] | 1277 | /* first becomes an integer, if possible; else a string */ |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1278 | if (first_idx != -1) |
Christian Heimes | 217cfd1 | 2007-12-02 14:31:20 +0000 | [diff] [blame] | 1279 | first_obj = PyLong_FromSsize_t(first_idx); |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1280 | else |
| 1281 | /* convert "first" into a string object */ |
| 1282 | first_obj = SubString_new_object(&first); |
| 1283 | if (first_obj == NULL) |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1284 | goto done; |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1285 | |
| 1286 | /* return a tuple of values */ |
| 1287 | result = PyTuple_Pack(2, first_obj, it); |
| 1288 | |
Eric Smith | 625cbf2 | 2007-08-29 03:22:59 +0000 | [diff] [blame] | 1289 | done: |
Eric Smith | f6db409 | 2007-08-27 23:52:26 +0000 | [diff] [blame] | 1290 | Py_XDECREF(it); |
| 1291 | Py_XDECREF(first_obj); |
| 1292 | return result; |
| 1293 | } |