cpython-lru_cache-weakref: Objects/stringobject.c annotate

annotate Objects/stringobject.c @ 47787:b32101c19bf8 legacy-trunk

Grammar fixes

author	Andrew M. Kuchling <amk@amk.ca>
date	Fri, 20 Jun 2008 23:14:32 +0000
parents	e7a9eab363ad
children	f283e3b5f917

rev	line source
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1 /* String (str/bytes) object implementation */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
37702 9b22d8b7bcaa Make Py_BuildValue, PyObject_CallFunction and Martin v. Löwis <martin@v.loewis.de> parents: 37678 diff changeset	3 #define PY_SSIZE_T_CLEAN
38376 a16948e9915e needforspeed: use Py_LOCAL on a few more locals in stringobject.c Fredrik Lundh <fredrik@pythonware.com> parents: 38372 diff changeset	4
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	5 #include "Python.h"
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	6 #include <ctype.h>
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	7
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	8 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	9 int null_strings, one_strings;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	10 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	11
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	12 static PyStringObject *characters[UCHAR_MAX + 1];
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	13 static PyStringObject *nullstring;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	14
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	15 /* This dictionary holds all interned strings. Note that references to
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	16 strings in this dictionary are not counted in the string's ob_refcnt.
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	17 When the interned string reaches a refcnt of 0 the string deallocation
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	18 function will delete the reference from this dictionary.
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	19
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	20 Another way to look at this is that to say that the actual reference
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	21 count of a string is: s->ob_refcnt + (s->ob_sstate?2:0)
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	22 */
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	23 static PyObject *interned;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	24
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	25 /*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	26 For both PyString_FromString() and PyString_FromStringAndSize(), the
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	27 parameter `size' denotes number of characters to allocate, not counting any
21737 30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	28 null terminating character.
30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	29
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	30 For PyString_FromString(), the parameter `str' points to a null-terminated
21737 30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	31 string containing exactly `size' bytes.
30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	32
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	33 For PyString_FromStringAndSize(), the parameter the parameter `str' is
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	34 either NULL or else points to a string containing at least `size' bytes.
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	35 For PyString_FromStringAndSize(), the string in the `str' parameter does
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	36 not have to be null-terminated. (Therefore it is safe to construct a
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	37 substring by calling `PyString_FromStringAndSize(origstring, substrlen)'.)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	38 If `str' is NULL then PyString_FromStringAndSize() will allocate `size+1'
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	39 bytes (setting the last byte to the null terminating character) and you can
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	40 fill in the data yourself. If `str' is non-NULL then the resulting
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	41 PyString object must be treated as immutable and you must not fill in nor
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	42 alter the data yourself, since the strings may be shared.
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	43
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	44 The PyObject member `op->ob_size', which denotes the number of "extra
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	45 items" in a variable-size object, will contain the number of bytes
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	46 allocated for string data, not counting the null terminating character. It
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	47 is therefore equal to the equal to the `size' parameter (for
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	48 PyString_FromStringAndSize()) or the length of the string in the `str'
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	49 parameter (for PyString_FromString()).
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	50 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	51 PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	52 PyString_FromStringAndSize(const char *str, Py_ssize_t size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	53 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	54 register PyStringObject *op;
46383 0b55875c1c9c Raise SystemError when size < 0 is passed into PyString_FromStringAndSize, Gregory P. Smith <greg@mad-scientist.com> parents: 46107 diff changeset	55 if (size < 0) {
0b55875c1c9c Raise SystemError when size < 0 is passed into PyString_FromStringAndSize, Gregory P. Smith <greg@mad-scientist.com> parents: 46107 diff changeset	56 PyErr_SetString(PyExc_SystemError,
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	57 "Negative size passed to PyString_FromStringAndSize");
46383 0b55875c1c9c Raise SystemError when size < 0 is passed into PyString_FromStringAndSize, Gregory P. Smith <greg@mad-scientist.com> parents: 46107 diff changeset	58 return NULL;
0b55875c1c9c Raise SystemError when size < 0 is passed into PyString_FromStringAndSize, Gregory P. Smith <greg@mad-scientist.com> parents: 46107 diff changeset	59 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	60 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	61 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	62 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	63 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	64 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	65 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	66 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	67 if (size == 1 && str != NULL &&
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	68 (op = characters[*str & UCHAR_MAX]) != NULL)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	69 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	70 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	71 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	72 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	73 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	74 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	75 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	76
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 24872 diff changeset	77 /* Inline PyObject_NewVar */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	78 op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	79 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	80 return PyErr_NoMemory();
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	81 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	82 op->ob_shash = -1;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	83 op->ob_sstate = SSTATE_NOT_INTERNED;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	84 if (str != NULL)
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	85 Py_MEMCPY(op->ob_sval, str, size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	86 op->ob_sval[size] = '\0';
22689 614167df2096 Eliminate DONT_SHARE_SHORT_STRINGS. Tim Peters <tim.peters@gmail.com> parents: 22651 diff changeset	87 /* share short strings */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	88 if (size == 0) {
17720 ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	89 PyObject t = (PyObject )op;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	90 PyString_InternInPlace(&t);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	91 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	92 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	93 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	94 } else if (size == 1 && str != NULL) {
17720 ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	95 PyObject t = (PyObject )op;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	96 PyString_InternInPlace(&t);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	97 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	98 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	99 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	100 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	101 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	102 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	103
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	104 PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	105 PyString_FromString(const char *str)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	106 {
21263 2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	107 register size_t size;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	108 register PyStringObject *op;
21263 2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	109
2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	110 assert(str != NULL);
2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	111 size = strlen(str);
37667 b1724e926e07 Replace most INT_MAX with PY_SSIZE_T_MAX. Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	112 if (size > PY_SSIZE_T_MAX) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	113 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	114 "string is too long for a Python string");
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	115 return NULL;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	116 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	117 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	118 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	119 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	120 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	121 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	122 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	123 }
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	124 if (size == 1 && (op = characters[*str & UCHAR_MAX]) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	125 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	126 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	127 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	128 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	129 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	130 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	131
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 24872 diff changeset	132 /* Inline PyObject_NewVar */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	133 op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	134 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	135 return PyErr_NoMemory();
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	136 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	137 op->ob_shash = -1;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	138 op->ob_sstate = SSTATE_NOT_INTERNED;
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	139 Py_MEMCPY(op->ob_sval, str, size+1);
22689 614167df2096 Eliminate DONT_SHARE_SHORT_STRINGS. Tim Peters <tim.peters@gmail.com> parents: 22651 diff changeset	140 /* share short strings */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	141 if (size == 0) {
17720 ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	142 PyObject t = (PyObject )op;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	143 PyString_InternInPlace(&t);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	144 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	145 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	146 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	147 } else if (size == 1) {
17720 ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	148 PyObject t = (PyObject )op;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	149 PyString_InternInPlace(&t);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	150 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	151 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	152 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	153 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	154 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	155 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	156
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	157 PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	158 PyString_FromFormatV(const char *format, va_list vargs)
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	159 {
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	160 va_list count;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	161 Py_ssize_t n = 0;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	162 const char* f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	163 char *s;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	164 PyObject* string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	165
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	166 #ifdef VA_LIST_IS_ARRAY
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	167 Py_MEMCPY(count, vargs, sizeof(va_list));
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	168 #else
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	169 #ifdef __va_copy
81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	170 __va_copy(count, vargs);
81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	171 #else
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	172 count = vargs;
abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	173 #endif
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	174 #endif
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	175 /* step 1: figure out how large a buffer we need */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	176 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	177 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	178 const char* p = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	179 while (++f && f != '%' && !isalpha(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	180 ;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	181
38173 380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	182 /* skip the 'l' or 'z' in {%ld, %zd, %lu, %zu} since
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	183 * they don't affect the amount of space we reserve.
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	184 */
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	185 if ((f == 'l' \|\| f == 'z') &&
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	186 (f[1] == 'd' \|\| f[1] == 'u'))
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	187 ++f;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	188
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	189 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	190 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	191 (void)va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	192 /* fall through... */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	193 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	194 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	195 break;
38173 380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	196 case 'd': case 'u': case 'i': case 'x':
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	197 (void) va_arg(count, int);
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	198 /* 20 bytes is enough to hold a 64-bit
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	199 integer. Decimal takes the most space.
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	200 This isn't enough for octal. */
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	201 n += 20;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	202 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	203 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	204 s = va_arg(count, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	205 n += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	206 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	207 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	208 (void) va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	209 /* maximum 64-bit pointer representation:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	210 * 0xffffffffffffffff
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	211 * so 19 characters is enough.
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	212 * XXX I count 18 -- what's the extra for?
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	213 */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	214 n += 19;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	215 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	216 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	217 /* if we stumble upon an unknown
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	218 formatting code, copy the rest of
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	219 the format string to the output
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	220 string. (we cannot just skip the
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	221 code, since there's no way to know
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	222 what's in the argument list) */
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	223 n += strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	224 goto expand;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	225 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	226 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	227 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	228 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	229 expand:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	230 /* step 2: fill the buffer */
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	231 /* Since we've analyzed how much space we need for the worst case,
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	232 use sprintf directly instead of the slower PyOS_snprintf. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	233 string = PyString_FromStringAndSize(NULL, n);
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	234 if (!string)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	235 return NULL;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	236
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	237 s = PyString_AsString(string);
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	238
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	239 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	240 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	241 const char* p = f++;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	242 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	243 int longflag = 0;
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	244 int size_tflag = 0;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	245 /* parse the width.precision part (we're only
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	246 interested in the precision value, if any) */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	247 n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	248 while (isdigit(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	249 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	250 if (*f == '.') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	251 f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	252 n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	253 while (isdigit(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	254 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	255 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	256 while (f && f != '%' && !isalpha(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	257 f++;
38173 380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	258 /* handle the long flag, but only for %ld and %lu.
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	259 others can be added when necessary. */
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	260 if (*f == 'l' && (f[1] == 'd' \|\| f[1] == 'u')) {
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	261 longflag = 1;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	262 ++f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	263 }
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	264 /* handle the size_t flag. */
38173 380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	265 if (*f == 'z' && (f[1] == 'd' \|\| f[1] == 'u')) {
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	266 size_tflag = 1;
0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	267 ++f;
0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	268 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	269
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	270 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	271 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	272 *s++ = va_arg(vargs, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	273 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	274 case 'd':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	275 if (longflag)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	276 sprintf(s, "%ld", va_arg(vargs, long));
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	277 else if (size_tflag)
38172 32472ea5f3cd Revert 43315: Printing of %zd must be signed. Martin v. Löwis <martin@v.loewis.de> parents: 37896 diff changeset	278 sprintf(s, "%" PY_FORMAT_SIZE_T "d",
32472ea5f3cd Revert 43315: Printing of %zd must be signed. Martin v. Löwis <martin@v.loewis.de> parents: 37896 diff changeset	279 va_arg(vargs, Py_ssize_t));
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	280 else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	281 sprintf(s, "%d", va_arg(vargs, int));
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	282 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	283 break;
38173 380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	284 case 'u':
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	285 if (longflag)
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	286 sprintf(s, "%lu",
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	287 va_arg(vargs, unsigned long));
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	288 else if (size_tflag)
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	289 sprintf(s, "%" PY_FORMAT_SIZE_T "u",
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	290 va_arg(vargs, size_t));
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	291 else
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	292 sprintf(s, "%u",
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	293 va_arg(vargs, unsigned int));
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	294 s += strlen(s);
380dad395599 Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV Tim Peters <tim.peters@gmail.com> parents: 38172 diff changeset	295 break;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	296 case 'i':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	297 sprintf(s, "%i", va_arg(vargs, int));
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	298 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	299 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	300 case 'x':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	301 sprintf(s, "%x", va_arg(vargs, int));
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	302 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	303 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	304 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	305 p = va_arg(vargs, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	306 i = strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	307 if (n > 0 && i > n)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	308 i = n;
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	309 Py_MEMCPY(s, p, i);
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	310 s += i;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	311 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	312 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	313 sprintf(s, "%p", va_arg(vargs, void*));
19486 5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	314 /* %p is ill-defined: ensure leading 0x. */
5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	315 if (s[1] == 'X')
5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	316 s[1] = 'x';
5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	317 else if (s[1] != 'x') {
5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	318 memmove(s+2, s, strlen(s)+1);
5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	319 s[0] = '0';
5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	320 s[1] = 'x';
5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	321 }
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	322 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	323 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	324 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	325 *s++ = '%';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	326 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	327 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	328 strcpy(s, p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	329 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	330 goto end;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	331 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	332 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	333 s++ = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	334 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	335
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	336 end:
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	337 _PyString_Resize(&string, s - PyString_AS_STRING(string));
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	338 return string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	339 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	340
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	341 PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	342 PyString_FromFormat(const char *format, ...)
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	343 {
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	344 PyObject* ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	345 va_list vargs;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	346
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	347 #ifdef HAVE_STDARG_PROTOTYPES
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	348 va_start(vargs, format);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	349 #else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	350 va_start(vargs);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	351 #endif
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	352 ret = PyString_FromFormatV(format, vargs);
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	353 va_end(vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	354 return ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	355 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	356
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	357
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	358 PyObject PyString_Decode(const char s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	359 Py_ssize_t size,
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	360 const char *encoding,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	361 const char *errors)
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	362 {
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	363 PyObject v, str;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	364
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	365 str = PyString_FromStringAndSize(s, size);
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	366 if (str == NULL)
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	367 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	368 v = PyString_AsDecodedString(str, encoding, errors);
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	369 Py_DECREF(str);
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	370 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	371 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	372
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	373 PyObject PyString_AsDecodedObject(PyObject str,
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	374 const char *encoding,
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	375 const char *errors)
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	376 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	377 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	378
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	379 if (!PyString_Check(str)) {
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	380 PyErr_BadArgument();
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	381 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	382 }
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	383
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	384 if (encoding == NULL) {
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	385 #ifdef Py_USING_UNICODE
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	386 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	387 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	388 PyErr_SetString(PyExc_ValueError, "no encoding specified");
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	389 goto onError;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	390 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	391 }
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	392
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	393 /* Decode via the codec registry */
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	394 v = PyCodec_Decode(str, encoding, errors);
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	395 if (v == NULL)
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	396 goto onError;
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	397
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	398 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	399
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	400 onError:
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	401 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	402 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	403
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	404 PyObject PyString_AsDecodedString(PyObject str,
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	405 const char *encoding,
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	406 const char *errors)
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	407 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	408 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	409
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	410 v = PyString_AsDecodedObject(str, encoding, errors);
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	411 if (v == NULL)
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	412 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	413
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	414 #ifdef Py_USING_UNICODE
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	415 /* Convert Unicode to a string using the default encoding */
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	416 if (PyUnicode_Check(v)) {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	417 PyObject *temp = v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	418 v = PyUnicode_AsEncodedString(v, NULL, NULL);
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	419 Py_DECREF(temp);
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	420 if (v == NULL)
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	421 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	422 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	423 #endif
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	424 if (!PyString_Check(v)) {
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	425 PyErr_Format(PyExc_TypeError,
13561 ea732719b3fd Fix typo in error message Andrew M. Kuchling <amk@amk.ca> parents: 13544 diff changeset	426 "decoder did not return a string object (type=%.400s)",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	427 Py_TYPE(v)->tp_name);
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	428 Py_DECREF(v);
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	429 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	430 }
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	431
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	432 return v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	433
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	434 onError:
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	435 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	436 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	437
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	438 PyObject PyString_Encode(const char s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	439 Py_ssize_t size,
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	440 const char *encoding,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	441 const char *errors)
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	442 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	443 PyObject v, str;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	444
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	445 str = PyString_FromStringAndSize(s, size);
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	446 if (str == NULL)
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	447 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	448 v = PyString_AsEncodedString(str, encoding, errors);
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	449 Py_DECREF(str);
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	450 return v;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	451 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	452
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	453 PyObject PyString_AsEncodedObject(PyObject str,
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	454 const char *encoding,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	455 const char *errors)
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	456 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	457 PyObject *v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	458
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	459 if (!PyString_Check(str)) {
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	460 PyErr_BadArgument();
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	461 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	462 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	463
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	464 if (encoding == NULL) {
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	465 #ifdef Py_USING_UNICODE
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	466 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	467 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	468 PyErr_SetString(PyExc_ValueError, "no encoding specified");
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	469 goto onError;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	470 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	471 }
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	472
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	473 /* Encode via the codec registry */
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	474 v = PyCodec_Encode(str, encoding, errors);
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	475 if (v == NULL)
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	476 goto onError;
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	477
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	478 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	479
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	480 onError:
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	481 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	482 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	483
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	484 PyObject PyString_AsEncodedString(PyObject str,
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	485 const char *encoding,
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	486 const char *errors)
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	487 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	488 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	489
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	490 v = PyString_AsEncodedObject(str, encoding, errors);
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	491 if (v == NULL)
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	492 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	493
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	494 #ifdef Py_USING_UNICODE
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	495 /* Convert Unicode to a string using the default encoding */
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	496 if (PyUnicode_Check(v)) {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	497 PyObject *temp = v;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	498 v = PyUnicode_AsEncodedString(v, NULL, NULL);
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	499 Py_DECREF(temp);
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	500 if (v == NULL)
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	501 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	502 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	503 #endif
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	504 if (!PyString_Check(v)) {
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	505 PyErr_Format(PyExc_TypeError,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	506 "encoder did not return a string object (type=%.400s)",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	507 Py_TYPE(v)->tp_name);
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	508 Py_DECREF(v);
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	509 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	510 }
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	511
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	512 return v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	513
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	514 onError:
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	515 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	516 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	517
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1282 diff changeset	518 static void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	519 string_dealloc(PyObject *op)
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	520 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	521 switch (PyString_CHECK_INTERNED(op)) {
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	522 case SSTATE_NOT_INTERNED:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	523 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	524
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	525 case SSTATE_INTERNED_MORTAL:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	526 /* revive dead object temporarily for DelItem */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	527 Py_REFCNT(op) = 3;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	528 if (PyDict_DelItem(interned, op) != 0)
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	529 Py_FatalError(
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	530 "deletion of interned string failed");
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	531 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	532
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	533 case SSTATE_INTERNED_IMMORTAL:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	534 Py_FatalError("Immortal interned string died.");
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	535
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	536 default:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	537 Py_FatalError("Inconsistent interned string state.");
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	538 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	539 Py_TYPE(op)->tp_free(op);
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	540 }
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	541
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	542 /* Unescape a backslash-escaped string. If unicode is non-zero,
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	543 the string is a u-literal. If recode_encoding is non-zero,
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	544 the string is UTF-8 encoded and should be re-encoded in the
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	545 specified encoding. */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	546
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	547 PyObject PyString_DecodeEscape(const char s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	548 Py_ssize_t len,
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	549 const char *errors,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	550 Py_ssize_t unicode,
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	551 const char *recode_encoding)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	552 {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	553 int c;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	554 char p, buf;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	555 const char *end;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	556 PyObject *v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	557 Py_ssize_t newlen = recode_encoding ? 4*len:len;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	558 v = PyString_FromStringAndSize((char *)NULL, newlen);
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	559 if (v == NULL)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	560 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	561 p = buf = PyString_AsString(v);
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	562 end = s + len;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	563 while (s < end) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	564 if (*s != '\\') {
25173 f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	565 non_esc:
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	566 #ifdef Py_USING_UNICODE
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	567 if (recode_encoding && (*s & 0x80)) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	568 PyObject u, w;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	569 char *r;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	570 const char* t;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	571 Py_ssize_t rn;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	572 t = s;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	573 /* Decode non-ASCII bytes as UTF-8. */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	574 while (t < end && (*t & 0x80)) t++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	575 u = PyUnicode_DecodeUTF8(s, t - s, errors);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	576 if(!u) goto failed;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	577
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	578 /* Recode them in target encoding. */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	579 w = PyUnicode_AsEncodedString(
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	580 u, recode_encoding, errors);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	581 Py_DECREF(u);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	582 if (!w) goto failed;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	583
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	584 /* Append bytes to output buffer. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	585 assert(PyString_Check(w));
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	586 r = PyString_AS_STRING(w);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	587 rn = PyString_GET_SIZE(w);
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	588 Py_MEMCPY(p, r, rn);
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	589 p += rn;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	590 Py_DECREF(w);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	591 s = t;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	592 } else {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	593 p++ = s++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	594 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	595 #else
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	596 p++ = s++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	597 #endif
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	598 continue;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	599 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	600 s++;
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	601 if (s==end) {
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	602 PyErr_SetString(PyExc_ValueError,
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	603 "Trailing \\ in string");
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	604 goto failed;
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	605 }
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	606 switch (*s++) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	607 /* XXX This assumes ASCII! */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	608 case '\n': break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	609 case '\\': *p++ = '\\'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	610 case '\'': *p++ = '\''; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	611 case '\"': *p++ = '\"'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	612 case 'b': *p++ = '\b'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	613 case 'f': p++ = '\014'; break; / FF */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	614 case 't': *p++ = '\t'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	615 case 'n': *p++ = '\n'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	616 case 'r': *p++ = '\r'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	617 case 'v': p++ = '\013'; break; / VT */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	618 case 'a': p++ = '\007'; break; / BEL, not classic C */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	619 case '0': case '1': case '2': case '3':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	620 case '4': case '5': case '6': case '7':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	621 c = s[-1] - '0';
43710 124cbf1a0e3e Backport fixes for the code that decodes octal escapes (and for PyString Guido van Rossum <guido@python.org> parents: 43378 diff changeset	622 if (s < end && '0' <= s && s <= '7') {
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	623 c = (c<<3) + *s++ - '0';
43710 124cbf1a0e3e Backport fixes for the code that decodes octal escapes (and for PyString Guido van Rossum <guido@python.org> parents: 43378 diff changeset	624 if (s < end && '0' <= s && s <= '7')
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	625 c = (c<<3) + *s++ - '0';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	626 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	627 *p++ = c;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	628 break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	629 case 'x':
43710 124cbf1a0e3e Backport fixes for the code that decodes octal escapes (and for PyString Guido van Rossum <guido@python.org> parents: 43378 diff changeset	630 if (s+1 < end &&
124cbf1a0e3e Backport fixes for the code that decodes octal escapes (and for PyString Guido van Rossum <guido@python.org> parents: 43378 diff changeset	631 isxdigit(Py_CHARMASK(s[0])) &&
124cbf1a0e3e Backport fixes for the code that decodes octal escapes (and for PyString Guido van Rossum <guido@python.org> parents: 43378 diff changeset	632 isxdigit(Py_CHARMASK(s[1])))
124cbf1a0e3e Backport fixes for the code that decodes octal escapes (and for PyString Guido van Rossum <guido@python.org> parents: 43378 diff changeset	633 {
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	634 unsigned int x = 0;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	635 c = Py_CHARMASK(*s);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	636 s++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	637 if (isdigit(c))
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	638 x = c - '0';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	639 else if (islower(c))
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	640 x = 10 + c - 'a';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	641 else
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	642 x = 10 + c - 'A';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	643 x = x << 4;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	644 c = Py_CHARMASK(*s);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	645 s++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	646 if (isdigit(c))
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	647 x += c - '0';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	648 else if (islower(c))
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	649 x += 10 + c - 'a';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	650 else
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	651 x += 10 + c - 'A';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	652 *p++ = x;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	653 break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	654 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	655 if (!errors \|\| strcmp(errors, "strict") == 0) {
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	656 PyErr_SetString(PyExc_ValueError,
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	657 "invalid \\x escape");
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	658 goto failed;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	659 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	660 if (strcmp(errors, "replace") == 0) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	661 *p++ = '?';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	662 } else if (strcmp(errors, "ignore") == 0)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	663 /* do nothing */;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	664 else {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	665 PyErr_Format(PyExc_ValueError,
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	666 "decoding error; "
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	667 "unknown error handling code: %.400s",
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	668 errors);
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	669 goto failed;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	670 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	671 #ifndef Py_USING_UNICODE
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	672 case 'u':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	673 case 'U':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	674 case 'N':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	675 if (unicode) {
24872 cf561e612378 Get this to compile again if Py_USING_UNICODE is not defined. Neal Norwitz <nnorwitz@gmail.com> parents: 24831 diff changeset	676 PyErr_SetString(PyExc_ValueError,
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	677 "Unicode escapes not legal "
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	678 "when Unicode disabled");
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	679 goto failed;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	680 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	681 #endif
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	682 default:
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	683 *p++ = '\\';
25173 f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	684 s--;
f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	685 goto non_esc; /* an arbitry number of unescaped
f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	686 UTF-8 bytes may follow. */
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	687 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	688 }
25100 bc590beadf0b Check whether a string resize is necessary at the end Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	689 if (p-buf < newlen)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	690 _PyString_Resize(&v, p - buf);
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	691 return v;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	692 failed:
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	693 Py_DECREF(v);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	694 return NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	695 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	696
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	697 /* -------------------------------------------------------------------- */
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	698 /* object api */
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	699
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	700 static Py_ssize_t
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	701 string_getsize(register PyObject *op)
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	702 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	703 char *s;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	704 Py_ssize_t len;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	705 if (PyString_AsStringAndSize(op, &s, &len))
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	706 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	707 return len;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	708 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	709
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	710 static /const/ char *
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	711 string_getbuffer(register PyObject *op)
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	712 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	713 char *s;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	714 Py_ssize_t len;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	715 if (PyString_AsStringAndSize(op, &s, &len))
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	716 return NULL;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	717 return s;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	718 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	719
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	720 Py_ssize_t
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	721 PyString_Size(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	722 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	723 if (!PyString_Check(op))
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	724 return string_getsize(op);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	725 return Py_SIZE(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	726 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	727
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	728 /const/ char *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	729 PyString_AsString(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	730 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	731 if (!PyString_Check(op))
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	732 return string_getbuffer(op);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	733 return ((PyStringObject *)op) -> ob_sval;
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	734 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	735
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	736 int
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	737 PyString_AsStringAndSize(register PyObject *obj,
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	738 register char **s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	739 register Py_ssize_t *len)
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	740 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	741 if (s == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	742 PyErr_BadInternalCall();
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	743 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	744 }
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	745
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	746 if (!PyString_Check(obj)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	747 #ifdef Py_USING_UNICODE
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	748 if (PyUnicode_Check(obj)) {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	749 obj = _PyUnicode_AsDefaultEncodedString(obj, NULL);
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	750 if (obj == NULL)
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	751 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	752 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	753 else
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	754 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	755 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	756 PyErr_Format(PyExc_TypeError,
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	757 "expected string or Unicode object, "
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	758 "%.200s found", Py_TYPE(obj)->tp_name);
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	759 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	760 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	761 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	762
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	763 *s = PyString_AS_STRING(obj);
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	764 if (len != NULL)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	765 *len = PyString_GET_SIZE(obj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	766 else if (strlen(*s) != (size_t)PyString_GET_SIZE(obj)) {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	767 PyErr_SetString(PyExc_TypeError,
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	768 "expected string without null bytes");
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	769 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	770 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	771 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	772 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	773
38303 17eaa8b57e05 needforspeed: use "fastsearch" for count. this results in a 3x speedup Fredrik Lundh <fredrik@pythonware.com> parents: 38302 diff changeset	774 /* -------------------------------------------------------------------- */
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	775 /* Methods */
38381 b32f9bb2e077 needforspeed: stringlib refactoring (in progress) Fredrik Lundh <fredrik@pythonware.com> parents: 38376 diff changeset	776
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	777 #include "stringlib/stringdefs.h"
38381 b32f9bb2e077 needforspeed: stringlib refactoring (in progress) Fredrik Lundh <fredrik@pythonware.com> parents: 38376 diff changeset	778 #include "stringlib/fastsearch.h"
38404 52f2c9f74f5a needforspeed: stringlib refactoring: use stringlib/find for string find Fredrik Lundh <fredrik@pythonware.com> parents: 38400 diff changeset	779
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	780 #include "stringlib/count.h"
38404 52f2c9f74f5a needforspeed: stringlib refactoring: use stringlib/find for string find Fredrik Lundh <fredrik@pythonware.com> parents: 38400 diff changeset	781 #include "stringlib/find.h"
38383 05744917b7c3 needforspeed: stringlib refactoring (in progress) Fredrik Lundh <fredrik@pythonware.com> parents: 38381 diff changeset	782 #include "stringlib/partition.h"
38381 b32f9bb2e077 needforspeed: stringlib refactoring (in progress) Fredrik Lundh <fredrik@pythonware.com> parents: 38376 diff changeset	783
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	784 #define _Py_InsertThousandsGrouping _PyString_InsertThousandsGrouping
46898 206700d749f0 Addresses issue 2802: 'n' formatting for integers. Eric Smith <eric@trueblade.com> parents: 46871 diff changeset	785 #include "stringlib/localeutil.h"
206700d749f0 Addresses issue 2802: 'n' formatting for integers. Eric Smith <eric@trueblade.com> parents: 46871 diff changeset	786
206700d749f0 Addresses issue 2802: 'n' formatting for integers. Eric Smith <eric@trueblade.com> parents: 46871 diff changeset	787
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	788
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	789 static int
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	790 string_print(PyStringObject op, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	791 {
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	792 Py_ssize_t i, str_len;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	793 char c;
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	794 int quote;
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	795
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	796 /* XXX Ought to check for interrupts when writing long strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	797 if (! PyString_CheckExact(op)) {
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	798 int ret;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	799 /* A str subclass may have its own __str__ method. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	800 op = (PyStringObject ) PyObject_Str((PyObject )op);
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	801 if (op == NULL)
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	802 return -1;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	803 ret = string_print(op, fp, flags);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	804 Py_DECREF(op);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	805 return ret;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	806 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	807 if (flags & Py_PRINT_RAW) {
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	808 char *data = op->ob_sval;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	809 Py_ssize_t size = Py_SIZE(op);
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	810 Py_BEGIN_ALLOW_THREADS
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	811 while (size > INT_MAX) {
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	812 /* Very long strings cannot be written atomically.
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	813 * But don't write exactly INT_MAX bytes at a time
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	814 * to avoid memory aligment issues.
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	815 */
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	816 const int chunk_size = INT_MAX & ~0x3FFF;
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	817 fwrite(data, 1, chunk_size, fp);
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	818 data += chunk_size;
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	819 size -= chunk_size;
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	820 }
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26273 diff changeset	821 #ifdef __VMS
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	822 if (size) fwrite(data, (int)size, 1, fp);
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26273 diff changeset	823 #else
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	824 fwrite(data, 1, (int)size, fp);
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26273 diff changeset	825 #endif
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	826 Py_END_ALLOW_THREADS
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	827 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	828 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	829
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	830 /* figure out which quote to use; single is preferred */
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	831 quote = '\'';
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	832 if (memchr(op->ob_sval, '\'', Py_SIZE(op)) &&
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	833 !memchr(op->ob_sval, '"', Py_SIZE(op)))
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	834 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	835
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	836 str_len = Py_SIZE(op);
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	837 Py_BEGIN_ALLOW_THREADS
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	838 fputc(quote, fp);
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	839 for (i = 0; i < str_len; i++) {
7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	840 /* Since strings are immutable and the caller should have a
7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	841 reference, accessing the interal buffer should not be an issue
7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	842 with the GIL released. */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	843 c = op->ob_sval[i];
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	844 if (c == quote \|\| c == '\\')
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	845 fprintf(fp, "\\%c", c);
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	846 else if (c == '\t')
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	847 fprintf(fp, "\\t");
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	848 else if (c == '\n')
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	849 fprintf(fp, "\\n");
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	850 else if (c == '\r')
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	851 fprintf(fp, "\\r");
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	852 else if (c < ' ' \|\| c >= 0x7f)
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	853 fprintf(fp, "\\x%02x", c & 0xff);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	854 else
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	855 fputc(c, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	856 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	857 fputc(quote, fp);
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42951 diff changeset	858 Py_END_ALLOW_THREADS
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	859 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	860 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	861
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	862 PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	863 PyString_Repr(PyObject *obj, int smartquotes)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	864 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	865 register PyStringObject* op = (PyStringObject*) obj;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	866 size_t newsize = 2 + 4 * Py_SIZE(op);
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	867 PyObject *v;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	868 if (newsize > PY_SSIZE_T_MAX \|\| newsize / 4 != Py_SIZE(op)) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	869 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	870 "string is too large to make repr");
43780 7347f75b9c34 Add missing "return NULL" in overflow check in PyObject_Repr(). Guido van Rossum <guido@python.org> parents: 43710 diff changeset	871 return NULL;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	872 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	873 v = PyString_FromStringAndSize((char *)NULL, newsize);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	874 if (v == NULL) {
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	875 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	876 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	877 else {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	878 register Py_ssize_t i;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	879 register char c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	880 register char *p;
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	881 int quote;
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	882
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	883 /* figure out which quote to use; single is preferred */
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	884 quote = '\'';
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	885 if (smartquotes &&
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	886 memchr(op->ob_sval, '\'', Py_SIZE(op)) &&
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	887 !memchr(op->ob_sval, '"', Py_SIZE(op)))
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	888 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	889
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	890 p = PyString_AS_STRING(v);
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	891 *p++ = quote;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	892 for (i = 0; i < Py_SIZE(op); i++) {
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	893 /* There's at least enough room for a hex escape
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	894 and a closing quote. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	895 assert(newsize - (p - PyString_AS_STRING(v)) >= 5);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	896 c = op->ob_sval[i];
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	897 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	898 p++ = '\\', p++ = c;
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	899 else if (c == '\t')
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	900 p++ = '\\', p++ = 't';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	901 else if (c == '\n')
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	902 p++ = '\\', p++ = 'n';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	903 else if (c == '\r')
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	904 p++ = '\\', p++ = 'r';
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	905 else if (c < ' ' \|\| c >= 0x7f) {
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	906 /* For performance, we don't want to call
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	907 PyOS_snprintf here (extra layers of
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	908 function call). */
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	909 sprintf(p, "\\x%02x", c & 0xff);
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	910 p += 4;
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	911 }
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	912 else
25643 5c6fac95a94b Patch #479898: Use multibyte C library for printing strings if available. Martin v. Löwis <martin@v.loewis.de> parents: 25233 diff changeset	913 *p++ = c;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	914 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	915 assert(newsize - (p - PyString_AS_STRING(v)) >= 1);
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	916 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	917 *p = '\0';
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	918 _PyString_Resize(
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	919 &v, (p - PyString_AS_STRING(v)));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	920 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	921 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	922 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	923
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	924 static PyObject *
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	925 string_repr(PyObject *op)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	926 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	927 return PyString_Repr(op, 1);
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	928 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	929
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	930 static PyObject *
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	931 string_str(PyObject *s)
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	932 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	933 assert(PyString_Check(s));
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	934 if (PyString_CheckExact(s)) {
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	935 Py_INCREF(s);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	936 return s;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	937 }
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	938 else {
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	939 /* Subtype -- return genuine string with the same value. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	940 PyStringObject t = (PyStringObject ) s;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	941 return PyString_FromStringAndSize(t->ob_sval, Py_SIZE(t));
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	942 }
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	943 }
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	944
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	945 static Py_ssize_t
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	946 string_length(PyStringObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	947 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	948 return Py_SIZE(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	949 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	950
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	951 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	952 string_concat(register PyStringObject a, register PyObject bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	953 {
38306 c5d61965cad4 Added overflow test for adding two (very) large strings where the Andrew Dalke <dalke@dalkescientific.com> parents: 38305 diff changeset	954 register Py_ssize_t size;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	955 register PyStringObject *op;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	956 if (!PyString_Check(bb)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	957 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	958 if (PyUnicode_Check(bb))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	959 return PyUnicode_Concat((PyObject *)a, bb);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	960 #endif
47291 04bd3690fb1f First step of the C API rename: Christian Heimes <christian@cheimes.de> parents: 46908 diff changeset	961 if (PyByteArray_Check(bb))
04bd3690fb1f First step of the C API rename: Christian Heimes <christian@cheimes.de> parents: 46908 diff changeset	962 return PyByteArray_Concat((PyObject *)a, bb);
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	963 PyErr_Format(PyExc_TypeError,
20604 7945639df265 Make the error message for unsupported operand types cleaner, in Guido van Rossum <guido@python.org> parents: 20464 diff changeset	964 "cannot concatenate 'str' and '%.200s' objects",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	965 Py_TYPE(bb)->tp_name);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	966 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	967 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	968 #define b ((PyStringObject *)bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	969 /* Optimize cases with empty left or right operand */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	970 if ((Py_SIZE(a) == 0 \|\| Py_SIZE(b) == 0) &&
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	971 PyString_CheckExact(a) && PyString_CheckExact(b)) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	972 if (Py_SIZE(a) == 0) {
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	973 Py_INCREF(bb);
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	974 return bb;
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	975 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	976 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	977 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	978 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	979 size = Py_SIZE(a) + Py_SIZE(b);
38306 c5d61965cad4 Added overflow test for adding two (very) large strings where the Andrew Dalke <dalke@dalkescientific.com> parents: 38305 diff changeset	980 if (size < 0) {
c5d61965cad4 Added overflow test for adding two (very) large strings where the Andrew Dalke <dalke@dalkescientific.com> parents: 38305 diff changeset	981 PyErr_SetString(PyExc_OverflowError,
c5d61965cad4 Added overflow test for adding two (very) large strings where the Andrew Dalke <dalke@dalkescientific.com> parents: 38305 diff changeset	982 "strings are too large to concat");
c5d61965cad4 Added overflow test for adding two (very) large strings where the Andrew Dalke <dalke@dalkescientific.com> parents: 38305 diff changeset	983 return NULL;
c5d61965cad4 Added overflow test for adding two (very) large strings where the Andrew Dalke <dalke@dalkescientific.com> parents: 38305 diff changeset	984 }
c5d61965cad4 Added overflow test for adding two (very) large strings where the Andrew Dalke <dalke@dalkescientific.com> parents: 38305 diff changeset	985
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 24872 diff changeset	986 /* Inline PyObject_NewVar */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	987 op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	988 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	989 return PyErr_NoMemory();
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	990 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	991 op->ob_shash = -1;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	992 op->ob_sstate = SSTATE_NOT_INTERNED;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	993 Py_MEMCPY(op->ob_sval, a->ob_sval, Py_SIZE(a));
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	994 Py_MEMCPY(op->ob_sval + Py_SIZE(a), b->ob_sval, Py_SIZE(b));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	995 op->ob_sval[size] = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	996 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	997 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	998 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	999
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1000 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1001 string_repeat(register PyStringObject *a, register Py_ssize_t n)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1002 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1003 register Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1004 register Py_ssize_t j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1005 register Py_ssize_t size;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1006 register PyStringObject *op;
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1007 size_t nbytes;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1008 if (n < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1009 n = 0;
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1010 /* watch out for overflows: the size can overflow int,
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1011 * and the # of bytes needed can overflow size_t
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1012 */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1013 size = Py_SIZE(a) * n;
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1014 if (n && size / n != Py_SIZE(a)) {
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1015 PyErr_SetString(PyExc_OverflowError,
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1016 "repeated string is too long");
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1017 return NULL;
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1018 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1019 if (size == Py_SIZE(a) && PyString_CheckExact(a)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1020 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1021 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1022 }
32423 64534fb3afcd sizeof(char) is 1, by definition, so get rid of that expression in Tim Peters <tim.peters@gmail.com> parents: 32305 diff changeset	1023 nbytes = (size_t)size;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1024 if (nbytes + sizeof(PyStringObject) <= nbytes) {
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1025 PyErr_SetString(PyExc_OverflowError,
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1026 "repeated string is too long");
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1027 return NULL;
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	1028 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1029 op = (PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1030 PyObject_MALLOC(sizeof(PyStringObject) + nbytes);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	1031 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1032 return PyErr_NoMemory();
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1033 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1034 op->ob_shash = -1;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	1035 op->ob_sstate = SSTATE_NOT_INTERNED;
27123 1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	1036 op->ob_sval[size] = '\0';
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1037 if (Py_SIZE(a) == 1 && n > 0) {
27123 1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	1038 memset(op->ob_sval, a->ob_sval[0] , n);
1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	1039 return (PyObject *) op;
1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	1040 }
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1041 i = 0;
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1042 if (i < size) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1043 Py_MEMCPY(op->ob_sval, a->ob_sval, Py_SIZE(a));
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1044 i = Py_SIZE(a);
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1045 }
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1046 while (i < size) {
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1047 j = (i <= size-i) ? i : size-i;
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	1048 Py_MEMCPY(op->ob_sval+i, op->ob_sval, j);
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1049 i += j;
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1050 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1051 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1052 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1053
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1054 /* String slice a[i:j] consists of characters a[i] ... a[j-1] */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1055
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1056 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1057 string_slice(register PyStringObject *a, register Py_ssize_t i,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1058 register Py_ssize_t j)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1059 /* j -- may be negative! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1060 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1061 if (i < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1062 i = 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1063 if (j < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1064 j = 0; /* Avoid signed/unsigned bug in next line */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1065 if (j > Py_SIZE(a))
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1066 j = Py_SIZE(a);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1067 if (i == 0 && j == Py_SIZE(a) && PyString_CheckExact(a)) {
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1068 /* It's the same as a */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1069 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1070 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1071 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1072 if (j < i)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1073 j = i;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1074 return PyString_FromStringAndSize(a->ob_sval + i, j-i);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1075 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1076
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1077 static int
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	1078 string_contains(PyObject str_obj, PyObject sub_obj)
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1079 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1080 if (!PyString_CheckExact(sub_obj)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1081 #ifdef Py_USING_UNICODE
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	1082 if (PyUnicode_Check(sub_obj))
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	1083 return PyUnicode_Contains(str_obj, sub_obj);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1084 #endif
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1085 if (!PyString_Check(sub_obj)) {
40357 b871e7bd8355 Patch [ 1586791 ] better error msgs for some TypeErrors Georg Brandl <georg@python.org> parents: 39995 diff changeset	1086 PyErr_Format(PyExc_TypeError,
b871e7bd8355 Patch [ 1586791 ] better error msgs for some TypeErrors Georg Brandl <georg@python.org> parents: 39995 diff changeset	1087 "'in <string>' requires string as left operand, "
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1088 "not %.200s", Py_TYPE(sub_obj)->tp_name);
25017 aa4503556339 string_contains(): speed up by avoiding function calls where Guido van Rossum <guido@python.org> parents: 25004 diff changeset	1089 return -1;
aa4503556339 string_contains(): speed up by avoiding function calls where Guido van Rossum <guido@python.org> parents: 25004 diff changeset	1090 }
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1091 }
34620 556f6f1056a8 * Beef-up testing of str.__contains__() and str.find(). Raymond Hettinger <python@rcn.com> parents: 34522 diff changeset	1092
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	1093 return stringlib_contains_obj(str_obj, sub_obj);
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1094 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1095
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1096 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1097 string_item(PyStringObject *a, register Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1098 {
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	1099 char pchar;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1100 PyObject *v;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1101 if (i < 0 \|\| i >= Py_SIZE(a)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1102 PyErr_SetString(PyExc_IndexError, "string index out of range");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1103 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1104 }
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	1105 pchar = a->ob_sval[i];
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	1106 v = (PyObject *)characters[pchar & UCHAR_MAX];
17710 6199e5bd370b Intern 1-character strings as soon as they're created. As-is, they aren't Tim Peters <tim.peters@gmail.com> parents: 17687 diff changeset	1107 if (v == NULL)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1108 v = PyString_FromStringAndSize(&pchar, 1);
17712 2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1109 else {
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1110 #ifdef COUNT_ALLOCS
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1111 one_strings++;
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1112 #endif
17711 350be19ca6a5 My change to string_item() left an extra reference to each 1-character Tim Peters <tim.peters@gmail.com> parents: 17710 diff changeset	1113 Py_INCREF(v);
17712 2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1114 }
180 a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	1115 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1116 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1117
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1118 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1119 string_richcompare(PyStringObject a, PyStringObject b, int op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1120 {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1121 int c;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1122 Py_ssize_t len_a, len_b;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1123 Py_ssize_t min_len;
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1124 PyObject *result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1125
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20057 diff changeset	1126 /* Make sure both arguments are strings. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1127 if (!(PyString_Check(a) && PyString_Check(b))) {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1128 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1129 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1130 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1131 if (a == b) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1132 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1133 case Py_EQ:case Py_LE:case Py_GE:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1134 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1135 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1136 case Py_NE:case Py_LT:case Py_GT:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1137 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1138 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1139 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1140 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1141 if (op == Py_EQ) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1142 /* Supporting Py_NE here as well does not save
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1143 much time, since Py_NE is rarely used. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1144 if (Py_SIZE(a) == Py_SIZE(b)
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1145 && (a->ob_sval[0] == b->ob_sval[0]
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1146 && memcmp(a->ob_sval, b->ob_sval, Py_SIZE(a)) == 0)) {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1147 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1148 } else {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1149 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1150 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1151 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1152 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1153 len_a = Py_SIZE(a); len_b = Py_SIZE(b);
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1154 min_len = (len_a < len_b) ? len_a : len_b;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1155 if (min_len > 0) {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1156 c = Py_CHARMASK(a->ob_sval) - Py_CHARMASK(b->ob_sval);
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1157 if (c==0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1158 c = memcmp(a->ob_sval, b->ob_sval, min_len);
40902 65cd1f280e63 Whitespace only changes Neal Norwitz <nnorwitz@gmail.com> parents: 40901 diff changeset	1159 } else
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1160 c = 0;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1161 if (c == 0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1162 c = (len_a < len_b) ? -1 : (len_a > len_b) ? 1 : 0;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1163 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1164 case Py_LT: c = c < 0; break;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1165 case Py_LE: c = c <= 0; break;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1166 case Py_EQ: assert(0); break; /* unreachable */
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1167 case Py_NE: c = c != 0; break;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1168 case Py_GT: c = c > 0; break;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1169 case Py_GE: c = c >= 0; break;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1170 default:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1171 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1172 goto out;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1173 }
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1174 result = c ? Py_True : Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1175 out:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1176 Py_INCREF(result);
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1177 return result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1178 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1179
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1180 int
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1181 _PyString_Eq(PyObject o1, PyObject o2)
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1182 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1183 PyStringObject a = (PyStringObject) o1;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1184 PyStringObject b = (PyStringObject) o2;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1185 return Py_SIZE(a) == Py_SIZE(b)
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1186 && a->ob_sval == b->ob_sval
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1187 && memcmp(a->ob_sval, b->ob_sval, Py_SIZE(a)) == 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1188 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1189
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1190 static long
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1191 string_hash(PyStringObject *a)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1192 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1193 register Py_ssize_t len;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1194 register unsigned char *p;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1195 register long x;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1196
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1197 if (a->ob_shash != -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1198 return a->ob_shash;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1199 len = Py_SIZE(a);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1200 p = (unsigned char *) a->ob_sval;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1201 x = *p << 7;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1202 while (--len >= 0)
4283 839f72610ae1 Multiply by 1000003 instead of 3 in string hach Guido van Rossum <guido@python.org> parents: 3586 diff changeset	1203 x = (1000003x) ^ p++;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1204 x ^= Py_SIZE(a);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1205 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1206 x = -2;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1207 a->ob_shash = x;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1208 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1209 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1210
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1211 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1212 string_subscript(PyStringObject* self, PyObject* item)
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1213 {
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39303 diff changeset	1214 if (PyIndex_Check(item)) {
6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39303 diff changeset	1215 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1216 if (i == -1 && PyErr_Occurred())
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1217 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1218 if (i < 0)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1219 i += PyString_GET_SIZE(self);
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	1220 return string_item(self, i);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1221 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1222 else if (PySlice_Check(item)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1223 Py_ssize_t start, stop, step, slicelength, cur, i;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1224 char* source_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1225 char* result_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1226 PyObject* result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1227
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	1228 if (PySlice_GetIndicesEx((PySliceObject*)item,
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1229 PyString_GET_SIZE(self),
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1230 &start, &stop, &step, &slicelength) < 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1231 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1232 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1233
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1234 if (slicelength <= 0) {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1235 return PyString_FromStringAndSize("", 0);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1236 }
42951 9620134010a5 Improve extended slicing support in builtin types and classes. Specifically: Thomas Wouters <thomas@python.org> parents: 42402 diff changeset	1237 else if (start == 0 && step == 1 &&
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1238 slicelength == PyString_GET_SIZE(self) &&
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1239 PyString_CheckExact(self)) {
42951 9620134010a5 Improve extended slicing support in builtin types and classes. Specifically: Thomas Wouters <thomas@python.org> parents: 42402 diff changeset	1240 Py_INCREF(self);
9620134010a5 Improve extended slicing support in builtin types and classes. Specifically: Thomas Wouters <thomas@python.org> parents: 42402 diff changeset	1241 return (PyObject *)self;
9620134010a5 Improve extended slicing support in builtin types and classes. Specifically: Thomas Wouters <thomas@python.org> parents: 42402 diff changeset	1242 }
9620134010a5 Improve extended slicing support in builtin types and classes. Specifically: Thomas Wouters <thomas@python.org> parents: 42402 diff changeset	1243 else if (step == 1) {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1244 return PyString_FromStringAndSize(
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1245 PyString_AS_STRING(self) + start,
42951 9620134010a5 Improve extended slicing support in builtin types and classes. Specifically: Thomas Wouters <thomas@python.org> parents: 42402 diff changeset	1246 slicelength);
9620134010a5 Improve extended slicing support in builtin types and classes. Specifically: Thomas Wouters <thomas@python.org> parents: 42402 diff changeset	1247 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1248 else {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1249 source_buf = PyString_AsString((PyObject*)self);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	1250 result_buf = (char *)PyMem_Malloc(slicelength);
35730 8bec120dbb16 SF bug #1331563 ] string_subscript doesn't check for failed PyMem_Malloc. Will backport Neal Norwitz <nnorwitz@gmail.com> parents: 35665 diff changeset	1251 if (result_buf == NULL)
8bec120dbb16 SF bug #1331563 ] string_subscript doesn't check for failed PyMem_Malloc. Will backport Neal Norwitz <nnorwitz@gmail.com> parents: 35665 diff changeset	1252 return PyErr_NoMemory();
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1253
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	1254 for (cur = start, i = 0; i < slicelength;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1255 cur += step, i++) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1256 result_buf[i] = source_buf[cur];
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1257 }
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	1258
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1259 result = PyString_FromStringAndSize(result_buf,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1260 slicelength);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1261 PyMem_Free(result_buf);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1262 return result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1263 }
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	1264 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1265 else {
40357 b871e7bd8355 Patch [ 1586791 ] better error msgs for some TypeErrors Georg Brandl <georg@python.org> parents: 39995 diff changeset	1266 PyErr_Format(PyExc_TypeError,
b871e7bd8355 Patch [ 1586791 ] better error msgs for some TypeErrors Georg Brandl <georg@python.org> parents: 39995 diff changeset	1267 "string indices must be integers, not %.200s",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1268 Py_TYPE(item)->tp_name);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1269 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1270 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1271 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1272
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1273 static Py_ssize_t
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1274 string_buffer_getreadbuf(PyStringObject self, Py_ssize_t index, const void *ptr)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1275 {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1276 if ( index != 0 ) {
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	1277 PyErr_SetString(PyExc_SystemError,
9305 083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1278 "accessing non-existent string segment");
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1279 return -1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1280 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1281 ptr = (void )self->ob_sval;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1282 return Py_SIZE(self);
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1283 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1284
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1285 static Py_ssize_t
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1286 string_buffer_getwritebuf(PyStringObject self, Py_ssize_t index, const void *ptr)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1287 {
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	1288 PyErr_SetString(PyExc_TypeError,
9191 4fe8a7670c0d Typo reported by Greg Stein: "modifiable" is the correct spelling. Guido van Rossum <guido@python.org> parents: 8468 diff changeset	1289 "Cannot use string as modifiable buffer");
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1290 return -1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1291 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1292
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1293 static Py_ssize_t
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1294 string_buffer_getsegcount(PyStringObject self, Py_ssize_t lenp)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1295 {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1296 if ( lenp )
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1297 *lenp = Py_SIZE(self);
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1298 return 1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1299 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1300
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1301 static Py_ssize_t
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1302 string_buffer_getcharbuf(PyStringObject self, Py_ssize_t index, const char *ptr)
9305 083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1303 {
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1304 if ( index != 0 ) {
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1305 PyErr_SetString(PyExc_SystemError,
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1306 "accessing non-existent string segment");
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1307 return -1;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1308 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1309 *ptr = self->ob_sval;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1310 return Py_SIZE(self);
9305 083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1311 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1312
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	1313 static int
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1314 string_buffer_getbuffer(PyStringObject self, Py_buffer view, int flags)
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	1315 {
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	1316 return PyBuffer_FillInfo(view, (void *)self->ob_sval, Py_SIZE(self),
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	1317 0, flags);
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	1318 }
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	1319
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1320 static PySequenceMethods string_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1321 (lenfunc)string_length, /sq_length/
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	1322 (binaryfunc)string_concat, /sq_concat/
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1323 (ssizeargfunc)string_repeat, /sq_repeat/
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1324 (ssizeargfunc)string_item, /sq_item/
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1325 (ssizessizeargfunc)string_slice, /sq_slice/
259 6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	1326 0, /sq_ass_item/
6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	1327 0, /sq_ass_slice/
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1328 (objobjproc)string_contains /sq_contains/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1329 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1330
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1331 static PyMappingMethods string_as_mapping = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1332 (lenfunc)string_length,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1333 (binaryfunc)string_subscript,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1334 0,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1335 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1336
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1337 static PyBufferProcs string_as_buffer = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1338 (readbufferproc)string_buffer_getreadbuf,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1339 (writebufferproc)string_buffer_getwritebuf,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1340 (segcountproc)string_buffer_getsegcount,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1341 (charbufferproc)string_buffer_getcharbuf,
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	1342 (getbufferproc)string_buffer_getbuffer,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	1343 0, /* XXX */
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1344 };
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1345
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1346
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1347
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1348 #define LEFTSTRIP 0
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1349 #define RIGHTSTRIP 1
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1350 #define BOTHSTRIP 2
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1351
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1352 /* Arrays indexed by above */
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1353 static const char *stripformat[] = {"\|O:lstrip", "\|O:rstrip", "\|O:strip"};
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1354
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1355 #define STRIPNAME(i) (stripformat[i]+3)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1356
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1357
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1358 /* Don't call if length < 2 */
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1359 #define Py_STRING_MATCH(target, offset, pattern, length) \
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1360 (target[offset] == pattern[0] && \
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1361 target[offset+length-1] == pattern[length-1] && \
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1362 !memcmp(target+offset+1, pattern+1, length-2) )
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1363
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1364
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1365 /* Overallocate the initial list to reduce the number of reallocs for small
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1366 split sizes. Eg, "A A A A A A A A A A".split() (10 elements) has three
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1367 resizes, to sizes 4, 8, then 16. Most observed string splits are for human
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1368 text (roughly 11 words per line) and field delimited data (usually 1-10
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1369 fields). For large strings the split algorithms are bandwidth limited
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1370 so increasing the preallocation likely will not improve things.*/
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1371
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1372 #define MAX_PREALLOC 12
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1373
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1374 /* 5 splits gives 6 elements */
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1375 #define PREALLOC_SIZE(maxsplit) \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1376 (maxsplit >= MAX_PREALLOC ? MAX_PREALLOC : maxsplit+1)
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1377
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1378 #define SPLIT_APPEND(data, left, right) \
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1379 str = PyString_FromStringAndSize((data) + (left), \
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1380 (right) - (left)); \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1381 if (str == NULL) \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1382 goto onError; \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1383 if (PyList_Append(list, str)) { \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1384 Py_DECREF(str); \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1385 goto onError; \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1386 } \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1387 else \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1388 Py_DECREF(str);
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1389
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1390 #define SPLIT_ADD(data, left, right) { \
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1391 str = PyString_FromStringAndSize((data) + (left), \
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1392 (right) - (left)); \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1393 if (str == NULL) \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1394 goto onError; \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1395 if (count < MAX_PREALLOC) { \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1396 PyList_SET_ITEM(list, count, str); \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1397 } else { \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1398 if (PyList_Append(list, str)) { \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1399 Py_DECREF(str); \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1400 goto onError; \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1401 } \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1402 else \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1403 Py_DECREF(str); \
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1404 } \
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1405 count++; }
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1406
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1407 /* Always force the list to the expected size. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1408 #define FIX_PREALLOC_SIZE(list) Py_SIZE(list) = count
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1409
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1410 #define SKIP_SPACE(s, i, len) { while (i<len && isspace(Py_CHARMASK(s[i]))) i++; }
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1411 #define SKIP_NONSPACE(s, i, len) { while (i<len && !isspace(Py_CHARMASK(s[i]))) i++; }
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1412 #define RSKIP_SPACE(s, i) { while (i>=0 && isspace(Py_CHARMASK(s[i]))) i--; }
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1413 #define RSKIP_NONSPACE(s, i) { while (i>=0 && !isspace(Py_CHARMASK(s[i]))) i--; }
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1414
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	1415 Py_LOCAL_INLINE(PyObject *)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1416 split_whitespace(PyStringObject *self, Py_ssize_t len, Py_ssize_t maxsplit)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1417 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1418 const char *s = PyString_AS_STRING(self);
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1419 Py_ssize_t i, j, count=0;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1420 PyObject *str;
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1421 PyObject *list = PyList_New(PREALLOC_SIZE(maxsplit));
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1422
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1423 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1424 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1425
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1426 i = j = 0;
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1427
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1428 while (maxsplit-- > 0) {
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1429 SKIP_SPACE(s, i, len);
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1430 if (i==len) break;
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1431 j = i; i++;
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1432 SKIP_NONSPACE(s, i, len);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1433 if (j == 0 && i == len && PyString_CheckExact(self)) {
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1434 /* No whitespace in self, so just use it as list[0] */
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1435 Py_INCREF(self);
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1436 PyList_SET_ITEM(list, 0, (PyObject *)self);
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1437 count++;
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1438 break;
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1439 }
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1440 SPLIT_ADD(s, j, i);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1441 }
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1442
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1443 if (i < len) {
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1444 /* Only occurs when maxsplit was reached */
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1445 /* Skip any remaining whitespace and copy to end of string */
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1446 SKIP_SPACE(s, i, len);
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1447 if (i != len)
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1448 SPLIT_ADD(s, i, len);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1449 }
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1450 FIX_PREALLOC_SIZE(list);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1451 return list;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1452 onError:
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1453 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1454 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1455 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1456
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	1457 Py_LOCAL_INLINE(PyObject *)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1458 split_char(PyStringObject *self, Py_ssize_t len, char ch, Py_ssize_t maxcount)
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1459 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1460 const char *s = PyString_AS_STRING(self);
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1461 register Py_ssize_t i, j, count=0;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1462 PyObject *str;
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1463 PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1464
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1465 if (list == NULL)
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1466 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1467
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1468 i = j = 0;
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1469 while ((j < len) && (maxcount-- > 0)) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1470 for(; j<len; j++) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1471 /* I found that using memchr makes no difference */
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1472 if (s[j] == ch) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1473 SPLIT_ADD(s, i, j);
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1474 i = j = j + 1;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1475 break;
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1476 }
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1477 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1478 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1479 if (i == 0 && count == 0 && PyString_CheckExact(self)) {
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1480 /* ch not in self, so just use self as list[0] */
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1481 Py_INCREF(self);
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1482 PyList_SET_ITEM(list, 0, (PyObject *)self);
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1483 count++;
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1484 }
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1485 else if (i <= len) {
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1486 SPLIT_ADD(s, i, len);
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1487 }
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1488 FIX_PREALLOC_SIZE(list);
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1489 return list;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1490
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1491 onError:
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1492 Py_DECREF(list);
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1493 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1494 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1495
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1496 PyDoc_STRVAR(split__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1497 "S.split([sep [,maxsplit]]) -> list of strings\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1498 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1499 Return a list of the words in the string S, using sep as the\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1500 delimiter string. If maxsplit is given, at most maxsplit\n\
24561 b25c31e008c8 SF 582071 clarified the .split() method's docstring to note that sep=None Raymond Hettinger <python@rcn.com> parents: 24415 diff changeset	1501 splits are done. If sep is not specified or is None, any\n\
46908 ed2c1888e143 #2809 followup: even better split docstring. Georg Brandl <georg@python.org> parents: 46898 diff changeset	1502 whitespace string is a separator and empty strings are removed\n\
ed2c1888e143 #2809 followup: even better split docstring. Georg Brandl <georg@python.org> parents: 46898 diff changeset	1503 from the result.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1504
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1505 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1506 string_split(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1507 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1508 Py_ssize_t len = PyString_GET_SIZE(self), n, i, j;
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1509 Py_ssize_t maxsplit = -1, count=0;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1510 const char s = PyString_AS_STRING(self), sub;
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1511 PyObject list, str, *subobj = Py_None;
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1512 #ifdef USE_FAST
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1513 Py_ssize_t pos;
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1514 #endif
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1515
37677 e795d6c86a5e Change maxsplit types to Py_ssize_t. Martin v. Löwis <martin@v.loewis.de> parents: 37667 diff changeset	1516 if (!PyArg_ParseTuple(args, "\|On:split", &subobj, &maxsplit))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1517 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1518 if (maxsplit < 0)
37667 b1724e926e07 Replace most INT_MAX with PY_SSIZE_T_MAX. Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1519 maxsplit = PY_SSIZE_T_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1520 if (subobj == Py_None)
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1521 return split_whitespace(self, len, maxsplit);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1522 if (PyString_Check(subobj)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1523 sub = PyString_AS_STRING(subobj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1524 n = PyString_GET_SIZE(subobj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1525 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1526 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1527 else if (PyUnicode_Check(subobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1528 return PyUnicode_Split((PyObject *)self, subobj, maxsplit);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1529 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1530 else if (PyObject_AsCharBuffer(subobj, &sub, &n))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1531 return NULL;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1532
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1533 if (n == 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1534 PyErr_SetString(PyExc_ValueError, "empty separator");
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1535 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1536 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1537 else if (n == 1)
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1538 return split_char(self, len, sub[0], maxsplit);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1539
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1540 list = PyList_New(PREALLOC_SIZE(maxsplit));
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1541 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1542 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1543
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1544 #ifdef USE_FAST
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1545 i = j = 0;
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1546 while (maxsplit-- > 0) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1547 pos = fastsearch(s+i, len-i, sub, n, FAST_SEARCH);
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1548 if (pos < 0)
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1549 break;
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1550 j = i+pos;
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1551 SPLIT_ADD(s, i, j);
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1552 i = j + n;
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1553 }
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1554 #else
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1555 i = j = 0;
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1556 while ((j+n <= len) && (maxsplit-- > 0)) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1557 for (; j+n <= len; j++) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1558 if (Py_STRING_MATCH(s, j, sub, n)) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1559 SPLIT_ADD(s, i, j);
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1560 i = j = j + n;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1561 break;
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1562 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1563 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1564 }
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1565 #endif
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1566 SPLIT_ADD(s, i, len);
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1567 FIX_PREALLOC_SIZE(list);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1568 return list;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1569
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1570 onError:
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1571 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1572 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1573 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1574
38332 eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1575 PyDoc_STRVAR(partition__doc__,
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1576 "S.partition(sep) -> (head, sep, tail)\n\
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1577 \n\
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1578 Searches for the separator sep in S, and returns the part before it,\n\
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1579 the separator itself, and the part after it. If the separator is not\n\
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1580 found, returns S and two empty strings.");
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1581
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1582 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1583 string_partition(PyStringObject self, PyObject sep_obj)
38332 eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1584 {
38384 96415105c29e needforspeed: cleanup Fredrik Lundh <fredrik@pythonware.com> parents: 38383 diff changeset	1585 const char *sep;
96415105c29e needforspeed: cleanup Fredrik Lundh <fredrik@pythonware.com> parents: 38383 diff changeset	1586 Py_ssize_t sep_len;
38332 eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1587
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1588 if (PyString_Check(sep_obj)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1589 sep = PyString_AS_STRING(sep_obj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1590 sep_len = PyString_GET_SIZE(sep_obj);
38332 eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1591 }
38335 f9332ad4287a needforspeed: partition implementation, part two. Fredrik Lundh <fredrik@pythonware.com> parents: 38332 diff changeset	1592 #ifdef Py_USING_UNICODE
f9332ad4287a needforspeed: partition implementation, part two. Fredrik Lundh <fredrik@pythonware.com> parents: 38332 diff changeset	1593 else if (PyUnicode_Check(sep_obj))
38384 96415105c29e needforspeed: cleanup Fredrik Lundh <fredrik@pythonware.com> parents: 38383 diff changeset	1594 return PyUnicode_Partition((PyObject *) self, sep_obj);
38332 eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1595 #endif
38335 f9332ad4287a needforspeed: partition implementation, part two. Fredrik Lundh <fredrik@pythonware.com> parents: 38332 diff changeset	1596 else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len))
38332 eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1597 return NULL;
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1598
38400 33c328896f52 needforspeed: stringlib refactoring, continued. added count and Fredrik Lundh <fredrik@pythonware.com> parents: 38394 diff changeset	1599 return stringlib_partition(
38384 96415105c29e needforspeed: cleanup Fredrik Lundh <fredrik@pythonware.com> parents: 38383 diff changeset	1600 (PyObject*) self,
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1601 PyString_AS_STRING(self), PyString_GET_SIZE(self),
38384 96415105c29e needforspeed: cleanup Fredrik Lundh <fredrik@pythonware.com> parents: 38383 diff changeset	1602 sep_obj, sep, sep_len
96415105c29e needforspeed: cleanup Fredrik Lundh <fredrik@pythonware.com> parents: 38383 diff changeset	1603 );
38332 eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1604 }
eb237a37ea02 needforspeed: partition for 8-bit strings. for some simple tests, Fredrik Lundh <fredrik@pythonware.com> parents: 38321 diff changeset	1605
38390 76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1606 PyDoc_STRVAR(rpartition__doc__,
39734 cfb77fff0240 Fix endcase for str.rpartition() Raymond Hettinger <python@rcn.com> parents: 39494 diff changeset	1607 "S.rpartition(sep) -> (tail, sep, head)\n\
38390 76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1608 \n\
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1609 Searches for the separator sep in S, starting at the end of S, and returns\n\
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1610 the part before it, the separator itself, and the part after it. If the\n\
39734 cfb77fff0240 Fix endcase for str.rpartition() Raymond Hettinger <python@rcn.com> parents: 39494 diff changeset	1611 separator is not found, returns two empty strings and S.");
38390 76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1612
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1613 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1614 string_rpartition(PyStringObject self, PyObject sep_obj)
38390 76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1615 {
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1616 const char *sep;
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1617 Py_ssize_t sep_len;
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1618
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1619 if (PyString_Check(sep_obj)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1620 sep = PyString_AS_STRING(sep_obj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1621 sep_len = PyString_GET_SIZE(sep_obj);
38390 76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1622 }
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1623 #ifdef Py_USING_UNICODE
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1624 else if (PyUnicode_Check(sep_obj))
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1625 return PyUnicode_Partition((PyObject *) self, sep_obj);
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1626 #endif
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1627 else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len))
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1628 return NULL;
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1629
38400 33c328896f52 needforspeed: stringlib refactoring, continued. added count and Fredrik Lundh <fredrik@pythonware.com> parents: 38394 diff changeset	1630 return stringlib_rpartition(
38390 76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1631 (PyObject*) self,
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1632 PyString_AS_STRING(self), PyString_GET_SIZE(self),
38390 76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1633 sep_obj, sep, sep_len
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1634 );
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1635 }
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	1636
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	1637 Py_LOCAL_INLINE(PyObject *)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1638 rsplit_whitespace(PyStringObject *self, Py_ssize_t len, Py_ssize_t maxsplit)
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1639 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1640 const char *s = PyString_AS_STRING(self);
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1641 Py_ssize_t i, j, count=0;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1642 PyObject *str;
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1643 PyObject *list = PyList_New(PREALLOC_SIZE(maxsplit));
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1644
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1645 if (list == NULL)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1646 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1647
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1648 i = j = len-1;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	1649
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1650 while (maxsplit-- > 0) {
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1651 RSKIP_SPACE(s, i);
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1652 if (i<0) break;
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1653 j = i; i--;
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1654 RSKIP_NONSPACE(s, i);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1655 if (j == len-1 && i < 0 && PyString_CheckExact(self)) {
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1656 /* No whitespace in self, so just use it as list[0] */
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1657 Py_INCREF(self);
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1658 PyList_SET_ITEM(list, 0, (PyObject *)self);
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1659 count++;
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1660 break;
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1661 }
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1662 SPLIT_ADD(s, i + 1, j + 1);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1663 }
38372 c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1664 if (i >= 0) {
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1665 /* Only occurs when maxsplit was reached */
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1666 /* Skip any remaining whitespace and copy to beginning of string */
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1667 RSKIP_SPACE(s, i);
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1668 if (i >= 0)
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1669 SPLIT_ADD(s, 0, i + 1);
c14e0c89a8b0 Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38365 diff changeset	1670
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1671 }
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1672 FIX_PREALLOC_SIZE(list);
38315 91c6c94490b1 needforspeed: use insert+reverse instead of append Fredrik Lundh <fredrik@pythonware.com> parents: 38311 diff changeset	1673 if (PyList_Reverse(list) < 0)
91c6c94490b1 needforspeed: use insert+reverse instead of append Fredrik Lundh <fredrik@pythonware.com> parents: 38311 diff changeset	1674 goto onError;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1675 return list;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1676 onError:
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1677 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1678 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1679 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1680
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	1681 Py_LOCAL_INLINE(PyObject *)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1682 rsplit_char(PyStringObject *self, Py_ssize_t len, char ch, Py_ssize_t maxcount)
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1683 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1684 const char *s = PyString_AS_STRING(self);
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1685 register Py_ssize_t i, j, count=0;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1686 PyObject *str;
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1687 PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1688
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1689 if (list == NULL)
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1690 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1691
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1692 i = j = len - 1;
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1693 while ((i >= 0) && (maxcount-- > 0)) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1694 for (; i >= 0; i--) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1695 if (s[i] == ch) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1696 SPLIT_ADD(s, i + 1, j + 1);
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1697 j = i = i - 1;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1698 break;
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1699 }
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1700 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1701 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1702 if (i < 0 && count == 0 && PyString_CheckExact(self)) {
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1703 /* ch not in self, so just use self as list[0] */
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1704 Py_INCREF(self);
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1705 PyList_SET_ITEM(list, 0, (PyObject *)self);
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1706 count++;
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1707 }
ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1708 else if (j >= -1) {
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1709 SPLIT_ADD(s, 0, j + 1);
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1710 }
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1711 FIX_PREALLOC_SIZE(list);
38315 91c6c94490b1 needforspeed: use insert+reverse instead of append Fredrik Lundh <fredrik@pythonware.com> parents: 38311 diff changeset	1712 if (PyList_Reverse(list) < 0)
91c6c94490b1 needforspeed: use insert+reverse instead of append Fredrik Lundh <fredrik@pythonware.com> parents: 38311 diff changeset	1713 goto onError;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1714 return list;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1715
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1716 onError:
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1717 Py_DECREF(list);
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1718 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1719 }
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1720
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1721 PyDoc_STRVAR(rsplit__doc__,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1722 "S.rsplit([sep [,maxsplit]]) -> list of strings\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1723 \n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1724 Return a list of the words in the string S, using sep as the\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1725 delimiter string, starting at the end of the string and working\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1726 to the front. If maxsplit is given, at most maxsplit splits are\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1727 done. If sep is not specified or is None, any whitespace string\n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1728 is a separator.");
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1729
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1730 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1731 string_rsplit(PyStringObject self, PyObject args)
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1732 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1733 Py_ssize_t len = PyString_GET_SIZE(self), n, i, j;
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1734 Py_ssize_t maxsplit = -1, count=0;
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1735 const char s, sub;
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1736 PyObject list, str, *subobj = Py_None;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1737
37677 e795d6c86a5e Change maxsplit types to Py_ssize_t. Martin v. Löwis <martin@v.loewis.de> parents: 37667 diff changeset	1738 if (!PyArg_ParseTuple(args, "\|On:rsplit", &subobj, &maxsplit))
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1739 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1740 if (maxsplit < 0)
37667 b1724e926e07 Replace most INT_MAX with PY_SSIZE_T_MAX. Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1741 maxsplit = PY_SSIZE_T_MAX;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1742 if (subobj == Py_None)
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1743 return rsplit_whitespace(self, len, maxsplit);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1744 if (PyString_Check(subobj)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1745 sub = PyString_AS_STRING(subobj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1746 n = PyString_GET_SIZE(subobj);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1747 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1748 #ifdef Py_USING_UNICODE
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1749 else if (PyUnicode_Check(subobj))
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1750 return PyUnicode_RSplit((PyObject *)self, subobj, maxsplit);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1751 #endif
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1752 else if (PyObject_AsCharBuffer(subobj, &sub, &n))
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1753 return NULL;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1754
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1755 if (n == 0) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1756 PyErr_SetString(PyExc_ValueError, "empty separator");
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1757 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1758 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1759 else if (n == 1)
44225 ad8b80460644 When splitting, avoid making a copy of the string if the split doesn't find Skip Montanaro <skip@pobox.com> parents: 43886 diff changeset	1760 return rsplit_char(self, len, sub[0], maxsplit);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1761
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1762 list = PyList_New(PREALLOC_SIZE(maxsplit));
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1763 if (list == NULL)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1764 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1765
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1766 j = len;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1767 i = j - n;
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1768
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1769 s = PyString_AS_STRING(self);
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1770 while ( (i >= 0) && (maxsplit-- > 0) ) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1771 for (; i>=0; i--) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1772 if (Py_STRING_MATCH(s, i, sub, n)) {
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1773 SPLIT_ADD(s, i + n, j);
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1774 j = i;
d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1775 i -= n;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1776 break;
38394 d153d2f66884 substring split now uses /F's fast string matching algorithm. Andrew Dalke <dalke@dalkescientific.com> parents: 38390 diff changeset	1777 }
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1778 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1779 }
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1780 SPLIT_ADD(s, 0, j);
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1781 FIX_PREALLOC_SIZE(list);
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1782 if (PyList_Reverse(list) < 0)
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1783 goto onError;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1784 return list;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1785
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	1786 onError:
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1787 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1788 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1789 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1790
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1791
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1792 PyDoc_STRVAR(join__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1793 "S.join(sequence) -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1794 \n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1795 Return a string which is the concatenation of the strings in the\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1796 sequence. The separator between elements is S.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1797
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1798 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1799 string_join(PyStringObject self, PyObject orig)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1800 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1801 char *sep = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1802 const Py_ssize_t seplen = PyString_GET_SIZE(self);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1803 PyObject *res = NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1804 char *p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1805 Py_ssize_t seqlen = 0;
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1806 size_t sz = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1807 Py_ssize_t i;
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1808 PyObject seq, item;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1809
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1810 seq = PySequence_Fast(orig, "");
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1811 if (seq == NULL) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1812 return NULL;
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1813 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1814
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13561 diff changeset	1815 seqlen = PySequence_Size(seq);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1816 if (seqlen == 0) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1817 Py_DECREF(seq);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1818 return PyString_FromString("");
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1819 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1820 if (seqlen == 1) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1821 item = PySequence_Fast_GET_ITEM(seq, 0);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1822 if (PyString_CheckExact(item) \|\| PyUnicode_CheckExact(item)) {
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1823 Py_INCREF(item);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1824 Py_DECREF(seq);
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1825 return item;
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1826 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1827 }
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1828
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1829 /* There are at least two things to join, or else we have a subclass
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	1830 * of the builtin types in the sequence.
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1831 * Do a pre-pass to figure out the total amount of space we'll
03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1832 * need (sz), see whether any argument is absurd, and defer to
03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1833 * the Unicode join if appropriate.
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1834 */
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1835 for (i = 0; i < seqlen; i++) {
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1836 const size_t old_sz = sz;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1837 item = PySequence_Fast_GET_ITEM(seq, i);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1838 if (!PyString_Check(item)){
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1839 #ifdef Py_USING_UNICODE
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1840 if (PyUnicode_Check(item)) {
17687 9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1841 /* Defer to Unicode join.
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1842 * CAUTION: There's no gurantee that the
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1843 * original sequence can be iterated over
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1844 * again, so we must pass seq here.
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1845 */
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1846 PyObject *result;
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1847 result = PyUnicode_Join((PyObject *)self, seq);
13528 e848d6ed3eb9 string_join(): Some cleaning up of reference counting. In the Barry Warsaw <barry@python.org> parents: 13526 diff changeset	1848 Py_DECREF(seq);
17687 9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1849 return result;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1850 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1851 #endif
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1852 PyErr_Format(PyExc_TypeError,
37787 ec00b798ab56 No need to cast a Py_ssize_t, use %z in PyErr_Format Neal Norwitz <nnorwitz@gmail.com> parents: 37702 diff changeset	1853 "sequence item %zd: expected string,"
13544 3cf4f5aee00e small updates to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13528 diff changeset	1854 " %.80s found",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	1855 i, Py_TYPE(item)->tp_name);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1856 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1857 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1858 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1859 sz += PyString_GET_SIZE(item);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1860 if (i != 0)
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1861 sz += seplen;
37667 b1724e926e07 Replace most INT_MAX with PY_SSIZE_T_MAX. Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1862 if (sz < old_sz \|\| sz > PY_SSIZE_T_MAX) {
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1863 PyErr_SetString(PyExc_OverflowError,
38709 67450db26f81 Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError. Georg Brandl <georg@python.org> parents: 38697 diff changeset	1864 "join() result is too long for a Python string");
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1865 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1866 return NULL;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1867 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1868 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1869
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1870 /* Allocate result space. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1871 res = PyString_FromStringAndSize((char*)NULL, sz);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1872 if (res == NULL) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1873 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1874 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1875 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1876
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1877 /* Catenate everything. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1878 p = PyString_AS_STRING(res);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1879 for (i = 0; i < seqlen; ++i) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1880 size_t n;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1881 item = PySequence_Fast_GET_ITEM(seq, i);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1882 n = PyString_GET_SIZE(item);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1883 Py_MEMCPY(p, PyString_AS_STRING(item), n);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1884 p += n;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1885 if (i < seqlen - 1) {
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	1886 Py_MEMCPY(p, sep, seplen);
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1887 p += seplen;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1888 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1889 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1890
13526 3686d12362b8 fix two refcount bugs in new string_join implementation: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13524 diff changeset	1891 Py_DECREF(seq);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1892 return res;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1893 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1894
18130 8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1895 PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1896 _PyString_Join(PyObject sep, PyObject x)
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1897 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1898 assert(sep != NULL && PyString_Check(sep));
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1899 assert(x != NULL);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1900 return string_join((PyStringObject *)sep, x);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1901 }
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1902
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	1903 Py_LOCAL_INLINE(void)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1904 string_adjust_indices(Py_ssize_t start, Py_ssize_t end, Py_ssize_t len)
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1905 {
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1906 if (*end > len)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1907 *end = len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1908 else if (*end < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1909 *end += len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1910 if (*end < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1911 *end = 0;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1912 if (*start < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1913 *start += len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1914 if (*start < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1915 *start = 0;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1916 }
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1917
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	1918 Py_LOCAL_INLINE(Py_ssize_t)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1919 string_find_internal(PyStringObject self, PyObject args, int dir)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1920 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1921 PyObject *subobj;
38442 8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1922 const char *sub;
8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1923 Py_ssize_t sub_len;
8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1924 Py_ssize_t start=0, end=PY_SSIZE_T_MAX;
43886 25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1925 PyObject obj_start=Py_None, obj_end=Py_None;
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1926
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1927 if (!PyArg_ParseTuple(args, "O\|OO:find/rfind/index/rindex", &subobj,
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1928 &obj_start, &obj_end))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1929 return -2;
43886 25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1930 /* To support None in "start" and "end" arguments, meaning
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1931 the same as if they were not passed.
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1932 */
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1933 if (obj_start != Py_None)
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1934 if (!_PyEval_SliceIndex(obj_start, &start))
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1935 return -2;
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1936 if (obj_end != Py_None)
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1937 if (!_PyEval_SliceIndex(obj_end, &end))
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1938 return -2;
25a5f6a30292 Now in find, rfind, index, and rindex, you can use None as defaults, Facundo Batista <facundobatista@gmail.com> parents: 43780 diff changeset	1939
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1940 if (PyString_Check(subobj)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1941 sub = PyString_AS_STRING(subobj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1942 sub_len = PyString_GET_SIZE(subobj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1943 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1944 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1945 else if (PyUnicode_Check(subobj))
38442 8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1946 return PyUnicode_Find(
8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1947 (PyObject *)self, subobj, start, end, dir);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1948 #endif
38442 8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1949 else if (PyObject_AsCharBuffer(subobj, &sub, &sub_len))
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	1950 /* XXX - the "expected a character buffer object" is pretty
551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	1951 confusing for a non-expert. remap to something else ? */
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1952 return -2;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1953
38404 52f2c9f74f5a needforspeed: stringlib refactoring: use stringlib/find for string find Fredrik Lundh <fredrik@pythonware.com> parents: 38400 diff changeset	1954 if (dir > 0)
38442 8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1955 return stringlib_find_slice(
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1956 PyString_AS_STRING(self), PyString_GET_SIZE(self),
38442 8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1957 sub, sub_len, start, end);
38404 52f2c9f74f5a needforspeed: stringlib refactoring: use stringlib/find for string find Fredrik Lundh <fredrik@pythonware.com> parents: 38400 diff changeset	1958 else
38442 8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1959 return stringlib_rfind_slice(
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1960 PyString_AS_STRING(self), PyString_GET_SIZE(self),
38442 8038e41f46cc needforspeed: stringlib refactoring: use find_slice for stringobject Fredrik Lundh <fredrik@pythonware.com> parents: 38440 diff changeset	1961 sub, sub_len, start, end);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1962 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1963
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1964
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1965 PyDoc_STRVAR(find__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1966 "S.find(sub [,start [,end]]) -> int\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1967 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1968 Return the lowest index in S where substring sub is found,\n\
42402 251033a1c2e3 Bug #1763149: use proper slice syntax in docstring. Georg Brandl <georg@python.org> parents: 42333 diff changeset	1969 such that sub is contained within s[start:end]. Optional\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1970 arguments start and end are interpreted as in slice notation.\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1971 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1972 Return -1 on failure.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1973
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1974 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1975 string_find(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1976 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1977 Py_ssize_t result = string_find_internal(self, args, +1);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1978 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1979 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1980 return PyInt_FromSsize_t(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1981 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1982
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1983
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1984 PyDoc_STRVAR(index__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1985 "S.index(sub [,start [,end]]) -> int\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1986 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1987 Like S.find() but raise ValueError when the substring is not found.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1988
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1989 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	1990 string_index(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1991 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1992 Py_ssize_t result = string_find_internal(self, args, +1);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1993 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1994 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1995 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1996 PyErr_SetString(PyExc_ValueError,
27248 c4150f7f6a69 SF patch #664192 bug #661913: inconsistent error messages between string Raymond Hettinger <python@rcn.com> parents: 27123 diff changeset	1997 "substring not found");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1998 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1999 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2000 return PyInt_FromSsize_t(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2001 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2002
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2003
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2004 PyDoc_STRVAR(rfind__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2005 "S.rfind(sub [,start [,end]]) -> int\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2006 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2007 Return the highest index in S where substring sub is found,\n\
42402 251033a1c2e3 Bug #1763149: use proper slice syntax in docstring. Georg Brandl <georg@python.org> parents: 42333 diff changeset	2008 such that sub is contained within s[start:end]. Optional\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2009 arguments start and end are interpreted as in slice notation.\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2010 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2011 Return -1 on failure.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2012
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2013 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2014 string_rfind(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2015 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2016 Py_ssize_t result = string_find_internal(self, args, -1);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2017 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2018 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2019 return PyInt_FromSsize_t(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2020 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2021
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2022
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2023 PyDoc_STRVAR(rindex__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2024 "S.rindex(sub [,start [,end]]) -> int\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2025 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2026 Like S.rfind() but raise ValueError when the substring is not found.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2027
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2028 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2029 string_rindex(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2030 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2031 Py_ssize_t result = string_find_internal(self, args, -1);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2032 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2033 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2034 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2035 PyErr_SetString(PyExc_ValueError,
27248 c4150f7f6a69 SF patch #664192 bug #661913: inconsistent error messages between string Raymond Hettinger <python@rcn.com> parents: 27123 diff changeset	2036 "substring not found");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2037 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2038 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2039 return PyInt_FromSsize_t(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2040 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2041
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2042
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	2043 Py_LOCAL_INLINE(PyObject *)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2044 do_xstrip(PyStringObject self, int striptype, PyObject sepobj)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2045 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2046 char *s = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2047 Py_ssize_t len = PyString_GET_SIZE(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2048 char *sep = PyString_AS_STRING(sepobj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2049 Py_ssize_t seplen = PyString_GET_SIZE(sepobj);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2050 Py_ssize_t i, j;
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2051
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2052 i = 0;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2053 if (striptype != RIGHTSTRIP) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2054 while (i < len && memchr(sep, Py_CHARMASK(s[i]), seplen)) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2055 i++;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2056 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2057 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2058
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2059 j = len;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2060 if (striptype != LEFTSTRIP) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2061 do {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2062 j--;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2063 } while (j >= i && memchr(sep, Py_CHARMASK(s[j]), seplen));
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2064 j++;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2065 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2066
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2067 if (i == 0 && j == len && PyString_CheckExact(self)) {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2068 Py_INCREF(self);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2069 return (PyObject*)self;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2070 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2071 else
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2072 return PyString_FromStringAndSize(s+i, j-i);
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2073 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2074
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2075
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	2076 Py_LOCAL_INLINE(PyObject *)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2077 do_strip(PyStringObject *self, int striptype)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2078 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2079 char *s = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2080 Py_ssize_t len = PyString_GET_SIZE(self), i, j;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2081
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2082 i = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2083 if (striptype != RIGHTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2084 while (i < len && isspace(Py_CHARMASK(s[i]))) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2085 i++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2086 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2087 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2088
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2089 j = len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2090 if (striptype != LEFTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2091 do {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2092 j--;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2093 } while (j >= i && isspace(Py_CHARMASK(s[j])));
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2094 j++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2095 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2096
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2097 if (i == 0 && j == len && PyString_CheckExact(self)) {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2098 Py_INCREF(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2099 return (PyObject*)self;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2100 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2101 else
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2102 return PyString_FromStringAndSize(s+i, j-i);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2103 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2104
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2105
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	2106 Py_LOCAL_INLINE(PyObject *)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2107 do_argstrip(PyStringObject self, int striptype, PyObject args)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2108 {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2109 PyObject *sep = NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2110
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2111 if (!PyArg_ParseTuple(args, (char *)stripformat[striptype], &sep))
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2112 return NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2113
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2114 if (sep != NULL && sep != Py_None) {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2115 if (PyString_Check(sep))
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2116 return do_xstrip(self, striptype, sep);
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	2117 #ifdef Py_USING_UNICODE
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2118 else if (PyUnicode_Check(sep)) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2119 PyObject uniself = PyUnicode_FromObject((PyObject )self);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2120 PyObject *res;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2121 if (uniself==NULL)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2122 return NULL;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2123 res = _PyUnicode_XStrip((PyUnicodeObject *)uniself,
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2124 striptype, sep);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2125 Py_DECREF(uniself);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2126 return res;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2127 }
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	2128 #endif
37516 7cd3bf2399e6 Remove dead code (reported by HP compiler). Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	2129 PyErr_Format(PyExc_TypeError,
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	2130 #ifdef Py_USING_UNICODE
37516 7cd3bf2399e6 Remove dead code (reported by HP compiler). Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	2131 "%s arg must be None, str or unicode",
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	2132 #else
37516 7cd3bf2399e6 Remove dead code (reported by HP compiler). Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	2133 "%s arg must be None or str",
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	2134 #endif
37516 7cd3bf2399e6 Remove dead code (reported by HP compiler). Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	2135 STRIPNAME(striptype));
7cd3bf2399e6 Remove dead code (reported by HP compiler). Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	2136 return NULL;
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2137 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2138
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2139 return do_strip(self, striptype);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2140 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2141
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2142
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2143 PyDoc_STRVAR(strip__doc__,
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2144 "S.strip([chars]) -> string or unicode\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2145 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2146 Return a copy of the string S with leading and trailing\n\
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2147 whitespace removed.\n\
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2148 If chars is given and not None, remove characters in chars instead.\n\
215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2149 If chars is unicode, S will be converted to unicode before stripping");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2150
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2151 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2152 string_strip(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2153 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2154 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2155 return do_strip(self, BOTHSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2156 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2157 return do_argstrip(self, BOTHSTRIP, args);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2158 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2159
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2160
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2161 PyDoc_STRVAR(lstrip__doc__,
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2162 "S.lstrip([chars]) -> string or unicode\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2163 \n\
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2164 Return a copy of the string S with leading whitespace removed.\n\
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2165 If chars is given and not None, remove characters in chars instead.\n\
215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2166 If chars is unicode, S will be converted to unicode before stripping");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2167
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2168 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2169 string_lstrip(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2170 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2171 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2172 return do_strip(self, LEFTSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2173 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2174 return do_argstrip(self, LEFTSTRIP, args);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2175 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2176
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2177
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2178 PyDoc_STRVAR(rstrip__doc__,
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2179 "S.rstrip([chars]) -> string or unicode\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2180 \n\
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2181 Return a copy of the string S with trailing whitespace removed.\n\
28575 215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2182 If chars is given and not None, remove characters in chars instead.\n\
215f1f4851a4 Attempt to make all the various string strip methods the same. Neal Norwitz <nnorwitz@gmail.com>* parents: 28559 diff changeset	2183 If chars is unicode, S will be converted to unicode before stripping");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2184
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2185 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2186 string_rstrip(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2187 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2188 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2189 return do_strip(self, RIGHTSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2190 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2191 return do_argstrip(self, RIGHTSTRIP, args);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2192 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2193
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2194
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2195 PyDoc_STRVAR(lower__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2196 "S.lower() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2197 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2198 Return a copy of the string S converted to lowercase.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2199
38294 41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2200 /* _tolower and _toupper are defined by SUSv2, but they're not ISO C */
41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2201 #ifndef _tolower
41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2202 #define _tolower tolower
41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2203 #endif
41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2204
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2205 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2206 string_lower(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2207 {
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2208 char *s;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2209 Py_ssize_t i, n = PyString_GET_SIZE(self);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2210 PyObject *newobj;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2211
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2212 newobj = PyString_FromStringAndSize(NULL, n);
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2213 if (!newobj)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2214 return NULL;
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2215
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2216 s = PyString_AS_STRING(newobj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2217
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2218 Py_MEMCPY(s, PyString_AS_STRING(self), n);
38292 e15b14c7fa14 needforspeed: make new upper/lower work properly for single-character Fredrik Lundh <fredrik@pythonware.com> parents: 38291 diff changeset	2219
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2220 for (i = 0; i < n; i++) {
38292 e15b14c7fa14 needforspeed: make new upper/lower work properly for single-character Fredrik Lundh <fredrik@pythonware.com> parents: 38291 diff changeset	2221 int c = Py_CHARMASK(s[i]);
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2222 if (isupper(c))
ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2223 s[i] = _tolower(c);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2224 }
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2225
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2226 return newobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2227 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2228
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2229 PyDoc_STRVAR(upper__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2230 "S.upper() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2231 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2232 Return a copy of the string S converted to uppercase.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2233
38294 41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2234 #ifndef _toupper
41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2235 #define _toupper toupper
41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2236 #endif
41768de17ead needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C Fredrik Lundh <fredrik@pythonware.com> parents: 38292 diff changeset	2237
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2238 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2239 string_upper(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2240 {
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2241 char *s;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2242 Py_ssize_t i, n = PyString_GET_SIZE(self);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2243 PyObject *newobj;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2244
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2245 newobj = PyString_FromStringAndSize(NULL, n);
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2246 if (!newobj)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2247 return NULL;
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2248
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2249 s = PyString_AS_STRING(newobj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2250
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2251 Py_MEMCPY(s, PyString_AS_STRING(self), n);
38292 e15b14c7fa14 needforspeed: make new upper/lower work properly for single-character Fredrik Lundh <fredrik@pythonware.com> parents: 38291 diff changeset	2252
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2253 for (i = 0; i < n; i++) {
38292 e15b14c7fa14 needforspeed: make new upper/lower work properly for single-character Fredrik Lundh <fredrik@pythonware.com> parents: 38291 diff changeset	2254 int c = Py_CHARMASK(s[i]);
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2255 if (islower(c))
ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2256 s[i] = _toupper(c);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2257 }
38291 ad1e2438cfaa needforspeed: speed up upper and lower for 8-bit string objects. Fredrik Lundh <fredrik@pythonware.com> parents: 38236 diff changeset	2258
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2259 return newobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2260 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2261
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2262 PyDoc_STRVAR(title__doc__,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2263 "S.title() -> string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2264 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2265 Return a titlecased version of S, i.e. words start with uppercase\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2266 characters, all remaining cased characters have lowercase.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2267
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2268 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2269 string_title(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2270 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2271 char s = PyString_AS_STRING(self), s_new;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2272 Py_ssize_t i, n = PyString_GET_SIZE(self);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2273 int previous_is_cased = 0;
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2274 PyObject *newobj;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2275
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2276 newobj = PyString_FromStringAndSize(NULL, n);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2277 if (newobj == NULL)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2278 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2279 s_new = PyString_AsString(newobj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2280 for (i = 0; i < n; i++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2281 int c = Py_CHARMASK(*s++);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2282 if (islower(c)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2283 if (!previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2284 c = toupper(c);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2285 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2286 } else if (isupper(c)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2287 if (previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2288 c = tolower(c);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2289 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2290 } else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2291 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2292 *s_new++ = c;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2293 }
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2294 return newobj;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2295 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2296
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2297 PyDoc_STRVAR(capitalize__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2298 "S.capitalize() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2299 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2300 Return a copy of the string S with only its first character\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2301 capitalized.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2302
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2303 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2304 string_capitalize(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2305 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2306 char s = PyString_AS_STRING(self), s_new;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2307 Py_ssize_t i, n = PyString_GET_SIZE(self);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2308 PyObject *newobj;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2309
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2310 newobj = PyString_FromStringAndSize(NULL, n);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2311 if (newobj == NULL)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2312 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2313 s_new = PyString_AsString(newobj);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2314 if (0 < n) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2315 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2316 if (islower(c))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2317 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2318 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2319 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2320 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2321 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2322 for (i = 1; i < n; i++) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2323 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2324 if (isupper(c))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2325 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2326 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2327 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2328 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2329 }
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2330 return newobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2331 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2332
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2333
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2334 PyDoc_STRVAR(count__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2335 "S.count(sub[, start[, end]]) -> int\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2336 \n\
38236 7e16fcce34a1 docstring tweaks: count counts non-overlapping substrings, not Fredrik Lundh <fredrik@pythonware.com> parents: 38173 diff changeset	2337 Return the number of non-overlapping occurrences of substring sub in\n\
7e16fcce34a1 docstring tweaks: count counts non-overlapping substrings, not Fredrik Lundh <fredrik@pythonware.com> parents: 38173 diff changeset	2338 string S[start:end]. Optional arguments start and end are interpreted\n\
7e16fcce34a1 docstring tweaks: count counts non-overlapping substrings, not Fredrik Lundh <fredrik@pythonware.com> parents: 38173 diff changeset	2339 as in slice notation.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2340
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2341 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2342 string_count(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2343 {
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2344 PyObject *sub_obj;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2345 const char str = PyString_AS_STRING(self), sub;
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2346 Py_ssize_t sub_len;
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2347 Py_ssize_t start = 0, end = PY_SSIZE_T_MAX;
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2348
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2349 if (!PyArg_ParseTuple(args, "O\|O&O&:count", &sub_obj,
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2350 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2351 return NULL;
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2352
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2353 if (PyString_Check(sub_obj)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2354 sub = PyString_AS_STRING(sub_obj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2355 sub_len = PyString_GET_SIZE(sub_obj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2356 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2357 #ifdef Py_USING_UNICODE
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2358 else if (PyUnicode_Check(sub_obj)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2359 Py_ssize_t count;
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2360 count = PyUnicode_Count((PyObject *)self, sub_obj, start, end);
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2361 if (count == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2362 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2363 else
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2364 return PyInt_FromSsize_t(count);
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2365 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2366 #endif
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2367 else if (PyObject_AsCharBuffer(sub_obj, &sub, &sub_len))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2368 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2369
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2370 string_adjust_indices(&start, &end, PyString_GET_SIZE(self));
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2371
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2372 return PyInt_FromSsize_t(
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2373 stringlib_count(str + start, end - start, sub, sub_len)
3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2374 );
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2375 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2376
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2377 PyDoc_STRVAR(swapcase__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2378 "S.swapcase() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2379 \n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2380 Return a copy of the string S with uppercase characters\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2381 converted to lowercase and vice versa.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2382
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2383 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2384 string_swapcase(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2385 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2386 char s = PyString_AS_STRING(self), s_new;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2387 Py_ssize_t i, n = PyString_GET_SIZE(self);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2388 PyObject *newobj;
1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2389
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2390 newobj = PyString_FromStringAndSize(NULL, n);
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2391 if (newobj == NULL)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2392 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2393 s_new = PyString_AsString(newobj);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2394 for (i = 0; i < n; i++) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2395 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2396 if (islower(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2397 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2398 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2399 else if (isupper(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2400 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2401 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2402 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2403 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2404 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2405 }
37596 1b078493d538 More low-hanging fruit. Still need to re-arrange some code (or find a better Anthony Baxter <anthonybaxter@gmail.com> parents: 37516 diff changeset	2406 return newobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2407 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2408
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2409
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2410 PyDoc_STRVAR(translate__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2411 "S.translate(table [,deletechars]) -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2412 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2413 Return a copy of the string S, where all characters occurring\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2414 in the optional argument deletechars are removed, and the\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2415 remaining characters have been mapped through the given\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2416 translation table, which must be a string of length 256.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2417
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2418 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2419 string_translate(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2420 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2421 register char input, output;
41440 cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2422 const char *table;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2423 register Py_ssize_t i, c, changed = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2424 PyObject input_obj = (PyObject)self;
41440 cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2425 const char output_start, del_table=NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2426 Py_ssize_t inlen, tablen, dellen = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2427 PyObject *result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2428 int trans_table[256];
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2429 PyObject tableobj, delobj = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2430
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26625 diff changeset	2431 if (!PyArg_UnpackTuple(args, "translate", 1, 2,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2432 &tableobj, &delobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2433 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2434
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2435 if (PyString_Check(tableobj)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2436 table = PyString_AS_STRING(tableobj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2437 tablen = PyString_GET_SIZE(tableobj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2438 }
41440 cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2439 else if (tableobj == Py_None) {
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2440 table = NULL;
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2441 tablen = 256;
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2442 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2443 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2444 else if (PyUnicode_Check(tableobj)) {
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2445 /* Unicode .translate() does not support the deletechars
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2446 parameter; instead a mapping to None will cause characters
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2447 to be deleted. */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2448 if (delobj != NULL) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2449 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2450 "deletions are implemented differently for unicode");
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2451 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2452 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2453 return PyUnicode_Translate((PyObject *)self, tableobj, NULL);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2454 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2455 #endif
41440 cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2456 else if (PyObject_AsCharBuffer(tableobj, &table, &tablen))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2457 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2458
26625 ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	2459 if (tablen != 256) {
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	2460 PyErr_SetString(PyExc_ValueError,
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	2461 "translation table must be 256 characters long");
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	2462 return NULL;
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	2463 }
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	2464
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2465 if (delobj != NULL) {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2466 if (PyString_Check(delobj)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2467 del_table = PyString_AS_STRING(delobj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2468 dellen = PyString_GET_SIZE(delobj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2469 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2470 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2471 else if (PyUnicode_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2472 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2473 "deletions are implemented differently for unicode");
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2474 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2475 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2476 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2477 else if (PyObject_AsCharBuffer(delobj, &del_table, &dellen))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2478 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2479 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2480 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2481 del_table = NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2482 dellen = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2483 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2484
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2485 inlen = PyString_GET_SIZE(input_obj);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2486 result = PyString_FromStringAndSize((char *)NULL, inlen);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2487 if (result == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2488 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2489 output_start = output = PyString_AsString(result);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2490 input = PyString_AS_STRING(input_obj);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2491
41440 cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2492 if (dellen == 0 && table != NULL) {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2493 /* If no deletions are required, use faster code */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2494 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2495 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2496 if (Py_CHARMASK((*output++ = table[c])) != c)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2497 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2498 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2499 if (changed \|\| !PyString_CheckExact(input_obj))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2500 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2501 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2502 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2503 return input_obj;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2504 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2505
41440 cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2506 if (table == NULL) {
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2507 for (i = 0; i < 256; i++)
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2508 trans_table[i] = Py_CHARMASK(i);
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2509 } else {
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2510 for (i = 0; i < 256; i++)
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2511 trans_table[i] = Py_CHARMASK(table[i]);
cedc8d7d1c7f SF 1193128: Let str.translate(None) be an identity transformation Raymond Hettinger <python@rcn.com> parents: 40925 diff changeset	2512 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2513
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2514 for (i = 0; i < dellen; i++)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2515 trans_table[(int) Py_CHARMASK(del_table[i])] = -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2516
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2517 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2518 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2519 if (trans_table[c] != -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2520 if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2521 continue;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2522 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2523 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2524 if (!changed && PyString_CheckExact(input_obj)) {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2525 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2526 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2527 return input_obj;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2528 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2529 /* Fix the size of the resulting string */
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	2530 if (inlen > 0)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2531 _PyString_Resize(&result, output - output_start);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2532 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2533 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2534
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2535
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2536 #define FORWARD 1
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2537 #define REVERSE -1
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2538
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2539 /* find and count characters and substrings */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2540
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2541 #define findchar(target, target_len, c) \
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2542 ((char )memchr((const void )(target), c, target_len))
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2543
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2544 /* String ops must return a string. */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2545 /* If the object is subclass of string, create a copy */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2546 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2547 return_self(PyStringObject *self)
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2548 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2549 if (PyString_CheckExact(self)) {
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2550 Py_INCREF(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2551 return self;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2552 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2553 return (PyStringObject *)PyString_FromStringAndSize(
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2554 PyString_AS_STRING(self),
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2555 PyString_GET_SIZE(self));
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2556 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2557
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	2558 Py_LOCAL_INLINE(Py_ssize_t)
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2559 countchar(const char *target, int target_len, char c, Py_ssize_t maxcount)
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2560 {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2561 Py_ssize_t count=0;
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2562 const char *start=target;
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2563 const char *end=target+target_len;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2564
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2565 while ( (start=findchar(start, end-start, c)) != NULL ) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2566 count++;
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2567 if (count >= maxcount)
4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2568 break;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2569 start += 1;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2570 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2571 return count;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2572 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2573
38376 a16948e9915e needforspeed: use Py_LOCAL on a few more locals in stringobject.c Fredrik Lundh <fredrik@pythonware.com> parents: 38372 diff changeset	2574 Py_LOCAL(Py_ssize_t)
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2575 findstring(const char *target, Py_ssize_t target_len,
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2576 const char *pattern, Py_ssize_t pattern_len,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2577 Py_ssize_t start,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2578 Py_ssize_t end,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2579 int direction)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2580 {
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2581 if (start < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2582 start += target_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2583 if (start < 0)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2584 start = 0;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2585 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2586 if (end > target_len) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2587 end = target_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2588 } else if (end < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2589 end += target_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2590 if (end < 0)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2591 end = 0;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2592 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2593
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2594 /* zero-length substrings always match at the first attempt */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2595 if (pattern_len == 0)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2596 return (direction > 0) ? start : end;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2597
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2598 end -= pattern_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2599
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2600 if (direction < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2601 for (; end >= start; end--)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2602 if (Py_STRING_MATCH(target, end, pattern, pattern_len))
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2603 return end;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2604 } else {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2605 for (; start <= end; start++)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2606 if (Py_STRING_MATCH(target, start, pattern, pattern_len))
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2607 return start;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2608 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2609 return -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2610 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2611
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	2612 Py_LOCAL_INLINE(Py_ssize_t)
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2613 countstring(const char *target, Py_ssize_t target_len,
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2614 const char *pattern, Py_ssize_t pattern_len,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2615 Py_ssize_t start,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2616 Py_ssize_t end,
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2617 int direction, Py_ssize_t maxcount)
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2618 {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2619 Py_ssize_t count=0;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2620
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2621 if (start < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2622 start += target_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2623 if (start < 0)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2624 start = 0;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2625 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2626 if (end > target_len) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2627 end = target_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2628 } else if (end < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2629 end += target_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2630 if (end < 0)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2631 end = 0;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2632 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2633
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2634 /* zero-length substrings match everywhere */
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2635 if (pattern_len == 0 \|\| maxcount == 0) {
4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2636 if (target_len+1 < maxcount)
4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2637 return target_len+1;
4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2638 return maxcount;
4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2639 }
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2640
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2641 end -= pattern_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2642 if (direction < 0) {
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2643 for (; (end >= start); end--)
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2644 if (Py_STRING_MATCH(target, end, pattern, pattern_len)) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2645 count++;
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2646 if (--maxcount <= 0) break;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2647 end -= pattern_len-1;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2648 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2649 } else {
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2650 for (; (start <= end); start++)
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2651 if (Py_STRING_MATCH(target, start, pattern, pattern_len)) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2652 count++;
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2653 if (--maxcount <= 0)
4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2654 break;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2655 start += pattern_len-1;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2656 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2657 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2658 return count;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2659 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2660
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2661
38424 3d81faf47af7 needforspeed: more stringlib refactoring Fredrik Lundh <fredrik@pythonware.com> parents: 38417 diff changeset	2662 /* Algorithms for different cases of string replacement */
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2663
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2664 /* len(self)>=1, from="", len(to)>=1, maxcount>=1 */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2665 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2666 replace_interleave(PyStringObject *self,
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2667 const char *to_s, Py_ssize_t to_len,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2668 Py_ssize_t maxcount)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2669 {
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2670 char self_s, result_s;
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2671 Py_ssize_t self_len, result_len;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2672 Py_ssize_t count, i, product;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2673 PyStringObject *result;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2674
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2675 self_len = PyString_GET_SIZE(self);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2676
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2677 /* 1 at the end plus 1 after every character */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2678 count = self_len+1;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2679 if (maxcount < count)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2680 count = maxcount;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2681
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2682 /* Check for overflow */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2683 /* result_len = count * to_len + self_len; */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2684 product = count * to_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2685 if (product / to_len != count) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2686 PyErr_SetString(PyExc_OverflowError,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2687 "replace string is too long");
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2688 return NULL;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2689 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2690 result_len = product + self_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2691 if (result_len < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2692 PyErr_SetString(PyExc_OverflowError,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2693 "replace string is too long");
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2694 return NULL;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2695 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2696
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2697 if (! (result = (PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2698 PyString_FromStringAndSize(NULL, result_len)) )
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2699 return NULL;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2700
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2701 self_s = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2702 result_s = PyString_AS_STRING(result);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2703
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2704 /* TODO: special case single character, which doesn't need memcpy */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2705
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2706 /* Lay the first one down (guaranteed this will occur) */
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2707 Py_MEMCPY(result_s, to_s, to_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2708 result_s += to_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2709 count -= 1;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2710
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2711 for (i=0; i<count; i++) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2712 result_s++ = self_s++;
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2713 Py_MEMCPY(result_s, to_s, to_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2714 result_s += to_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2715 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2716
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2717 /* Copy the rest of the original string */
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2718 Py_MEMCPY(result_s, self_s, self_len-i);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2719
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2720 return result;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2721 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2722
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2723 /* Special case for deleting a single character */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2724 /* len(self)>=1, len(from)==1, to="", maxcount>=1 */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2725 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2726 replace_delete_single_character(PyStringObject *self,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2727 char from_c, Py_ssize_t maxcount)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2728 {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2729 char self_s, result_s;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2730 char start, next, *end;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2731 Py_ssize_t self_len, result_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2732 Py_ssize_t count;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2733 PyStringObject *result;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2734
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2735 self_len = PyString_GET_SIZE(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2736 self_s = PyString_AS_STRING(self);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2737
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2738 count = countchar(self_s, self_len, from_c, maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2739 if (count == 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2740 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2741 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2742
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2743 result_len = self_len - count; /* from_len == 1 */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2744 assert(result_len>=0);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2745
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2746 if ( (result = (PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2747 PyString_FromStringAndSize(NULL, result_len)) == NULL)
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2748 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2749 result_s = PyString_AS_STRING(result);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2750
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2751 start = self_s;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2752 end = self_s + self_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2753 while (count-- > 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2754 next = findchar(start, end-start, from_c);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2755 if (next == NULL)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2756 break;
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2757 Py_MEMCPY(result_s, start, next-start);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2758 result_s += (next-start);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2759 start = next+1;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2760 }
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2761 Py_MEMCPY(result_s, start, end-start);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2762
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2763 return result;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2764 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2765
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2766 /* len(self)>=1, len(from)>=2, to="", maxcount>=1 */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2767
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2768 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2769 replace_delete_substring(PyStringObject *self,
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2770 const char *from_s, Py_ssize_t from_len,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2771 Py_ssize_t maxcount) {
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2772 char self_s, result_s;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2773 char start, next, *end;
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2774 Py_ssize_t self_len, result_len;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2775 Py_ssize_t count, offset;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2776 PyStringObject *result;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2777
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2778 self_len = PyString_GET_SIZE(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2779 self_s = PyString_AS_STRING(self);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2780
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2781 count = countstring(self_s, self_len,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2782 from_s, from_len,
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2783 0, self_len, 1,
4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2784 maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2785
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2786 if (count == 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2787 /* no matches */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2788 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2789 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2790
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2791 result_len = self_len - (count * from_len);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2792 assert (result_len>=0);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2793
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2794 if ( (result = (PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2795 PyString_FromStringAndSize(NULL, result_len)) == NULL )
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2796 return NULL;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2797
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2798 result_s = PyString_AS_STRING(result);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2799
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2800 start = self_s;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2801 end = self_s + self_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2802 while (count-- > 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2803 offset = findstring(start, end-start,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2804 from_s, from_len,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2805 0, end-start, FORWARD);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2806 if (offset == -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2807 break;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2808 next = start + offset;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2809
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2810 Py_MEMCPY(result_s, start, next-start);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2811
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2812 result_s += (next-start);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2813 start = next+from_len;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2814 }
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2815 Py_MEMCPY(result_s, start, end-start);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2816 return result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2817 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2818
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2819 /* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2820 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2821 replace_single_character_in_place(PyStringObject *self,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2822 char from_c, char to_c,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2823 Py_ssize_t maxcount)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2824 {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2825 char self_s, result_s, start, end, *next;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2826 Py_ssize_t self_len;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2827 PyStringObject *result;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2828
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2829 /* The result string will be the same size */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2830 self_s = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2831 self_len = PyString_GET_SIZE(self);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2832
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2833 next = findchar(self_s, self_len, from_c);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2834
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2835 if (next == NULL) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2836 /* No matches; return the original string */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2837 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2838 }
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2839
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2840 /* Need to make a new string */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2841 result = (PyStringObject *) PyString_FromStringAndSize(NULL, self_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2842 if (result == NULL)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2843 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2844 result_s = PyString_AS_STRING(result);
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2845 Py_MEMCPY(result_s, self_s, self_len);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2846
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2847 /* change everything in-place, starting with this one */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2848 start = result_s + (next-self_s);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2849 *start = to_c;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2850 start++;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2851 end = result_s + self_len;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2852
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2853 while (--maxcount > 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2854 next = findchar(start, end-start, from_c);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2855 if (next == NULL)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2856 break;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2857 *next = to_c;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2858 start = next+1;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2859 }
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2860
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2861 return result;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2862 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2863
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2864 /* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2865 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2866 replace_substring_in_place(PyStringObject *self,
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2867 const char *from_s, Py_ssize_t from_len,
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2868 const char *to_s, Py_ssize_t to_len,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2869 Py_ssize_t maxcount)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2870 {
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2871 char result_s, start, *end;
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2872 char *self_s;
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2873 Py_ssize_t self_len, offset;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2874 PyStringObject *result;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2875
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2876 /* The result string will be the same size */
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2877
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2878 self_s = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2879 self_len = PyString_GET_SIZE(self);
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2880
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2881 offset = findstring(self_s, self_len,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2882 from_s, from_len,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2883 0, self_len, FORWARD);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2884 if (offset == -1) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2885 /* No matches; return the original string */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2886 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2887 }
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2888
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2889 /* Need to make a new string */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2890 result = (PyStringObject *) PyString_FromStringAndSize(NULL, self_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2891 if (result == NULL)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2892 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2893 result_s = PyString_AS_STRING(result);
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2894 Py_MEMCPY(result_s, self_s, self_len);
38302 9c08a7bdbc31 Fixed problem identified by Georg. The special-case in-place code for replace Andrew Dalke <dalke@dalkescientific.com> parents: 38300 diff changeset	2895
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2896 /* change everything in-place, starting with this one */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2897 start = result_s + offset;
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2898 Py_MEMCPY(start, to_s, from_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2899 start += from_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2900 end = result_s + self_len;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2901
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2902 while ( --maxcount > 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2903 offset = findstring(start, end-start,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2904 from_s, from_len,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2905 0, end-start, FORWARD);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2906 if (offset==-1)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2907 break;
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2908 Py_MEMCPY(start+offset, to_s, from_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2909 start += offset+from_len;
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2910 }
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2911
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2912 return result;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2913 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2914
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2915 /* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2916 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2917 replace_single_character(PyStringObject *self,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2918 char from_c,
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2919 const char *to_s, Py_ssize_t to_len,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2920 Py_ssize_t maxcount)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2921 {
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2922 char self_s, result_s;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2923 char start, next, *end;
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2924 Py_ssize_t self_len, result_len;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2925 Py_ssize_t count, product;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2926 PyStringObject *result;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2927
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2928 self_s = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2929 self_len = PyString_GET_SIZE(self);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2930
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2931 count = countchar(self_s, self_len, from_c, maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2932 if (count == 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2933 /* no matches, return unchanged */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2934 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2935 }
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2936
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2937 /* use the difference between current and new, hence the "-1" */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2938 /* result_len = self_len + count * (to_len-1) */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2939 product = count * (to_len-1);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2940 if (product / (to_len-1) != count) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2941 PyErr_SetString(PyExc_OverflowError, "replace string is too long");
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2942 return NULL;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2943 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2944 result_len = self_len + product;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2945 if (result_len < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2946 PyErr_SetString(PyExc_OverflowError, "replace string is too long");
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2947 return NULL;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2948 }
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2949
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2950 if ( (result = (PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2951 PyString_FromStringAndSize(NULL, result_len)) == NULL)
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2952 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2953 result_s = PyString_AS_STRING(result);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2954
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2955 start = self_s;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2956 end = self_s + self_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2957 while (count-- > 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2958 next = findchar(start, end-start, from_c);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2959 if (next == NULL)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2960 break;
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2961
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2962 if (next == start) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2963 /* replace with the 'to' */
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2964 Py_MEMCPY(result_s, to_s, to_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2965 result_s += to_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2966 start += 1;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2967 } else {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2968 /* copy the unchanged old then the 'to' */
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2969 Py_MEMCPY(result_s, start, next-start);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2970 result_s += (next-start);
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2971 Py_MEMCPY(result_s, to_s, to_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2972 result_s += to_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2973 start = next+1;
25004 762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	2974 }
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2975 }
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2976 /* Copy the remainder of the remaining string */
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	2977 Py_MEMCPY(result_s, start, end-start);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	2978
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2979 return result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2980 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2981
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2982 /* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2983 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2984 replace_substring(PyStringObject *self,
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2985 const char *from_s, Py_ssize_t from_len,
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2986 const char *to_s, Py_ssize_t to_len,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2987 Py_ssize_t maxcount) {
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2988 char self_s, result_s;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2989 char start, next, *end;
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2990 Py_ssize_t self_len, result_len;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2991 Py_ssize_t count, offset, product;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2992 PyStringObject *result;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2993
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2994 self_s = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	2995 self_len = PyString_GET_SIZE(self);
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	2996
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2997 count = countstring(self_s, self_len,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	2998 from_s, from_len,
38410 4697d1958ccb Added limits to the replace code so it does not count all of the matching Andrew Dalke <dalke@dalkescientific.com> parents: 38404 diff changeset	2999 0, self_len, FORWARD, maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3000 if (count == 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3001 /* no matches, return unchanged */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3002 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3003 }
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3004
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3005 /* Check for overflow */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3006 /* result_len = self_len + count * (to_len-from_len) */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3007 product = count * (to_len-from_len);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3008 if (product / (to_len-from_len) != count) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3009 PyErr_SetString(PyExc_OverflowError, "replace string is too long");
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3010 return NULL;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3011 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3012 result_len = self_len + product;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3013 if (result_len < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3014 PyErr_SetString(PyExc_OverflowError, "replace string is too long");
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3015 return NULL;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3016 }
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	3017
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3018 if ( (result = (PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3019 PyString_FromStringAndSize(NULL, result_len)) == NULL)
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3020 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3021 result_s = PyString_AS_STRING(result);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	3022
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3023 start = self_s;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3024 end = self_s + self_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3025 while (count-- > 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3026 offset = findstring(start, end-start,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3027 from_s, from_len,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3028 0, end-start, FORWARD);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3029 if (offset == -1)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3030 break;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3031 next = start+offset;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3032 if (next == start) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3033 /* replace with the 'to' */
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	3034 Py_MEMCPY(result_s, to_s, to_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3035 result_s += to_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3036 start += from_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3037 } else {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3038 /* copy the unchanged old then the 'to' */
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	3039 Py_MEMCPY(result_s, start, next-start);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3040 result_s += (next-start);
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	3041 Py_MEMCPY(result_s, to_s, to_len);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3042 result_s += to_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3043 start = next+from_len;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3044 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3045 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3046 /* Copy the remainder of the remaining string */
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	3047 Py_MEMCPY(result_s, start, end-start);
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	3048
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3049 return result;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3050 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3051
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3052
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3053 Py_LOCAL(PyStringObject *)
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3054 replace(PyStringObject *self,
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3055 const char *from_s, Py_ssize_t from_len,
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3056 const char *to_s, Py_ssize_t to_len,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3057 Py_ssize_t maxcount)
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3058 {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3059 if (maxcount < 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3060 maxcount = PY_SSIZE_T_MAX;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3061 } else if (maxcount == 0 \|\| PyString_GET_SIZE(self) == 0) {
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3062 /* nothing to do; return the original string */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3063 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3064 }
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3065
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3066 if (maxcount == 0 \|\|
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3067 (from_len == 0 && to_len == 0)) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3068 /* nothing to do; return the original string */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3069 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3070 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3071
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3072 /* Handle zero-length special cases */
39303 1b4e5eb21049 Whitespace normalization Neal Norwitz <nnorwitz@gmail.com> parents: 39302 diff changeset	3073
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3074 if (from_len == 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3075 /* insert the 'to' string everywhere. */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3076 /* >>> "Python".replace("", ".") */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3077 /* '.P.y.t.h.o.n.' */
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3078 return replace_interleave(self, to_s, to_len, maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3079 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3080
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3081 /* Except for "".replace("", "A") == "A" there is no way beyond this */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3082 /* point for an empty self string to generate a non-empty string */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3083 /* Special case so the remaining code always gets a non-empty string */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3084 if (PyString_GET_SIZE(self) == 0) {
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3085 return return_self(self);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3086 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3087
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3088 if (to_len == 0) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3089 /* delete all occurances of 'from' string */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3090 if (from_len == 1) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3091 return replace_delete_single_character(
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3092 self, from_s[0], maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3093 } else {
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3094 return replace_delete_substring(self, from_s, from_len, maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3095 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3096 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3097
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3098 /* Handle special case where both strings have the same length */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3099
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3100 if (from_len == to_len) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3101 if (from_len == 1) {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3102 return replace_single_character_in_place(
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3103 self,
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3104 from_s[0],
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3105 to_s[0],
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3106 maxcount);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3107 } else {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3108 return replace_substring_in_place(
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3109 self, from_s, from_len, to_s, to_len, maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3110 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3111 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3112
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3113 /* Otherwise use the more generic algorithms */
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3114 if (from_len == 1) {
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3115 return replace_single_character(self, from_s[0],
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3116 to_s, to_len, maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3117 } else {
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3118 /* len('from')>=2, len('to')>=1 */
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3119 return replace_substring(self, from_s, from_len, to_s, to_len, maxcount);
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3120 }
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3121 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3122
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3123 PyDoc_STRVAR(replace__doc__,
30751 6fdde96a7222 Avoid confusing name for the 3rd argument to str.replace(). Fred Drake <fdrake@acm.org> parents: 30706 diff changeset	3124 "S.replace (old, new[, count]) -> string\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3125 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3126 Return a copy of string S with all occurrences of substring\n\
30751 6fdde96a7222 Avoid confusing name for the 3rd argument to str.replace(). Fred Drake <fdrake@acm.org> parents: 30706 diff changeset	3127 old replaced by new. If the optional argument count is\n\
6fdde96a7222 Avoid confusing name for the 3rd argument to str.replace(). Fred Drake <fdrake@acm.org> parents: 30706 diff changeset	3128 given, only the first count occurrences are replaced.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3129
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3130 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3131 string_replace(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3132 {
37858 74f459a289be Make s.replace() work with explicit counts exceeding 2Gb. Thomas Wouters <thomas@python.org> parents: 37855 diff changeset	3133 Py_ssize_t count = -1;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3134 PyObject from, to;
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3135 const char from_s, to_s;
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3136 Py_ssize_t from_len, to_len;
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3137
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3138 if (!PyArg_ParseTuple(args, "OO\|n:replace", &from, &to, &count))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3139 return NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3140
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3141 if (PyString_Check(from)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3142 from_s = PyString_AS_STRING(from);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3143 from_len = PyString_GET_SIZE(from);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3144 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3145 #ifdef Py_USING_UNICODE
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3146 if (PyUnicode_Check(from))
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3147 return PyUnicode_Replace((PyObject *)self,
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3148 from, to, count);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3149 #endif
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3150 else if (PyObject_AsCharBuffer(from, &from_s, &from_len))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3151 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3152
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3153 if (PyString_Check(to)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3154 to_s = PyString_AS_STRING(to);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3155 to_len = PyString_GET_SIZE(to);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3156 }
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3157 #ifdef Py_USING_UNICODE
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3158 else if (PyUnicode_Check(to))
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3159 return PyUnicode_Replace((PyObject *)self,
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3160 from, to, count);
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3161 #endif
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3162 else if (PyObject_AsCharBuffer(to, &to_s, &to_len))
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3163 return NULL;
41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3164
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3165 return (PyObject )replace((PyStringObject ) self,
39302 041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3166 from_s, from_len,
041eb6231cdc Bug #1515471: string.replace() accepts character buffers again. Neal Norwitz <nnorwitz@gmail.com> parents: 38738 diff changeset	3167 to_s, to_len, count);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3168 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3169
38300 41809406a35e needforspeed: new replace implementation by Andrew Dalke. replace is Fredrik Lundh <fredrik@pythonware.com> parents: 38299 diff changeset	3170 / End DALKE /
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3171
38738 0a8a392e1fae Update doc to make it agree with code. Neal Norwitz <nnorwitz@gmail.com> parents: 38709 diff changeset	3172 /* Matches the end (direction >= 0) or start (direction < 0) of self
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3173 * against substr, using the start and end arguments. Returns
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3174 * -1 on error, 0 if not found and 1 if found.
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3175 */
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3176 Py_LOCAL(int)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3177 _string_tailmatch(PyStringObject self, PyObject substr, Py_ssize_t start,
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3178 Py_ssize_t end, int direction)
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3179 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3180 Py_ssize_t len = PyString_GET_SIZE(self);
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3181 Py_ssize_t slen;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3182 const char* sub;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3183 const char* str;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3184
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3185 if (PyString_Check(substr)) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3186 sub = PyString_AS_STRING(substr);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3187 slen = PyString_GET_SIZE(substr);
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3188 }
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3189 #ifdef Py_USING_UNICODE
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3190 else if (PyUnicode_Check(substr))
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3191 return PyUnicode_Tailmatch((PyObject *)self,
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3192 substr, start, end, direction);
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3193 #endif
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3194 else if (PyObject_AsCharBuffer(substr, &sub, &slen))
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3195 return -1;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3196 str = PyString_AS_STRING(self);
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3197
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3198 string_adjust_indices(&start, &end, len);
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3199
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3200 if (direction < 0) {
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3201 /* startswith */
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3202 if (start+slen > len)
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3203 return 0;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3204 } else {
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3205 /* endswith */
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3206 if (end-start < slen \|\| start > len)
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3207 return 0;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3208
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3209 if (end-slen > start)
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3210 start = end - slen;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3211 }
38738 0a8a392e1fae Update doc to make it agree with code. Neal Norwitz <nnorwitz@gmail.com> parents: 38709 diff changeset	3212 if (end-start >= slen)
0a8a392e1fae Update doc to make it agree with code. Neal Norwitz <nnorwitz@gmail.com> parents: 38709 diff changeset	3213 return ! memcmp(str+start, sub, slen);
0a8a392e1fae Update doc to make it agree with code. Neal Norwitz <nnorwitz@gmail.com> parents: 38709 diff changeset	3214 return 0;
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3215 }
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3216
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3217
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3218 PyDoc_STRVAR(startswith__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3219 "S.startswith(prefix[, start[, end]]) -> bool\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3220 \n\
28559 aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28478 diff changeset	3221 Return True if S starts with the specified prefix, False otherwise.\n\
aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28478 diff changeset	3222 With optional start, test S beginning at that position.\n\
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3223 With optional end, stop comparing S at that position.\n\
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3224 prefix can also be a tuple of strings to try.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3225
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3226 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3227 string_startswith(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3228 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3229 Py_ssize_t start = 0;
37667 b1724e926e07 Replace most INT_MAX with PY_SSIZE_T_MAX. Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	3230 Py_ssize_t end = PY_SSIZE_T_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3231 PyObject *subobj;
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3232 int result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3233
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	3234 if (!PyArg_ParseTuple(args, "O\|O&O&:startswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	3235 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3236 return NULL;
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3237 if (PyTuple_Check(subobj)) {
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3238 Py_ssize_t i;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3239 for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) {
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3240 result = _string_tailmatch(self,
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3241 PyTuple_GET_ITEM(subobj, i),
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3242 start, end, -1);
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3243 if (result == -1)
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3244 return NULL;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3245 else if (result) {
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3246 Py_RETURN_TRUE;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3247 }
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3248 }
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3249 Py_RETURN_FALSE;
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3250 }
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3251 result = _string_tailmatch(self, subobj, start, end, -1);
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3252 if (result == -1)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3253 return NULL;
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3254 else
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3255 return PyBool_FromLong(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3256 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3257
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3258
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3259 PyDoc_STRVAR(endswith__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3260 "S.endswith(suffix[, start[, end]]) -> bool\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3261 \n\
28559 aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28478 diff changeset	3262 Return True if S ends with the specified suffix, False otherwise.\n\
aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28478 diff changeset	3263 With optional start, test S beginning at that position.\n\
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3264 With optional end, stop comparing S at that position.\n\
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3265 suffix can also be a tuple of strings to try.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3266
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3267 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3268 string_endswith(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3269 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3270 Py_ssize_t start = 0;
37667 b1724e926e07 Replace most INT_MAX with PY_SSIZE_T_MAX. Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	3271 Py_ssize_t end = PY_SSIZE_T_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3272 PyObject *subobj;
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3273 int result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3274
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	3275 if (!PyArg_ParseTuple(args, "O\|O&O&:endswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	3276 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3277 return NULL;
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3278 if (PyTuple_Check(subobj)) {
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3279 Py_ssize_t i;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3280 for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) {
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3281 result = _string_tailmatch(self,
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3282 PyTuple_GET_ITEM(subobj, i),
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3283 start, end, +1);
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3284 if (result == -1)
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3285 return NULL;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3286 else if (result) {
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3287 Py_RETURN_TRUE;
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3288 }
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3289 }
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3290 Py_RETURN_FALSE;
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3291 }
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3292 result = _string_tailmatch(self, subobj, start, end, +1);
1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3293 if (result == -1)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3294 return NULL;
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3295 else
38697 1cafbcd7f55c RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. Georg Brandl <georg@python.org> parents: 38531 diff changeset	3296 return PyBool_FromLong(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3297 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3298
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3299
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3300 PyDoc_STRVAR(encode__doc__,
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3301 "S.encode([encoding[,errors]]) -> object\n\
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3302 \n\
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3303 Encodes S using the codec registered for encoding. encoding defaults\n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3304 to the default encoding. errors may be given to set a different error\n\
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3305 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25017 diff changeset	3306 a UnicodeEncodeError. Other possible values are 'ignore', 'replace' and\n\
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25017 diff changeset	3307 'xmlcharrefreplace' as well as any other name registered with\n\
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25017 diff changeset	3308 codecs.register_error that is able to handle UnicodeEncodeErrors.");
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3309
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3310 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3311 string_encode(PyStringObject self, PyObject args)
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3312 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3313 char *encoding = NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3314 char *errors = NULL;
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3315 PyObject *v;
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	3316
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3317 if (!PyArg_ParseTuple(args, "\|ss:encode", &encoding, &errors))
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3318 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3319 v = PyString_AsEncodedObject((PyObject *)self, encoding, errors);
32552 3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3320 if (v == NULL)
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3321 goto onError;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3322 if (!PyString_Check(v) && !PyUnicode_Check(v)) {
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3323 PyErr_Format(PyExc_TypeError,
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3324 "encoder did not return a string/unicode object "
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3325 "(type=%.400s)",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	3326 Py_TYPE(v)->tp_name);
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3327 Py_DECREF(v);
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3328 return NULL;
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3329 }
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3330 return v;
32552 3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3331
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3332 onError:
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3333 return NULL;
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3334 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3335
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3336
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3337 PyDoc_STRVAR(decode__doc__,
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3338 "S.decode([encoding[,errors]]) -> object\n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3339 \n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3340 Decodes S using the codec registered for encoding. encoding defaults\n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3341 to the default encoding. errors may be given to set a different error\n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3342 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25017 diff changeset	3343 a UnicodeDecodeError. Other possible values are 'ignore' and 'replace'\n\
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25017 diff changeset	3344 as well as any other name registerd with codecs.register_error that is\n\
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25017 diff changeset	3345 able to handle UnicodeDecodeErrors.");
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3346
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3347 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3348 string_decode(PyStringObject self, PyObject args)
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3349 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3350 char *encoding = NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3351 char *errors = NULL;
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3352 PyObject *v;
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	3353
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3354 if (!PyArg_ParseTuple(args, "\|ss:decode", &encoding, &errors))
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3355 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3356 v = PyString_AsDecodedObject((PyObject *)self, encoding, errors);
32552 3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3357 if (v == NULL)
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3358 goto onError;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3359 if (!PyString_Check(v) && !PyUnicode_Check(v)) {
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3360 PyErr_Format(PyExc_TypeError,
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3361 "decoder did not return a string/unicode object "
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3362 "(type=%.400s)",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	3363 Py_TYPE(v)->tp_name);
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3364 Py_DECREF(v);
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3365 return NULL;
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3366 }
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3367 return v;
32552 3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3368
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3369 onError:
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3370 return NULL;
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3371 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3372
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3373
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3374 PyDoc_STRVAR(expandtabs__doc__,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3375 "S.expandtabs([tabsize]) -> string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3376 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3377 Return a copy of S where all tab characters are expanded using spaces.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3378 If tabsize is not given, a tab size of 8 characters is assumed.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3379
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3380 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3381 string_expandtabs(PyStringObject self, PyObject args)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3382 {
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3383 const char e, p, *qe;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3384 char *q;
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3385 Py_ssize_t i, j, incr;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3386 PyObject *u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3387 int tabsize = 8;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3388
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3389 if (!PyArg_ParseTuple(args, "\|i:expandtabs", &tabsize))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3390 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3391
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	3392 /* First pass: determine size of output string */
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3393 i = 0; /* chars up to and including most recent \n or \r */
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3394 j = 0; /* chars since most recent \n or \r (use in tab calculations) */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3395 e = PyString_AS_STRING(self) + PyString_GET_SIZE(self); /* end of input */
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3396 for (p = PyString_AS_STRING(self); p < e; p++)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3397 if (*p == '\t') {
42004 e62b606eff0b Prevent expandtabs() on string and unicode objects from causing a segfault when Neal Norwitz <nnorwitz@gmail.com> parents: 41440 diff changeset	3398 if (tabsize > 0) {
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3399 incr = tabsize - (j % tabsize);
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3400 if (j > PY_SSIZE_T_MAX - incr)
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3401 goto overflow1;
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3402 j += incr;
42004 e62b606eff0b Prevent expandtabs() on string and unicode objects from causing a segfault when Neal Norwitz <nnorwitz@gmail.com> parents: 41440 diff changeset	3403 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3404 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3405 else {
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3406 if (j > PY_SSIZE_T_MAX - 1)
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3407 goto overflow1;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3408 j++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3409 if (p == '\n' \|\| p == '\r') {
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3410 if (i > PY_SSIZE_T_MAX - j)
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3411 goto overflow1;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3412 i += j;
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3413 j = 0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3414 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3415 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3416
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3417 if (i > PY_SSIZE_T_MAX - j)
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3418 goto overflow1;
42004 e62b606eff0b Prevent expandtabs() on string and unicode objects from causing a segfault when Neal Norwitz <nnorwitz@gmail.com> parents: 41440 diff changeset	3419
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3420 /* Second pass: create output string and fill it */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3421 u = PyString_FromStringAndSize(NULL, i + j);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3422 if (!u)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3423 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3424
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3425 j = 0; /* same as in first pass */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3426 q = PyString_AS_STRING(u); /* next output char */
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3427 qe = PyString_AS_STRING(u) + PyString_GET_SIZE(u); /* end of output */
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3428
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3429 for (p = PyString_AS_STRING(self); p < e; p++)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3430 if (*p == '\t') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3431 if (tabsize > 0) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3432 i = tabsize - (j % tabsize);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3433 j += i;
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3434 while (i--) {
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3435 if (q >= qe)
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3436 goto overflow2;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3437 *q++ = ' ';
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3438 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3439 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3440 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3441 else {
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3442 if (q >= qe)
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3443 goto overflow2;
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3444 q++ = p;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3445 j++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3446 if (p == '\n' \|\| p == '\r')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3447 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3448 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3449
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3450 return u;
45731 162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3451
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3452 overflow2:
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3453 Py_DECREF(u);
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3454 overflow1:
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3455 PyErr_SetString(PyExc_OverflowError, "new string is too long");
162c6952ea34 Fix the overflows in expandtabs(). "This time for sure!" Guido van Rossum <guido@python.org> parents: 45500 diff changeset	3456 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3457 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3458
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	3459 Py_LOCAL_INLINE(PyObject *)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3460 pad(PyStringObject *self, Py_ssize_t left, Py_ssize_t right, char fill)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3461 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3462 PyObject *u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3463
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3464 if (left < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3465 left = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3466 if (right < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3467 right = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3468
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3469 if (left == 0 && right == 0 && PyString_CheckExact(self)) {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3470 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3471 return (PyObject *)self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3472 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3473
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3474 u = PyString_FromStringAndSize(NULL,
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3475 left + PyString_GET_SIZE(self) + right);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3476 if (u) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3477 if (left)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3478 memset(PyString_AS_STRING(u), fill, left);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3479 Py_MEMCPY(PyString_AS_STRING(u) + left,
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3480 PyString_AS_STRING(self),
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3481 PyString_GET_SIZE(self));
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3482 if (right)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3483 memset(PyString_AS_STRING(u) + left + PyString_GET_SIZE(self),
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3484 fill, right);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3485 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3486
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3487 return u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3488 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3489
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3490 PyDoc_STRVAR(ljust__doc__,
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3491 "S.ljust(width[, fillchar]) -> string\n"
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3492 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3493 "Return S left justified in a string of length width. Padding is\n"
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3494 "done using the specified fill character (default is a space).");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3495
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3496 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3497 string_ljust(PyStringObject self, PyObject args)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3498 {
37855 dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3499 Py_ssize_t width;
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3500 char fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3501
37855 dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3502 if (!PyArg_ParseTuple(args, "n\|c:ljust", &width, &fillchar))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3503 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3504
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3505 if (PyString_GET_SIZE(self) >= width && PyString_CheckExact(self)) {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3506 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3507 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3508 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3509
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3510 return pad(self, 0, width - PyString_GET_SIZE(self), fillchar);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3511 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3512
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3513
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3514 PyDoc_STRVAR(rjust__doc__,
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3515 "S.rjust(width[, fillchar]) -> string\n"
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3516 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3517 "Return S right justified in a string of length width. Padding is\n"
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3518 "done using the specified fill character (default is a space)");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3519
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3520 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3521 string_rjust(PyStringObject self, PyObject args)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3522 {
37855 dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3523 Py_ssize_t width;
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3524 char fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3525
37855 dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3526 if (!PyArg_ParseTuple(args, "n\|c:rjust", &width, &fillchar))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3527 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3528
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3529 if (PyString_GET_SIZE(self) >= width && PyString_CheckExact(self)) {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3530 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3531 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3532 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3533
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3534 return pad(self, width - PyString_GET_SIZE(self), 0, fillchar);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3535 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3536
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3537
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3538 PyDoc_STRVAR(center__doc__,
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3539 "S.center(width[, fillchar]) -> string\n"
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3540 "\n"
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3541 "Return S centered in a string of length width. Padding is\n"
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3542 "done using the specified fill character (default is a space)");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3543
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3544 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3545 string_center(PyStringObject self, PyObject args)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3546 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3547 Py_ssize_t marg, left;
37855 dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3548 Py_ssize_t width;
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3549 char fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3550
37855 dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3551 if (!PyArg_ParseTuple(args, "n\|c:center", &width, &fillchar))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3552 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3553
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3554 if (PyString_GET_SIZE(self) >= width && PyString_CheckExact(self)) {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3555 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3556 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3557 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3558
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3559 marg = width - PyString_GET_SIZE(self);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3560 left = marg / 2 + (marg & width & 1);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3561
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3562 return pad(self, left, marg - left, fillchar);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3563 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3564
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3565 PyDoc_STRVAR(zfill__doc__,
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3566 "S.zfill(width) -> string\n"
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3567 "\n"
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3568 "Pad a numeric string S with zeros on the left, to fill a field\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3569 "of the specified width. The string S is never truncated.");
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3570
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3571 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3572 string_zfill(PyStringObject self, PyObject args)
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3573 {
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	3574 Py_ssize_t fill;
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3575 PyObject *s;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3576 char *p;
37855 dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3577 Py_ssize_t width;
dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3578
dc8efd70ab56 Use Py_ssize_t to hold the 'width' argument to the ljust, rjust, center and Thomas Wouters <thomas@python.org> parents: 37815 diff changeset	3579 if (!PyArg_ParseTuple(args, "n:zfill", &width))
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3580 return NULL;
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3581
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3582 if (PyString_GET_SIZE(self) >= width) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3583 if (PyString_CheckExact(self)) {
23051 19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	3584 Py_INCREF(self);
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	3585 return (PyObject*) self;
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	3586 }
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	3587 else
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3588 return PyString_FromStringAndSize(
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3589 PyString_AS_STRING(self),
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3590 PyString_GET_SIZE(self)
23051 19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	3591 );
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3592 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3593
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3594 fill = width - PyString_GET_SIZE(self);
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3595
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3596 s = pad(self, fill, 0, '0');
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3597
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3598 if (s == NULL)
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3599 return NULL;
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3600
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3601 p = PyString_AS_STRING(s);
23045 8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3602 if (p[fill] == '+' \|\| p[fill] == '-') {
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3603 /* move sign to beginning of string */
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3604 p[0] = p[fill];
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3605 p[fill] = '0';
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3606 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3607
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3608 return (PyObject*) s;
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3609 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3610
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3611 PyDoc_STRVAR(isspace__doc__,
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3612 "S.isspace() -> bool\n\
be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3613 \n\
be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3614 Return True if all characters in S are whitespace\n\
be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3615 and there is at least one character in S, False otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3616
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3617 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3618 string_isspace(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3619 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3620 register const unsigned char *p
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3621 = (unsigned char *) PyString_AS_STRING(self);
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3622 register const unsigned char *e;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3623
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3624 /* Shortcut for single character strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3625 if (PyString_GET_SIZE(self) == 1 &&
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3626 isspace(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3627 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3628
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3629 /* Special case for empty strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3630 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3631 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3632
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3633 e = p + PyString_GET_SIZE(self);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3634 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3635 if (!isspace(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3636 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3637 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3638 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3639 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3640
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3641
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3642 PyDoc_STRVAR(isalpha__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3643 "S.isalpha() -> bool\n\
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3644 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3645 Return True if all characters in S are alphabetic\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3646 and there is at least one character in S, False otherwise.");
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3647
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3648 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3649 string_isalpha(PyStringObject *self)
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3650 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3651 register const unsigned char *p
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3652 = (unsigned char *) PyString_AS_STRING(self);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3653 register const unsigned char *e;
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3654
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3655 /* Shortcut for single character strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3656 if (PyString_GET_SIZE(self) == 1 &&
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3657 isalpha(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3658 return PyBool_FromLong(1);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3659
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3660 /* Special case for empty strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3661 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3662 return PyBool_FromLong(0);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3663
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3664 e = p + PyString_GET_SIZE(self);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3665 for (; p < e; p++) {
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3666 if (!isalpha(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3667 return PyBool_FromLong(0);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3668 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3669 return PyBool_FromLong(1);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3670 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3671
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3672
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3673 PyDoc_STRVAR(isalnum__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3674 "S.isalnum() -> bool\n\
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3675 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3676 Return True if all characters in S are alphanumeric\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3677 and there is at least one character in S, False otherwise.");
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3678
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3679 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3680 string_isalnum(PyStringObject *self)
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3681 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3682 register const unsigned char *p
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3683 = (unsigned char *) PyString_AS_STRING(self);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3684 register const unsigned char *e;
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3685
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3686 /* Shortcut for single character strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3687 if (PyString_GET_SIZE(self) == 1 &&
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3688 isalnum(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3689 return PyBool_FromLong(1);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3690
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3691 /* Special case for empty strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3692 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3693 return PyBool_FromLong(0);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3694
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3695 e = p + PyString_GET_SIZE(self);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3696 for (; p < e; p++) {
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3697 if (!isalnum(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3698 return PyBool_FromLong(0);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3699 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3700 return PyBool_FromLong(1);
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3701 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3702
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3703
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3704 PyDoc_STRVAR(isdigit__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3705 "S.isdigit() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3706 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3707 Return True if all characters in S are digits\n\
be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3708 and there is at least one character in S, False otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3709
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3710 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3711 string_isdigit(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3712 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3713 register const unsigned char *p
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3714 = (unsigned char *) PyString_AS_STRING(self);
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3715 register const unsigned char *e;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3716
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3717 /* Shortcut for single character strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3718 if (PyString_GET_SIZE(self) == 1 &&
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3719 isdigit(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3720 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3721
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3722 /* Special case for empty strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3723 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3724 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3725
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3726 e = p + PyString_GET_SIZE(self);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3727 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3728 if (!isdigit(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3729 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3730 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3731 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3732 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3733
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3734
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3735 PyDoc_STRVAR(islower__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3736 "S.islower() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3737 \n\
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3738 Return True if all cased characters in S are lowercase and there is\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3739 at least one cased character in S, False otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3740
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3741 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3742 string_islower(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3743 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3744 register const unsigned char *p
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3745 = (unsigned char *) PyString_AS_STRING(self);
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3746 register const unsigned char *e;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3747 int cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3748
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3749 /* Shortcut for single character strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3750 if (PyString_GET_SIZE(self) == 1)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3751 return PyBool_FromLong(islower(*p) != 0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3752
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3753 /* Special case for empty strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3754 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3755 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3756
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3757 e = p + PyString_GET_SIZE(self);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3758 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3759 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3760 if (isupper(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3761 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3762 else if (!cased && islower(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3763 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3764 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3765 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3766 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3767
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3768
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3769 PyDoc_STRVAR(isupper__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3770 "S.isupper() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3771 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3772 Return True if all cased characters in S are uppercase and there is\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3773 at least one cased character in S, False otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3774
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3775 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3776 string_isupper(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3777 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3778 register const unsigned char *p
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3779 = (unsigned char *) PyString_AS_STRING(self);
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3780 register const unsigned char *e;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3781 int cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3782
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3783 /* Shortcut for single character strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3784 if (PyString_GET_SIZE(self) == 1)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3785 return PyBool_FromLong(isupper(*p) != 0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3786
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3787 /* Special case for empty strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3788 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3789 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3790
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3791 e = p + PyString_GET_SIZE(self);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3792 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3793 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3794 if (islower(*p))
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3795 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3796 else if (!cased && isupper(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3797 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3798 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3799 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3800 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3801
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3802
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3803 PyDoc_STRVAR(istitle__doc__,
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3804 "S.istitle() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3805 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3806 Return True if S is a titlecased string and there is at least one\n\
be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3807 character in S, i.e. uppercase characters may only follow uncased\n\
be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3808 characters and lowercase characters only cased ones. Return False\n\
be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3809 otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3810
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3811 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3812 string_istitle(PyStringObject self, PyObject uncased)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3813 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3814 register const unsigned char *p
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3815 = (unsigned char *) PyString_AS_STRING(self);
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3816 register const unsigned char *e;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3817 int cased, previous_is_cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3818
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3819 /* Shortcut for single character strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3820 if (PyString_GET_SIZE(self) == 1)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3821 return PyBool_FromLong(isupper(*p) != 0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3822
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3823 /* Special case for empty strings */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3824 if (PyString_GET_SIZE(self) == 0)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3825 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3826
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3827 e = p + PyString_GET_SIZE(self);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3828 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3829 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3830 for (; p < e; p++) {
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3831 register const unsigned char ch = *p;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3832
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3833 if (isupper(ch)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3834 if (previous_is_cased)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3835 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3836 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3837 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3838 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3839 else if (islower(ch)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3840 if (!previous_is_cased)
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3841 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3842 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3843 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3844 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3845 else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3846 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3847 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22689 diff changeset	3848 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3849 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3850
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3851
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3852 PyDoc_STRVAR(splitlines__doc__,
20415 621c7703e8b7 Remove extra "]" in splitlines() docstring. Fred Drake <fdrake@acm.org> parents: 20277 diff changeset	3853 "S.splitlines([keepends]) -> list of strings\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3854 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3855 Return a list of the lines in S, breaking at line boundaries.\n\
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3856 Line breaks are not included in the resulting list unless keepends\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3857 is given and true.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3858
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3859 static PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3860 string_splitlines(PyStringObject self, PyObject args)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3861 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3862 register Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3863 register Py_ssize_t j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3864 Py_ssize_t len;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3865 int keepends = 0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3866 PyObject *list;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3867 PyObject *str;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3868 char *data;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3869
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3870 if (!PyArg_ParseTuple(args, "\|i:splitlines", &keepends))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3871 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3872
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3873 data = PyString_AS_STRING(self);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3874 len = PyString_GET_SIZE(self);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3875
38417 e0e43e561512 Added description of why splitlines doesn't use the prealloc strategy Andrew Dalke <dalke@dalkescientific.com> parents: 38410 diff changeset	3876 /* This does not use the preallocated list because splitlines is
e0e43e561512 Added description of why splitlines doesn't use the prealloc strategy Andrew Dalke <dalke@dalkescientific.com> parents: 38410 diff changeset	3877 usually run with hundreds of newlines. The overhead of
e0e43e561512 Added description of why splitlines doesn't use the prealloc strategy Andrew Dalke <dalke@dalkescientific.com> parents: 38410 diff changeset	3878 switching between PyList_SET_ITEM and append causes about a
e0e43e561512 Added description of why splitlines doesn't use the prealloc strategy Andrew Dalke <dalke@dalkescientific.com> parents: 38410 diff changeset	3879 2-3% slowdown for that common case. A smarter implementation
e0e43e561512 Added description of why splitlines doesn't use the prealloc strategy Andrew Dalke <dalke@dalkescientific.com> parents: 38410 diff changeset	3880 could move the if check out, so the SET_ITEMs are done first
e0e43e561512 Added description of why splitlines doesn't use the prealloc strategy Andrew Dalke <dalke@dalkescientific.com> parents: 38410 diff changeset	3881 and the appends only done when the prealloc buffer is full.
e0e43e561512 Added description of why splitlines doesn't use the prealloc strategy Andrew Dalke <dalke@dalkescientific.com> parents: 38410 diff changeset	3882 That's too much work for little gain.*/
e0e43e561512 Added description of why splitlines doesn't use the prealloc strategy Andrew Dalke <dalke@dalkescientific.com> parents: 38410 diff changeset	3883
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3884 list = PyList_New(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3885 if (!list)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3886 goto onError;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3887
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3888 for (i = j = 0; i < len; ) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3889 Py_ssize_t eol;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3890
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3891 /* Find a line and append it */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3892 while (i < len && data[i] != '\n' && data[i] != '\r')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3893 i++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3894
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3895 /* Skip the line break reading CRLF as one line break */
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3896 eol = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3897 if (i < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3898 if (data[i] == '\r' && i + 1 < len &&
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3899 data[i+1] == '\n')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3900 i += 2;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3901 else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3902 i++;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3903 if (keepends)
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3904 eol = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3905 }
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3906 SPLIT_APPEND(data, j, eol);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3907 j = i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3908 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3909 if (j < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3910 SPLIT_APPEND(data, j, len);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3911 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3912
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3913 return list;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3914
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3915 onError:
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36866 diff changeset	3916 Py_XDECREF(list);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3917 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3918 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3919
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	3920 PyDoc_STRVAR(sizeof__doc__,
47421 a65f095b27f3 Some style nits. Also clarify in the docstrings what __sizeof__ does. Georg Brandl <georg@python.org> parents: 47419 diff changeset	3921 "S.__sizeof__() -> size of S in memory, in bytes");
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	3922
88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	3923 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3924 string_sizeof(PyStringObject *v)
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	3925 {
88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	3926 Py_ssize_t res;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3927 res = sizeof(PyStringObject) + v->ob_size * v->ob_type->tp_itemsize;
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	3928 return PyInt_FromSsize_t(res);
88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	3929 }
88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	3930
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3931 #undef SPLIT_APPEND
38365 c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	3932 #undef SPLIT_ADD
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	3933 #undef MAX_PREALLOC
c0082705f2f2 Changes to string.split/rsplit on whitespace to preallocate space in the Andrew Dalke <dalke@dalkescientific.com> parents: 38347 diff changeset	3934 #undef PREALLOC_SIZE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3935
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3936 static PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3937 string_getnewargs(PyStringObject *v)
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3938 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	3939 return Py_BuildValue("(s#)", v->ob_sval, Py_SIZE(v));
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3940 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3941
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3942
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3943 #include "stringlib/string_format.h"
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3944
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3945 PyDoc_STRVAR(format__doc__,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3946 "S.format(args, *kwargs) -> unicode\n\
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3947 \n\
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3948 ");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3949
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3950 static PyObject *
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3951 string__format__(PyObject* self, PyObject* args)
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3952 {
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3953 PyObject *format_spec;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3954 PyObject *result = NULL;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3955 PyObject *tmp = NULL;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3956
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3957 /* If 2.x, convert format_spec to the same type as value */
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3958 /* This is to allow things like u''.format('') */
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3959 if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3960 goto done;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3961 if (!(PyString_Check(format_spec) \|\| PyUnicode_Check(format_spec))) {
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3962 PyErr_Format(PyExc_TypeError, "__format__ arg must be str "
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3963 "or unicode, not %s", Py_TYPE(format_spec)->tp_name);
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3964 goto done;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3965 }
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3966 tmp = PyObject_Str(format_spec);
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3967 if (tmp == NULL)
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3968 goto done;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3969 format_spec = tmp;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3970
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3971 result = _PyBytes_FormatAdvanced(self,
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3972 PyString_AS_STRING(format_spec),
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	3973 PyString_GET_SIZE(format_spec));
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3974 done:
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3975 Py_XDECREF(tmp);
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3976 return result;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3977 }
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47296 diff changeset	3978
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3979 PyDoc_STRVAR(p_format__doc__,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3980 "S.__format__(format_spec) -> unicode\n\
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3981 \n\
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3982 ");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	3983
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3984
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3985 static PyMethodDef
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3986 string_methods[] = {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3987 /* Counterparts of the obsolete stropmodule functions; except
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3988 string.maketrans(). */
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3989 {"join", (PyCFunction)string_join, METH_O, join__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3990 {"split", (PyCFunction)string_split, METH_VARARGS, split__doc__},
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	3991 {"rsplit", (PyCFunction)string_rsplit, METH_VARARGS, rsplit__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3992 {"lower", (PyCFunction)string_lower, METH_NOARGS, lower__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3993 {"upper", (PyCFunction)string_upper, METH_NOARGS, upper__doc__},
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3994 {"islower", (PyCFunction)string_islower, METH_NOARGS, islower__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3995 {"isupper", (PyCFunction)string_isupper, METH_NOARGS, isupper__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3996 {"isspace", (PyCFunction)string_isspace, METH_NOARGS, isspace__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3997 {"isdigit", (PyCFunction)string_isdigit, METH_NOARGS, isdigit__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3998 {"istitle", (PyCFunction)string_istitle, METH_NOARGS, istitle__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3999 {"isalpha", (PyCFunction)string_isalpha, METH_NOARGS, isalpha__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	4000 {"isalnum", (PyCFunction)string_isalnum, METH_NOARGS, isalnum__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4001 {"capitalize", (PyCFunction)string_capitalize, METH_NOARGS,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4002 capitalize__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4003 {"count", (PyCFunction)string_count, METH_VARARGS, count__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4004 {"endswith", (PyCFunction)string_endswith, METH_VARARGS,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4005 endswith__doc__},
38338 958f91684209 needforspeed: use METH_O for argument handling, which made partition some Fredrik Lundh <fredrik@pythonware.com> parents: 38335 diff changeset	4006 {"partition", (PyCFunction)string_partition, METH_O, partition__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4007 {"find", (PyCFunction)string_find, METH_VARARGS, find__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4008 {"index", (PyCFunction)string_index, METH_VARARGS, index__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4009 {"lstrip", (PyCFunction)string_lstrip, METH_VARARGS, lstrip__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4010 {"replace", (PyCFunction)string_replace, METH_VARARGS, replace__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4011 {"rfind", (PyCFunction)string_rfind, METH_VARARGS, rfind__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4012 {"rindex", (PyCFunction)string_rindex, METH_VARARGS, rindex__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4013 {"rstrip", (PyCFunction)string_rstrip, METH_VARARGS, rstrip__doc__},
38390 76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	4014 {"rpartition", (PyCFunction)string_rpartition, METH_O,
76807902a2f5 needforspeed: added rpartition implementation Fredrik Lundh <fredrik@pythonware.com> parents: 38385 diff changeset	4015 rpartition__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4016 {"startswith", (PyCFunction)string_startswith, METH_VARARGS,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4017 startswith__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4018 {"strip", (PyCFunction)string_strip, METH_VARARGS, strip__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4019 {"swapcase", (PyCFunction)string_swapcase, METH_NOARGS,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4020 swapcase__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4021 {"translate", (PyCFunction)string_translate, METH_VARARGS,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4022 translate__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4023 {"title", (PyCFunction)string_title, METH_NOARGS, title__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4024 {"ljust", (PyCFunction)string_ljust, METH_VARARGS, ljust__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4025 {"rjust", (PyCFunction)string_rjust, METH_VARARGS, rjust__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4026 {"center", (PyCFunction)string_center, METH_VARARGS, center__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4027 {"zfill", (PyCFunction)string_zfill, METH_VARARGS, zfill__doc__},
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	4028 {"format", (PyCFunction) do_string_format, METH_VARARGS \| METH_KEYWORDS, format__doc__},
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	4029 {"__format__", (PyCFunction) string__format__, METH_VARARGS, p_format__doc__},
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	4030 {"_formatter_field_name_split", (PyCFunction) formatter_field_name_split, METH_NOARGS},
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 44350 diff changeset	4031 {"_formatter_parser", (PyCFunction) formatter_parser, METH_NOARGS},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4032 {"encode", (PyCFunction)string_encode, METH_VARARGS, encode__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4033 {"decode", (PyCFunction)string_decode, METH_VARARGS, decode__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4034 {"expandtabs", (PyCFunction)string_expandtabs, METH_VARARGS,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4035 expandtabs__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4036 {"splitlines", (PyCFunction)string_splitlines, METH_VARARGS,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4037 splitlines__doc__},
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	4038 {"__sizeof__", (PyCFunction)string_sizeof, METH_NOARGS,
88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47392 diff changeset	4039 sizeof__doc__},
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	4040 {"__getnewargs__", (PyCFunction)string_getnewargs, METH_NOARGS},
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	4041 {NULL, NULL} /* sentinel */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	4042 };
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	4043
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24184 diff changeset	4044 static PyObject *
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4045 str_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds);
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4046
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	4047 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4048 string_new(PyTypeObject type, PyObject args, PyObject *kwds)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	4049 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4050 PyObject *x = NULL;
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36528 diff changeset	4051 static char *kwlist[] = {"object", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4052
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4053 if (type != &PyString_Type)
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4054 return str_subtype_new(type, args, kwds);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4055 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|O:str", kwlist, &x))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4056 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4057 if (x == NULL)
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4058 return PyString_FromString("");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4059 return PyObject_Str(x);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	4060 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	4061
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4062 static PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4063 str_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4064 {
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	4065 PyObject tmp, pnew;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4066 Py_ssize_t n;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4067
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4068 assert(PyType_IsSubtype(type, &PyString_Type));
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4069 tmp = string_new(&PyString_Type, args, kwds);
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4070 if (tmp == NULL)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4071 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4072 assert(PyString_CheckExact(tmp));
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4073 n = PyString_GET_SIZE(tmp);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	4074 pnew = type->tp_alloc(type, n);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	4075 if (pnew != NULL) {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4076 Py_MEMCPY(PyString_AS_STRING(pnew), PyString_AS_STRING(tmp), n+1);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4077 ((PyStringObject *)pnew)->ob_shash =
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4078 ((PyStringObject *)tmp)->ob_shash;
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4079 ((PyStringObject *)pnew)->ob_sstate = SSTATE_NOT_INTERNED;
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	4080 }
19632 20fb7591f885 Fix a memory leak in str_subtype_new(). (All the other Guido van Rossum <guido@python.org> parents: 19592 diff changeset	4081 Py_DECREF(tmp);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	4082 return pnew;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4083 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	4084
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4085 static PyObject *
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4086 basestring_new(PyTypeObject type, PyObject args, PyObject *kwds)
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4087 {
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4088 PyErr_SetString(PyExc_TypeError,
23597 ed007e47b3a1 Change name from string to basestring Neal Norwitz <nnorwitz@gmail.com> parents: 23542 diff changeset	4089 "The basestring type cannot be instantiated");
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4090 return NULL;
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4091 }
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4092
26273 57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4093 static PyObject *
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4094 string_mod(PyObject v, PyObject w)
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4095 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4096 if (!PyString_Check(v)) {
26273 57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4097 Py_INCREF(Py_NotImplemented);
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4098 return Py_NotImplemented;
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4099 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4100 return PyString_Format(v, w);
26273 57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4101 }
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4102
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4103 PyDoc_STRVAR(basestring_doc,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4104 "Type basestring cannot be instantiated; it is the base for str and unicode.");
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4105
26273 57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4106 static PyNumberMethods string_as_number = {
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4107 0, /nb_add/
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4108 0, /nb_subtract/
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4109 0, /nb_multiply/
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4110 0, /nb_divide/
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4111 string_mod, /nb_remainder/
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4112 };
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4113
57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4114
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4115 PyTypeObject PyBaseString_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 42216 diff changeset	4116 PyVarObject_HEAD_INIT(&PyType_Type, 0)
23597 ed007e47b3a1 Change name from string to basestring Neal Norwitz <nnorwitz@gmail.com> parents: 23542 diff changeset	4117 "basestring",
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4118 0,
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4119 0,
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4120 0, /* tp_dealloc */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4121 0, /* tp_print */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4122 0, /* tp_getattr */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4123 0, /* tp_setattr */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4124 0, /* tp_compare */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4125 0, /* tp_repr */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4126 0, /* tp_as_number */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4127 0, /* tp_as_sequence */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4128 0, /* tp_as_mapping */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4129 0, /* tp_hash */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4130 0, /* tp_call */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4131 0, /* tp_str */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4132 0, /* tp_getattro */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4133 0, /* tp_setattro */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4134 0, /* tp_as_buffer */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4135 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4136 basestring_doc, /* tp_doc */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4137 0, /* tp_traverse */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4138 0, /* tp_clear */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4139 0, /* tp_richcompare */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4140 0, /* tp_weaklistoffset */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4141 0, /* tp_iter */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4142 0, /* tp_iternext */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4143 0, /* tp_methods */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4144 0, /* tp_members */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4145 0, /* tp_getset */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4146 &PyBaseObject_Type, /* tp_base */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4147 0, /* tp_dict */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4148 0, /* tp_descr_get */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4149 0, /* tp_descr_set */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4150 0, /* tp_dictoffset */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4151 0, /* tp_init */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4152 0, /* tp_alloc */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4153 basestring_new, /* tp_new */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4154 0, /* tp_free */
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4155 };
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4156
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4157 PyDoc_STRVAR(string_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4158 "str(object) -> string\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4159 \n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4160 Return a nice string representation of the object.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	4161 If the argument is a string, the return value is the same object.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	4162
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4163 PyTypeObject PyString_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 42216 diff changeset	4164 PyVarObject_HEAD_INIT(&PyType_Type, 0)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4165 "str",
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4166 sizeof(PyStringObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4167 sizeof(char),
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37213 diff changeset	4168 string_dealloc, /* tp_dealloc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4169 (printfunc)string_print, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4170 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4171 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4172 0, /* tp_compare */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37213 diff changeset	4173 string_repr, /* tp_repr */
26273 57c6e84f71ce Add nb_remainder (i.e. __mod__) slot to str type. Fixes SF bug #615506. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 26164 diff changeset	4174 &string_as_number, /* tp_as_number */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4175 &string_as_sequence, /* tp_as_sequence */
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	4176 &string_as_mapping, /* tp_as_mapping */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4177 (hashfunc)string_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4178 0, /* tp_call */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37213 diff changeset	4179 string_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4180 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4181 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4182 &string_as_buffer, /* tp_as_buffer */
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	4183 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_CHECKTYPES \|
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	4184 Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_STRING_SUBCLASS \|
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45731 diff changeset	4185 Py_TPFLAGS_HAVE_NEWBUFFER, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4186 string_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4187 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4188 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4189 (richcmpfunc)string_richcompare, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4190 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4191 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4192 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4193 string_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4194 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4195 0, /* tp_getset */
23542 220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	4196 &PyBaseString_Type, /* tp_base */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4197 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4198 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4199 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4200 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4201 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4202 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4203 string_new, /* tp_new */
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	4204 PyObject_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4205 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4206
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4207 void
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4208 PyString_Concat(register PyObject *pv, register PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4209 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4210 register PyObject *v;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4211 if (*pv == NULL)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4212 return;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4213 if (w == NULL \|\| !PyString_Check(*pv)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4214 Py_DECREF(*pv);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4215 *pv = NULL;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4216 return;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4217 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4218 v = string_concat((PyStringObject ) pv, w);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4219 Py_DECREF(*pv);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4220 *pv = v;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4221 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4222
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4223 void
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4224 PyString_ConcatAndDel(register PyObject *pv, register PyObject w)
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4225 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4226 PyString_Concat(pv, w);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4227 Py_XDECREF(w);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4228 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4229
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4230
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4231 /* The following function breaks the notion that strings are immutable:
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4232 it changes the size of a string. We get away with this only if there
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4233 is only one module referencing the object. You can also think of it
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4234 as creating a new string object and destroying the old one, only
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4235 more efficiently. In any case, don't use this if the string may
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	4236 already be known to some other part of the code...
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	4237 Note that if there's not enough memory to resize the string, the original
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	4238 string object at pv is deallocated, pv is set to NULL, an "out of
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	4239 memory" exception is set, and -1 is returned. Else (on success) 0 is
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	4240 returned, and the value in *pv may or may not be the same as on input.
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	4241 As always, an extra byte is allocated for a trailing \0 byte (newsize
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	4242 does not include that), and a trailing \0 byte is stored.
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	4243 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4244
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4245 int
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4246 _PyString_Resize(PyObject **pv, Py_ssize_t newsize)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4247 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4248 register PyObject *v;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4249 register PyStringObject *sv;
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	4250 v = *pv;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4251 if (!PyString_Check(v) \|\| Py_REFCNT(v) != 1 \|\| newsize < 0 \|\|
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4252 PyString_CHECK_INTERNED(v)) {
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4253 *pv = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4254 Py_DECREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4255 PyErr_BadInternalCall();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	4256 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4257 }
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	4258 /* XXX UNREF/NEWREF interface should be more symmetrical */
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 23850 diff changeset	4259 _Py_DEC_REFTOTAL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4260 _Py_ForgetReference(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4261 pv = (PyObject )
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4262 PyObject_REALLOC((char *)v, sizeof(PyStringObject) + newsize);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4263 if (*pv == NULL) {
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	4264 PyObject_Del(v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4265 PyErr_NoMemory();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	4266 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4267 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4268 _Py_NewReference(*pv);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4269 sv = (PyStringObject ) pv;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	4270 Py_SIZE(sv) = newsize;
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	4271 sv->ob_sval[newsize] = '\0';
33833 10512ceba30c SF bug #1054139: serious string hashing error in 2.4b1 Raymond Hettinger <python@rcn.com> parents: 33246 diff changeset	4272 sv->ob_shash = -1; /* invalidate cached hash value */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4273 return 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4274 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4275
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4276 /* Helpers for formatstring */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4277
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	4278 Py_LOCAL_INLINE(PyObject *)
36528 76ce880dce49 Use Py_ssize_t in helper function between Py_ssize_t-using functions. Thomas Wouters <thomas@python.org> parents: 36519 diff changeset	4279 getnextarg(PyObject args, Py_ssize_t arglen, Py_ssize_t p_argidx)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4280 {
36528 76ce880dce49 Use Py_ssize_t in helper function between Py_ssize_t-using functions. Thomas Wouters <thomas@python.org> parents: 36519 diff changeset	4281 Py_ssize_t argidx = *p_argidx;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4282 if (argidx < arglen) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4283 (*p_argidx)++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4284 if (arglen < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4285 return args;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4286 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4287 return PyTuple_GetItem(args, argidx);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4288 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4289 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4290 "not enough arguments for format string");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4291 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4292 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4293
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4294 /* Format codes
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4295 * F_LJUST '-'
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4296 * F_SIGN '+'
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4297 * F_BLANK ' '
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4298 * F_ALT '#'
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4299 * F_ZERO '0'
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4300 */
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4301 #define F_LJUST (1<<0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4302 #define F_SIGN (1<<1)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4303 #define F_BLANK (1<<2)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4304 #define F_ALT (1<<3)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4305 #define F_ZERO (1<<4)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4306
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	4307 Py_LOCAL_INLINE(int)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4308 formatfloat(char *buf, size_t buflen, int flags,
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4309 int prec, int type, PyObject *v)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4310 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4311 /* fmt = '%#.' + `prec` + `type`
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4312 worst case length = 3 + 10 (len of INT_MAX) + 1 = 14 (use 20)*/
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4313 char fmt[20];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4314 double x;
24415 f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4315 x = PyFloat_AsDouble(v);
f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4316 if (x == -1.0 && PyErr_Occurred()) {
40357 b871e7bd8355 Patch [ 1586791 ] better error msgs for some TypeErrors Georg Brandl <georg@python.org> parents: 39995 diff changeset	4317 PyErr_Format(PyExc_TypeError, "float argument required, "
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	4318 "not %.200s", Py_TYPE(v)->tp_name);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4319 return -1;
24415 f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4320 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4321 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4322 prec = 6;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4323 if (type == 'f' && fabs(x)/1e25 >= 1e25)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4324 type = 'g';
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4325 /* Worst case length calc to ensure no buffer overrun:
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4326
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4327 'g' formats:
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4328 fmt = %#.<prec>g
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4329 buf = '-' + [0-9]*prec + '.' + 'e+' + (longest exp
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	4330 for any double rep.)
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4331 len = 1 + prec + 1 + 2 + 5 = 9 + prec
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4332
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4333 'f' formats:
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4334 buf = '-' + [0-9]x + '.' + [0-9]prec (with x < 50)
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4335 len = 1 + 50 + 1 + prec = 52 + prec
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4336
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4337 If prec=0 the effective precision is 1 (the leading digit is
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	4338 always given), therefore increase the length by one.
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4339
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4340 */
42216 86d1dbfc5833 Patch #1673759: add a missing overflow check when formatting floats Georg Brandl <georg@python.org> parents: 42024 diff changeset	4341 if (((type == 'g' \|\| type == 'G') &&
86d1dbfc5833 Patch #1673759: add a missing overflow check when formatting floats Georg Brandl <georg@python.org> parents: 42024 diff changeset	4342 buflen <= (size_t)10 + (size_t)prec) \|\|
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4343 (type == 'f' && buflen <= (size_t)53 + (size_t)prec)) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4344 PyErr_SetString(PyExc_OverflowError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15082 diff changeset	4345 "formatted float is too long (precision too large?)");
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4346 return -1;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4347 }
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4348 PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%d%c",
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4349 (flags&F_ALT) ? "#" : "",
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4350 prec, type);
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 31350 diff changeset	4351 PyOS_ascii_formatd(buf, buflen, fmt, x);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4352 return (int)strlen(buf);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4353 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4354
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4355 /* _PyString_FormatLong emulates the format codes d, u, o, x and X, and
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4356 * the F_ALT flag, for Python's long (unbounded) ints. It's not used for
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4357 * Python's regular ints.
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4358 * Return value: a new PyString*, or NULL if error.
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4359 * . *pbuf is set to point into it,
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4360 * *plen set to the # of chars following that.
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4361 * Caller must decref it when done using pbuf.
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4362 * The string starting at *pbuf is of the form
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4363 * "-"? ("0x" \| "0X")? digit+
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4364 * "0x"/"0X" are present only for x and X conversions, with F_ALT
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	4365 * set in flags. The case of hex digits will be correct,
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4366 * There will be at least prec digits, zero-filled on the left if
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4367 * necessary to get that many.
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4368 * val object to be converted
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4369 * flags bitmask of format flags; only F_ALT is looked at
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4370 * prec minimum number of digits; 0-fill on left if needed
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4371 * type a character in [duoxX]; u acts the same as d
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4372 *
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4373 * CAUTION: o, x and X conversions on regular ints can never
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4374 * produce a '-' sign, but can for Python's unbounded ints.
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4375 */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4376 PyObject*
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4377 _PyString_FormatLong(PyObject *val, int flags, int prec, int type,
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4378 char *pbuf, int plen)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4379 {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4380 PyObject *result = NULL;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4381 char *buf;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4382 Py_ssize_t i;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4383 int sign; /* 1 if '-', else 0 */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4384 int len; /* number of characters */
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4385 Py_ssize_t llen;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4386 int numdigits; /* len == numnondigits + numdigits */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4387 int numnondigits = 0;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4388
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4389 switch (type) {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4390 case 'd':
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4391 case 'u':
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	4392 result = Py_TYPE(val)->tp_str(val);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4393 break;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4394 case 'o':
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	4395 result = Py_TYPE(val)->tp_as_number->nb_oct(val);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4396 break;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4397 case 'x':
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4398 case 'X':
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4399 numnondigits = 2;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	4400 result = Py_TYPE(val)->tp_as_number->nb_hex(val);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4401 break;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4402 default:
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4403 assert(!"'type' not in [duoxX]");
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4404 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4405 if (!result)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4406 return NULL;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4407
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4408 buf = PyString_AsString(result);
39494 a95090281032 Fix refleak introduced in rev. 51248. Georg Brandl <georg@python.org> parents: 39469 diff changeset	4409 if (!buf) {
a95090281032 Fix refleak introduced in rev. 51248. Georg Brandl <georg@python.org> parents: 39469 diff changeset	4410 Py_DECREF(result);
39469 71baa06767dd Fix segfault when doing string formatting on subclasses of long if Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	4411 return NULL;
39494 a95090281032 Fix refleak introduced in rev. 51248. Georg Brandl <georg@python.org> parents: 39469 diff changeset	4412 }
39469 71baa06767dd Fix segfault when doing string formatting on subclasses of long if Neal Norwitz <nnorwitz@gmail.com> parents: 39463 diff changeset	4413
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4414 /* To modify the string in-place, there can only be one reference. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	4415 if (Py_REFCNT(result) != 1) {
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4416 PyErr_BadInternalCall();
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4417 return NULL;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4418 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4419 llen = PyString_Size(result);
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	4420 if (llen > INT_MAX) {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4421 PyErr_SetString(PyExc_ValueError, "string too large in _PyString_FormatLong");
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4422 return NULL;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4423 }
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4424 len = (int)llen;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4425 if (buf[len-1] == 'L') {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4426 --len;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4427 buf[len] = '\0';
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4428 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4429 sign = buf[0] == '-';
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4430 numnondigits += sign;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4431 numdigits = len - numnondigits;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4432 assert(numdigits > 0);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4433
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4434 /* Get rid of base marker unless F_ALT */
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4435 if ((flags & F_ALT) == 0) {
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4436 /* Need to skip 0x, 0X or 0. */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4437 int skipped = 0;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4438 switch (type) {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4439 case 'o':
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4440 assert(buf[sign] == '0');
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4441 /* If 0 is only digit, leave it alone. */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4442 if (numdigits > 1) {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4443 skipped = 1;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4444 --numdigits;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4445 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4446 break;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4447 case 'x':
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4448 case 'X':
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4449 assert(buf[sign] == '0');
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4450 assert(buf[sign + 1] == 'x');
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4451 skipped = 2;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4452 numnondigits -= 2;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4453 break;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4454 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4455 if (skipped) {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4456 buf += skipped;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4457 len -= skipped;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4458 if (sign)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4459 buf[0] = '-';
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4460 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4461 assert(len == numnondigits + numdigits);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4462 assert(numdigits > 0);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4463 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4464
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4465 /* Fill with leading zeroes to meet minimum width. */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4466 if (prec > numdigits) {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4467 PyObject *r1 = PyString_FromStringAndSize(NULL,
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4468 numnondigits + prec);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4469 char *b1;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4470 if (!r1) {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4471 Py_DECREF(result);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4472 return NULL;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4473 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4474 b1 = PyString_AS_STRING(r1);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4475 for (i = 0; i < numnondigits; ++i)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4476 b1++ = buf++;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4477 for (i = 0; i < prec - numdigits; i++)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4478 *b1++ = '0';
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4479 for (i = 0; i < numdigits; i++)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4480 b1++ = buf++;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4481 *b1 = '\0';
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4482 Py_DECREF(result);
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4483 result = r1;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4484 buf = PyString_AS_STRING(result);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4485 len = numnondigits + prec;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4486 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4487
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4488 /* Fix up case for hex conversions. */
35177 27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	4489 if (type == 'X') {
27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	4490 /* Need to convert all lower case letters to upper case.
27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	4491 and need to convert 0x to 0X (and -0x to -0X). */
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4492 for (i = 0; i < len; i++)
35177 27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	4493 if (buf[i] >= 'a' && buf[i] <= 'x')
27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	4494 buf[i] -= 'a'-'A';
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4495 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4496 *pbuf = buf;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4497 *plen = len;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4498 return result;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4499 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4500
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	4501 Py_LOCAL_INLINE(int)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4502 formatint(char *buf, size_t buflen, int flags,
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4503 int prec, int type, PyObject *v)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4504 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4505 /* fmt = '%#.' + `prec` + 'l' + `type`
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4506 worst case length = 3 + 19 (worst len of INT_MAX on 64-bit machine)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4507 + 1 + 1 = 24 */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4508 char fmt[64]; /* plenty big enough! */
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4509 char *sign;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4510 long x;
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4511
24415 f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4512 x = PyInt_AsLong(v);
f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4513 if (x == -1 && PyErr_Occurred()) {
40357 b871e7bd8355 Patch [ 1586791 ] better error msgs for some TypeErrors Georg Brandl <georg@python.org> parents: 39995 diff changeset	4514 PyErr_Format(PyExc_TypeError, "int argument required, not %.200s",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	4515 Py_TYPE(v)->tp_name);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4516 return -1;
24415 f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4517 }
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4518 if (x < 0 && type == 'u') {
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4519 type = 'd';
24736 ff05eef3a6d1 Implement stage B0 of PEP 237: add warnings for operations that Guido van Rossum <guido@python.org> parents: 24598 diff changeset	4520 }
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4521 if (x < 0 && (type == 'x' \|\| type == 'X' \|\| type == 'o'))
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4522 sign = "-";
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4523 else
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4524 sign = "";
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4525 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4526 prec = 1;
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4527
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4528 if ((flags & F_ALT) &&
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4529 (type == 'x' \|\| type == 'X')) {
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4530 /* When converting under %#x or %#X, there are a number
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4531 * of issues that cause pain:
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4532 * - when 0 is being converted, the C standard leaves off
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4533 * the '0x' or '0X', which is inconsistent with other
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4534 * %#x/%#X conversions and inconsistent with Python's
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4535 * hex() function
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4536 * - there are platforms that violate the standard and
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4537 * convert 0 with the '0x' or '0X'
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4538 * (Metrowerks, Compaq Tru64)
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4539 * - there are platforms that give '0x' when converting
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4540 * under %#X, but convert 0 in accordance with the
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4541 * standard (OS/2 EMX)
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4542 *
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4543 * We can achieve the desired consistency by inserting our
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4544 * own '0x' or '0X' prefix, and substituting %x/%X in place
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4545 * of %#x/%#X.
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4546 *
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4547 * Note that this is the same approach as used in
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4548 * formatint() in unicodeobject.c
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4549 */
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4550 PyOS_snprintf(fmt, sizeof(fmt), "%s0%c%%.%dl%c",
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4551 sign, type, prec, type);
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4552 }
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4553 else {
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4554 PyOS_snprintf(fmt, sizeof(fmt), "%s%%%s.%dl%c",
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4555 sign, (flags&F_ALT) ? "#" : "",
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4556 prec, type);
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4557 }
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4558
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4559 /* buf = '+'/'-'/'' + '0'/'0x'/'' + '[0-9]'*max(prec, len(x in octal))
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4560 * worst case buf = '-0x' + [0-9]*prec, where prec >= 11
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4561 */
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4562 if (buflen <= 14 \|\| buflen <= (size_t)3 + (size_t)prec) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4563 PyErr_SetString(PyExc_OverflowError,
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4564 "formatted integer is too long (precision too large?)");
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4565 return -1;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4566 }
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4567 if (sign[0])
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4568 PyOS_snprintf(buf, buflen, fmt, -x);
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4569 else
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4570 PyOS_snprintf(buf, buflen, fmt, x);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4571 return (int)strlen(buf);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4572 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4573
38440 5b0753b9d16a needforspeed: replace improvements, changed to Py_LOCAL_INLINE Fredrik Lundh <fredrik@pythonware.com> parents: 38438 diff changeset	4574 Py_LOCAL_INLINE(int)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4575 formatchar(char buf, size_t buflen, PyObject v)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4576 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4577 /* presume that the buffer is at least 2 characters long */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4578 if (PyString_Check(v)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4579 if (!PyArg_Parse(v, "c;%c requires int or char", &buf[0]))
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4580 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4581 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4582 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4583 if (!PyArg_Parse(v, "b;%c requires int or char", &buf[0]))
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4584 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4585 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4586 buf[1] = '\0';
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4587 return 1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4588 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4589
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4590 /* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...)
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4591
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4592 FORMATBUFLEN is the length of the buffer in which the floats, ints, &
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4593 chars are formatted. XXX This is a magic number. Each formatting
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4594 routine does bounds checking to ensure no overflow, but a better
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4595 solution may be to malloc a buffer of appropriate size for each
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4596 format. For now, the current solution is sufficient.
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4597 */
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4598 #define FORMATBUFLEN (size_t)120
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4599
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4600 PyObject *
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4601 PyString_Format(PyObject format, PyObject args)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4602 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4603 char fmt, res;
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	4604 Py_ssize_t arglen, argidx;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4605 Py_ssize_t reslen, rescnt, fmtcnt;
3570 977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	4606 int args_owned = 0;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4607 PyObject result, orig_args;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4608 #ifdef Py_USING_UNICODE
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4609 PyObject v, w;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4610 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4611 PyObject *dict = NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4612 if (format == NULL \|\| !PyString_Check(format) \|\| args == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4613 PyErr_BadInternalCall();
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4614 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4615 }
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4616 orig_args = args;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4617 fmt = PyString_AS_STRING(format);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4618 fmtcnt = PyString_GET_SIZE(format);
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	4619 reslen = rescnt = fmtcnt + 100;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4620 result = PyString_FromStringAndSize((char *)NULL, reslen);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4621 if (result == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4622 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4623 res = PyString_AsString(result);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4624 if (PyTuple_Check(args)) {
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4625 arglen = PyTuple_GET_SIZE(args);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4626 argidx = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4627 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4628 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4629 arglen = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4630 argidx = -2;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4631 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	4632 if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) &&
26164 63a08639dae2 Fix SF # 635969, No error "not all arguments converted" Neal Norwitz <nnorwitz@gmail.com> parents: 25721 diff changeset	4633 !PyObject_TypeCheck(args, &PyBaseString_Type))
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4634 dict = args;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4635 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4636 if (*fmt != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4637 if (--rescnt < 0) {
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	4638 rescnt = fmtcnt + 100;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	4639 reslen += rescnt;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4640 if (_PyString_Resize(&result, reslen) < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4641 return NULL;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4642 res = PyString_AS_STRING(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4643 + reslen - rescnt;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4644 --rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4645 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4646 res++ = fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4647 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4648 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4649 /* Got a format specifier */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4650 int flags = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4651 Py_ssize_t width = -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4652 int prec = -1;
1408 18df674539da Three micro fixes to formatstring Guido van Rossum <guido@python.org> parents: 1380 diff changeset	4653 int c = '\0';
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4654 int fill;
45500 c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4655 int isnumok;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4656 PyObject *v = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4657 PyObject *temp = NULL;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4658 char *pbuf;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4659 int sign;
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4660 Py_ssize_t len;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4661 char formatbuf[FORMATBUFLEN];
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4662 /* For format{float,int,char}() */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4663 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4664 char *fmt_start = fmt;
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4665 Py_ssize_t argidx_start = argidx;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4666 #endif
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	4667
4588 4dc67fdd9e0b Make gcc -Wall happy Guido van Rossum <guido@python.org> parents: 4503 diff changeset	4668 fmt++;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4669 if (*fmt == '(') {
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4670 char *keystart;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4671 Py_ssize_t keylen;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4672 PyObject *key;
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4673 int pcount = 1;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4674
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4675 if (dict == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4676 PyErr_SetString(PyExc_TypeError,
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	4677 "format requires a mapping");
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4678 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4679 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4680 ++fmt;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4681 --fmtcnt;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4682 keystart = fmt;
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4683 /* Skip over balanced parentheses */
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4684 while (pcount > 0 && --fmtcnt >= 0) {
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4685 if (*fmt == ')')
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4686 --pcount;
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4687 else if (*fmt == '(')
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4688 ++pcount;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4689 fmt++;
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4690 }
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4691 keylen = fmt - keystart - 1;
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4692 if (fmtcnt < 0 \|\| pcount > 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4693 PyErr_SetString(PyExc_ValueError,
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4694 "incomplete format key");
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4695 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4696 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4697 key = PyString_FromStringAndSize(keystart,
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4698 keylen);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4699 if (key == NULL)
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4700 goto error;
3570 977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	4701 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4702 Py_DECREF(args);
3570 977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	4703 args_owned = 0;
977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	4704 }
977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	4705 args = PyObject_GetItem(dict, key);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4706 Py_DECREF(key);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4707 if (args == NULL) {
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4708 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4709 }
3570 977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	4710 args_owned = 1;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4711 arglen = -1;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4712 argidx = -2;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4713 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4714 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4715 switch (c = *fmt++) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4716 case '-': flags \|= F_LJUST; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4717 case '+': flags \|= F_SIGN; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4718 case ' ': flags \|= F_BLANK; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4719 case '#': flags \|= F_ALT; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4720 case '0': flags \|= F_ZERO; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4721 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4722 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4723 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4724 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4725 v = getnextarg(args, arglen, &argidx);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4726 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4727 goto error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4728 if (!PyInt_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4729 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4730 "* wants int");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4731 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4732 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4733 width = PyInt_AsLong(v);
10923 8234bb36fb8c Fix bug discovered by John W. Shipman -- when the width of a format Guido van Rossum <guido@python.org> parents: 9305 diff changeset	4734 if (width < 0) {
8234bb36fb8c Fix bug discovered by John W. Shipman -- when the width of a format Guido van Rossum <guido@python.org> parents: 9305 diff changeset	4735 flags \|= F_LJUST;
8234bb36fb8c Fix bug discovered by John W. Shipman -- when the width of a format Guido van Rossum <guido@python.org> parents: 9305 diff changeset	4736 width = -width;
8234bb36fb8c Fix bug discovered by John W. Shipman -- when the width of a format Guido van Rossum <guido@python.org> parents: 9305 diff changeset	4737 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4738 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4739 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4740 }
2308 14b126d0b5be use Py_CHARMASK; and don't check for neg. float to the float power here Guido van Rossum <guido@python.org> parents: 2059 diff changeset	4741 else if (c >= 0 && isdigit(c)) {
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4742 width = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4743 while (--fmtcnt >= 0) {
2308 14b126d0b5be use Py_CHARMASK; and don't check for neg. float to the float power here Guido van Rossum <guido@python.org> parents: 2059 diff changeset	4744 c = Py_CHARMASK(*fmt++);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4745 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4746 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4747 if ((width*10) / 10 != width) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4748 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4749 PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4750 "width too big");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4751 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4752 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4753 width = width*10 + (c - '0');
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4754 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4755 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4756 if (c == '.') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4757 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4758 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4759 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4760 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4761 v = getnextarg(args, arglen, &argidx);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4762 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4763 goto error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4764 if (!PyInt_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4765 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4766 PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4767 "* wants int");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4768 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4769 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4770 prec = PyInt_AsLong(v);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4771 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4772 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4773 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4774 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4775 }
2308 14b126d0b5be use Py_CHARMASK; and don't check for neg. float to the float power here Guido van Rossum <guido@python.org> parents: 2059 diff changeset	4776 else if (c >= 0 && isdigit(c)) {
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4777 prec = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4778 while (--fmtcnt >= 0) {
2308 14b126d0b5be use Py_CHARMASK; and don't check for neg. float to the float power here Guido van Rossum <guido@python.org> parents: 2059 diff changeset	4779 c = Py_CHARMASK(*fmt++);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4780 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4781 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4782 if ((prec*10) / 10 != prec) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4783 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4784 PyExc_ValueError,
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4785 "prec too big");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4786 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4787 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4788 prec = prec*10 + (c - '0');
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4789 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4790 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4791 } /* prec */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4792 if (fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4793 if (c == 'h' \|\| c == 'l' \|\| c == 'L') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4794 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4795 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4796 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4797 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4798 if (fmtcnt < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4799 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4800 "incomplete format");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4801 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4802 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4803 if (c != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4804 v = getnextarg(args, arglen, &argidx);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4805 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4806 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4807 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4808 sign = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4809 fill = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4810 switch (c) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4811 case '%':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4812 pbuf = "%";
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4813 len = 1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4814 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4815 case 's':
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4816 #ifdef Py_USING_UNICODE
35503 f63e6960c5cf Fix bug in last checkin (2.231). To match previous behavior, unicode Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35331 diff changeset	4817 if (PyUnicode_Check(v)) {
f63e6960c5cf Fix bug in last checkin (2.231). To match previous behavior, unicode Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35331 diff changeset	4818 fmt = fmt_start;
f63e6960c5cf Fix bug in last checkin (2.231). To match previous behavior, unicode Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35331 diff changeset	4819 argidx = argidx_start;
f63e6960c5cf Fix bug in last checkin (2.231). To match previous behavior, unicode Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35331 diff changeset	4820 goto unicode;
f63e6960c5cf Fix bug in last checkin (2.231). To match previous behavior, unicode Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35331 diff changeset	4821 }
35665 dc5d706283d6 Fix PyString_Format so that the "%s" format works again when Unicode is not Georg Brandl <georg@python.org> parents: 35503 diff changeset	4822 #endif
35331 ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35177 diff changeset	4823 temp = _PyObject_Str(v);
35665 dc5d706283d6 Fix PyString_Format so that the "%s" format works again when Unicode is not Georg Brandl <georg@python.org> parents: 35503 diff changeset	4824 #ifdef Py_USING_UNICODE
35331 ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35177 diff changeset	4825 if (temp != NULL && PyUnicode_Check(temp)) {
ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35177 diff changeset	4826 Py_DECREF(temp);
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4827 fmt = fmt_start;
17655 0470babdae49 Fix for bug #417030: "print '%s' fails for unicode string" Marc-André Lemburg <mal@egenix.com>* parents: 17645 diff changeset	4828 argidx = argidx_start;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4829 goto unicode;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4830 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4831 #endif
25682 ce49f12a1769 The string formatting code has a test to switch to Unicode when %s Guido van Rossum <guido@python.org> parents: 25659 diff changeset	4832 /* Fall through */
29529 f48bb94f3289 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 28575 diff changeset	4833 case 'r':
35331 ef11cbc08dab Change the %s format specifier for str objects so that it returns a Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35177 diff changeset	4834 if (c == 'r')
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	4835 temp = PyObject_Repr(v);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4836 if (temp == NULL)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4837 goto error;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4838 if (!PyString_Check(temp)) {
8468 c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	4839 PyErr_SetString(PyExc_TypeError,
25683 38843d35b646 Undo this part of the previous checkin: Guido van Rossum <guido@python.org> parents: 25682 diff changeset	4840 "%s argument has non-string str()");
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4841 Py_DECREF(temp);
8468 c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	4842 goto error;
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	4843 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4844 pbuf = PyString_AS_STRING(temp);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4845 len = PyString_GET_SIZE(temp);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4846 if (prec >= 0 && len > prec)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4847 len = prec;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4848 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4849 case 'i':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4850 case 'd':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4851 case 'u':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4852 case 'o':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4853 case 'x':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4854 case 'X':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4855 if (c == 'i')
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4856 c = 'd';
45500 c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4857 isnumok = 0;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4858 if (PyNumber_Check(v)) {
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4859 PyObject *iobj=NULL;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4860
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4861 if (PyInt_Check(v) \|\| (PyLong_Check(v))) {
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4862 iobj = v;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4863 Py_INCREF(iobj);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4864 }
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4865 else {
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4866 iobj = PyNumber_Int(v);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4867 if (iobj==NULL) iobj = PyNumber_Long(v);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4868 }
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4869 if (iobj!=NULL) {
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4870 if (PyInt_Check(iobj)) {
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4871 isnumok = 1;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4872 pbuf = formatbuf;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4873 len = formatint(pbuf,
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4874 sizeof(formatbuf),
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4875 flags, prec, c, iobj);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4876 Py_DECREF(iobj);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4877 if (len < 0)
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4878 goto error;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4879 sign = 1;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4880 }
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4881 else if (PyLong_Check(iobj)) {
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4882 int ilen;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4883
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4884 isnumok = 1;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4885 temp = _PyString_FormatLong(iobj, flags,
45500 c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4886 prec, c, &pbuf, &ilen);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4887 Py_DECREF(iobj);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4888 len = ilen;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4889 if (!temp)
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4890 goto error;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4891 sign = 1;
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4892 }
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4893 else {
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4894 Py_DECREF(iobj);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4895 }
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4896 }
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4897 }
45500 c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4898 if (!isnumok) {
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4899 PyErr_Format(PyExc_TypeError,
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4900 "%%%c format: a number is required, "
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4901 "not %.200s", c, Py_TYPE(v)->tp_name);
c03aff6d07f5 Issue 1742669. Now %d accepts very big float numbers. Facundo Batista <facundobatista@gmail.com> parents: 45381 diff changeset	4902 goto error;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4903 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4904 if (flags & F_ZERO)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4905 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4906 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4907 case 'e':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4908 case 'E':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4909 case 'f':
30216 7ab1a41f16da SF bug #795506: Wrong handling of string format code for float values. Raymond Hettinger <python@rcn.com> parents: 29529 diff changeset	4910 case 'F':
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4911 case 'g':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4912 case 'G':
30216 7ab1a41f16da SF bug #795506: Wrong handling of string format code for float values. Raymond Hettinger <python@rcn.com> parents: 29529 diff changeset	4913 if (c == 'F')
7ab1a41f16da SF bug #795506: Wrong handling of string format code for float values. Raymond Hettinger <python@rcn.com> parents: 29529 diff changeset	4914 c = 'f';
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4915 pbuf = formatbuf;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4916 len = formatfloat(pbuf, sizeof(formatbuf),
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4917 flags, prec, c, v);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4918 if (len < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4919 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4920 sign = 1;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4921 if (flags & F_ZERO)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4922 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4923 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4924 case 'c':
28478 8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4925 #ifdef Py_USING_UNICODE
8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4926 if (PyUnicode_Check(v)) {
8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4927 fmt = fmt_start;
8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4928 argidx = argidx_start;
8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4929 goto unicode;
8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4930 }
8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4931 #endif
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4932 pbuf = formatbuf;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4933 len = formatchar(pbuf, sizeof(formatbuf), v);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4934 if (len < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4935 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4936 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4937 default:
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4938 PyErr_Format(PyExc_ValueError,
15579 31d78f361530 [ Patch #102852 ] Make % error a bit more informative by indicates the Andrew M. Kuchling <amk@amk.ca> parents: 15484 diff changeset	4939 "unsupported format character '%c' (0x%x) "
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	4940 "at index %zd",
25233 8d751b62ecc4 Fix warnings on 64-bit platforms about casts from pointers to ints. Guido van Rossum <guido@python.org> parents: 25173 diff changeset	4941 c, c,
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39734 diff changeset	4942 (Py_ssize_t)(fmt - 1 -
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4943 PyString_AsString(format)));
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4944 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4945 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4946 if (sign) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4947 if (pbuf == '-' \|\| pbuf == '+') {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4948 sign = *pbuf++;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4949 len--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4950 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4951 else if (flags & F_SIGN)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4952 sign = '+';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4953 else if (flags & F_BLANK)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4954 sign = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4955 else
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4956 sign = 0;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4957 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4958 if (width < len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4959 width = len;
25719 f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25683 diff changeset	4960 if (rescnt - (sign != 0) < width) {
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	4961 reslen -= rescnt;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	4962 rescnt = width + fmtcnt + 100;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	4963 reslen += rescnt;
25719 f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25683 diff changeset	4964 if (reslen < 0) {
f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25683 diff changeset	4965 Py_DECREF(result);
40925 621443fc01bb Backport from Py3k branch: fix refleak in PyString_Format. Georg Brandl <georg@python.org> parents: 40908 diff changeset	4966 Py_XDECREF(temp);
25719 f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25683 diff changeset	4967 return PyErr_NoMemory();
f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25683 diff changeset	4968 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4969 if (_PyString_Resize(&result, reslen) < 0) {
40925 621443fc01bb Backport from Py3k branch: fix refleak in PyString_Format. Georg Brandl <georg@python.org> parents: 40908 diff changeset	4970 Py_XDECREF(temp);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4971 return NULL;
40925 621443fc01bb Backport from Py3k branch: fix refleak in PyString_Format. Georg Brandl <georg@python.org> parents: 40908 diff changeset	4972 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	4973 res = PyString_AS_STRING(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4974 + reslen - rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4975 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4976 if (sign) {
1409 f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	4977 if (fill != ' ')
f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	4978 *res++ = sign;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4979 rescnt--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4980 if (width > len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4981 width--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4982 }
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4983 if ((flags & F_ALT) && (c == 'x' \|\| c == 'X')) {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4984 assert(pbuf[0] == '0');
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4985 assert(pbuf[1] == c);
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4986 if (fill != ' ') {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4987 res++ = pbuf++;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4988 res++ = pbuf++;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4989 }
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4990 rescnt -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4991 width -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4992 if (width < 0)
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4993 width = 0;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4994 len -= 2;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4995 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	4996 if (width > len && !(flags & F_LJUST)) {
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4997 do {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4998 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4999 *res++ = fill;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5000 } while (--width > len);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5001 }
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	5002 if (fill == ' ') {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	5003 if (sign)
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	5004 *res++ = sign;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	5005 if ((flags & F_ALT) &&
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	5006 (c == 'x' \|\| c == 'X')) {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	5007 assert(pbuf[0] == '0');
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	5008 assert(pbuf[1] == c);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	5009 res++ = pbuf++;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	5010 res++ = pbuf++;
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	5011 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	5012 }
38457 551814e4b471 needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), Fredrik Lundh <fredrik@pythonware.com> parents: 38442 diff changeset	5013 Py_MEMCPY(res, pbuf, len);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5014 res += len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5015 rescnt -= len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5016 while (--width >= len) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5017 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5018 *res++ = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5019 }
2308 14b126d0b5be use Py_CHARMASK; and don't check for neg. float to the float power here Guido van Rossum <guido@python.org> parents: 2059 diff changeset	5020 if (dict && (argidx < arglen) && c != '%') {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	5021 PyErr_SetString(PyExc_TypeError,
23494 76f376bea5e5 Patch 549187. Improve string formatting error message. Raymond Hettinger <python@rcn.com> parents: 23430 diff changeset	5022 "not all arguments converted during string formatting");
40925 621443fc01bb Backport from Py3k branch: fix refleak in PyString_Format. Georg Brandl <georg@python.org> parents: 40908 diff changeset	5023 Py_XDECREF(temp);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	5024 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	5025 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	5026 Py_XDECREF(temp);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5027 } /* '%' */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5028 } /* until end */
2432 445bea8ceab1 don't complain about too many args if arg is a dict Guido van Rossum <guido@python.org> parents: 2308 diff changeset	5029 if (argidx < arglen && !dict) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	5030 PyErr_SetString(PyExc_TypeError,
23494 76f376bea5e5 Patch 549187. Improve string formatting error message. Raymond Hettinger <python@rcn.com> parents: 23430 diff changeset	5031 "not all arguments converted during string formatting");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5032 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5033 }
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	5034 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	5035 Py_DECREF(args);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	5036 }
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5037 _PyString_Resize(&result, reslen - rescnt);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5038 return result;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5039
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	5040 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5041 unicode:
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5042 if (args_owned) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5043 Py_DECREF(args);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5044 args_owned = 0;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5045 }
17655 0470babdae49 Fix for bug #417030: "print '%s' fails for unicode string" Marc-André Lemburg <mal@egenix.com>* parents: 17645 diff changeset	5046 /* Fiddle args right (remove the first argidx arguments) */
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5047 if (PyTuple_Check(orig_args) && argidx > 0) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5048 PyObject *v;
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	5049 Py_ssize_t n = PyTuple_GET_SIZE(orig_args) - argidx;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5050 v = PyTuple_New(n);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5051 if (v == NULL)
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5052 goto error;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5053 while (--n >= 0) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5054 PyObject *w = PyTuple_GET_ITEM(orig_args, n + argidx);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5055 Py_INCREF(w);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5056 PyTuple_SET_ITEM(v, n, w);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5057 }
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5058 args = v;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5059 } else {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5060 Py_INCREF(orig_args);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5061 args = orig_args;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5062 }
15082 c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5063 args_owned = 1;
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5064 /* Take what we have of the result and let the Unicode formatting
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5065 function format the rest of the input. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5066 rescnt = res - PyString_AS_STRING(result);
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5067 if (_PyString_Resize(&result, rescnt))
15082 c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5068 goto error;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5069 fmtcnt = PyString_GET_SIZE(format) - \
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5070 (fmt - PyString_AS_STRING(format));
15082 c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5071 format = PyUnicode_Decode(fmt, fmtcnt, NULL, NULL);
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5072 if (format == NULL)
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5073 goto error;
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5074 v = PyUnicode_Format(format, args);
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5075 Py_DECREF(format);
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5076 if (v == NULL)
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5077 goto error;
15082 c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5078 /* Paste what we have (result) to what the Unicode formatting
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5079 function returned (v) and return the result (or error) */
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5080 w = PyUnicode_Concat(result, v);
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5081 Py_DECREF(result);
c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5082 Py_DECREF(v);
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	5083 Py_DECREF(args);
15082 c2f13c395b9a [ Bug #116174 ] using %% in cstrings sometimes fails with unicode paramsFix for the bug reported in Bug #116174: "%% %s" % u"abc" failed due Marc-André Lemburg <mal@egenix.com> parents: 14869 diff changeset	5084 return w;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	5085 #endif /* Py_USING_UNICODE */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	5086
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5087 error:
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	5088 Py_DECREF(result);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	5089 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	5090 Py_DECREF(args);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	5091 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5092 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	5093 }
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5094
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5095 void
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	5096 PyString_InternInPlace(PyObject **p)
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5097 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5098 register PyStringObject s = (PyStringObject )(*p);
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5099 PyObject *t;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5100 if (s == NULL \|\| !PyString_Check(s))
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	5101 Py_FatalError("PyString_InternInPlace: strings only please!");
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5102 /* If it's a string subclass, we don't really know what putting
5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5103 it in the interned dict might do. */
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5104 if (!PyString_CheckExact(s))
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5105 return;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5106 if (PyString_CHECK_INTERNED(s))
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5107 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5108 if (interned == NULL) {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5109 interned = PyDict_New();
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5110 if (interned == NULL) {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5111 PyErr_Clear(); /* Don't leave an exception */
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5112 return;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5113 }
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5114 }
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5115 t = PyDict_GetItem(interned, (PyObject *)s);
5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5116 if (t) {
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5117 Py_INCREF(t);
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5118 Py_DECREF(*p);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5119 *p = t;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5120 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5121 }
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5122
33023 4f588f57a93b Fixed some compiler warnings. Armin Rigo <arigo@tunes.org> parents: 33019 diff changeset	5123 if (PyDict_SetItem(interned, (PyObject )s, (PyObject )s) < 0) {
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5124 PyErr_Clear();
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5125 return;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5126 }
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5127 /* The two references in interned are not counted by refcnt.
5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	5128 The string deallocator will take care of this */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	5129 Py_REFCNT(s) -= 2;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5130 PyString_CHECK_INTERNED(s) = SSTATE_INTERNED_MORTAL;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5131 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5132
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5133 void
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	5134 PyString_InternImmortal(PyObject **p)
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5135 {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	5136 PyString_InternInPlace(p);
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5137 if (PyString_CHECK_INTERNED(*p) != SSTATE_INTERNED_IMMORTAL) {
acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5138 PyString_CHECK_INTERNED(*p) = SSTATE_INTERNED_IMMORTAL;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5139 Py_INCREF(*p);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5140 }
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5141 }
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5142
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5143
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5144 PyObject *
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	5145 PyString_InternFromString(const char *cp)
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5146 {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5147 PyObject *s = PyString_FromString(cp);
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5148 if (s == NULL)
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5149 return NULL;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	5150 PyString_InternInPlace(&s);
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5151 return s;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5152 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	5153
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5154 void
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47421 diff changeset	5155 PyString_Fini(void)
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5156 {
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5157 int i;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5158 for (i = 0; i < UCHAR_MAX + 1; i++) {
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5159 Py_XDECREF(characters[i]);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5160 characters[i] = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5161 }
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5162 Py_XDECREF(nullstring);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5163 nullstring = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	5164 }
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	5165
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	5166 void _Py_ReleaseInternedStrings(void)
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	5167 {
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5168 PyObject *keys;
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5169 PyStringObject *s;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	5170 Py_ssize_t i, n;
40901 2e4dac059cc5 Add more details when releasing interned strings Neal Norwitz <nnorwitz@gmail.com> parents: 40357 diff changeset	5171 Py_ssize_t immortal_size = 0, mortal_size = 0;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5172
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5173 if (interned == NULL \|\| !PyDict_Check(interned))
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5174 return;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5175 keys = PyDict_Keys(interned);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5176 if (keys == NULL \|\| !PyList_Check(keys)) {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5177 PyErr_Clear();
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5178 return;
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	5179 }
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5180
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5181 /* Since _Py_ReleaseInternedStrings() is intended to help a leak
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5182 detector, interned strings are not forcibly deallocated; rather, we
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5183 give them their stolen references back, and then clear and DECREF
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5184 the interned dict. */
37037 bfb74a420ac8 Introduced symbol PY_FORMAT_SIZE_T. See the new comments Tim Peters <tim.peters@gmail.com> parents: 36882 diff changeset	5185
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5186 n = PyList_GET_SIZE(keys);
40901 2e4dac059cc5 Add more details when releasing interned strings Neal Norwitz <nnorwitz@gmail.com> parents: 40357 diff changeset	5187 fprintf(stderr, "releasing %" PY_FORMAT_SIZE_T "d interned strings\n",
2e4dac059cc5 Add more details when releasing interned strings Neal Norwitz <nnorwitz@gmail.com> parents: 40357 diff changeset	5188 n);
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5189 for (i = 0; i < n; i++) {
47560 acda43252710 More reverting of r63675 per the mailing list discussions. This restores Gregory P. Smith <greg@mad-scientist.com> parents: 47527 diff changeset	5190 s = (PyStringObject *) PyList_GET_ITEM(keys, i);
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5191 switch (s->ob_sstate) {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5192 case SSTATE_NOT_INTERNED:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5193 /* XXX Shouldn't happen */
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5194 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5195 case SSTATE_INTERNED_IMMORTAL:
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	5196 Py_REFCNT(s) += 1;
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	5197 immortal_size += Py_SIZE(s);
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5198 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5199 case SSTATE_INTERNED_MORTAL:
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	5200 Py_REFCNT(s) += 2;
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44225 diff changeset	5201 mortal_size += Py_SIZE(s);
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5202 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5203 default:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5204 Py_FatalError("Inconsistent interned string state.");
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5205 }
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5206 s->ob_sstate = SSTATE_NOT_INTERNED;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5207 }
40901 2e4dac059cc5 Add more details when releasing interned strings Neal Norwitz <nnorwitz@gmail.com> parents: 40357 diff changeset	5208 fprintf(stderr, "total size of all interned strings: "
2e4dac059cc5 Add more details when releasing interned strings Neal Norwitz <nnorwitz@gmail.com> parents: 40357 diff changeset	5209 "%" PY_FORMAT_SIZE_T "d/%" PY_FORMAT_SIZE_T "d "
2e4dac059cc5 Add more details when releasing interned strings Neal Norwitz <nnorwitz@gmail.com> parents: 40357 diff changeset	5210 "mortal/immortal\n", mortal_size, immortal_size);
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5211 Py_DECREF(keys);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5212 PyDict_Clear(interned);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5213 Py_DECREF(interned);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	5214 interned = NULL;
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	5215 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/stringobject.c @ 47787:b32101c19bf8 legacy-trunk