cpython-lru_cache-weakref: Objects/stringlib/string

annotate Objects/stringlib/string_format.h @ 80661:94de77bd0b4b 2.7

Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file.

author	Andrew Svetlov <andrew.svetlov@gmail.com>
date	Thu, 29 Nov 2012 19:51:28 +0200
parents	21fb1767e185
children

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

Mercurial > cpython-lru_cache-weakref

annotate Objects/stringlib/string_format.h @ 80661:94de77bd0b4b 2.7