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

annotate Objects/stringobject.c @ 39222:b0cdcbcc5f45

Get rid of most of the flags (in tp_flags) that keep track of various variations of the type struct and its attachments. In Py3k, all type structs have to have all fields -- no binary backwards compatibility. Had to change the complex object to a new-style number!

author	Guido van Rossum <guido@python.org>
date	Thu, 27 Jul 2006 21:53:35 +0000
parents	19fd6141940d
children	654c380cf8b9

rev	line source
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1 /* String object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3 #define PY_SSIZE_T_CLEAN
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	4
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	5 #include "Python.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	7 #include <ctype.h>
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	8
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	9 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	10 int null_strings, one_strings;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	11 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	12
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	13 static PyStringObject *characters[UCHAR_MAX + 1];
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	14 static PyStringObject *nullstring;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	15
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	16 /* 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	17 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	18 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	19 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	20
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	21 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	22 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	23 */
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	24 static PyObject *interned;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	25
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	26 /*
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	27 For both PyString_FromString() and PyString_FromStringAndSize(), the
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	28 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	29 null terminating character.
30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	30
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	31 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	32 string containing exactly `size' bytes.
30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	33
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	34 For PyString_FromStringAndSize(), the parameter the parameter `str' is
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	35 either NULL or else points to a string containing at least `size' bytes.
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	36 For PyString_FromStringAndSize(), the string in the `str' parameter does
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	37 not have to be null-terminated. (Therefore it is safe to construct a
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	38 substring by calling `PyString_FromStringAndSize(origstring, substrlen)'.)
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	39 If `str' is NULL then PyString_FromStringAndSize() will allocate `size+1'
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	40 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	41 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	42 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	43 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	44
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	45 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	46 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	47 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	48 is therefore equal to the equal to the `size' parameter (for
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	49 PyString_FromStringAndSize()) or the length of the string in the `str'
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	50 parameter (for PyString_FromString()).
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	51 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	52 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	53 PyString_FromStringAndSize(const char *str, Py_ssize_t size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	54 {
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	55 register PyStringObject *op;
34522 a4225cdc2047 More bug #1077106 stuff, sorry -- modem induced impatiece! Michael W. Hudson <mwh@python.net> parents: 33833 diff changeset	56 assert(size >= 0);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	57 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	58 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	59 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	60 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	61 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	62 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	63 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	64 if (size == 1 && str != NULL &&
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	65 (op = characters[*str & UCHAR_MAX]) != NULL)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	66 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	67 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	68 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	69 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	70 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	71 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	72 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	73
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	74 /* Inline PyObject_NewVar */
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	75 op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	76 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	77 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	78 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	79 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	80 op->ob_sstate = SSTATE_NOT_INTERNED;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	81 if (str != NULL)
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	82 Py_MEMCPY(op->ob_sval, str, size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	83 op->ob_sval[size] = '\0';
22689 614167df2096 Eliminate DONT_SHARE_SHORT_STRINGS. Tim Peters <tim.peters@gmail.com> parents: 22651 diff changeset	84 /* share short strings */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	85 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	86 PyObject t = (PyObject )op;
ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	87 PyString_InternInPlace(&t);
17721 1dea431fb0a0 Sheesh -- repair the dodge around "cast isn't an lvalue" complaints to Tim Peters <tim.peters@gmail.com> parents: 17720 diff changeset	88 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	89 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	90 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	91 } 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	92 PyObject t = (PyObject )op;
ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	93 PyString_InternInPlace(&t);
17721 1dea431fb0a0 Sheesh -- repair the dodge around "cast isn't an lvalue" complaints to Tim Peters <tim.peters@gmail.com> parents: 17720 diff changeset	94 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	95 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	96 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	97 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	98 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	99 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	100
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	101 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	102 PyString_FromString(const char *str)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	103 {
21263 2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	104 register size_t size;
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	105 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	106
2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	107 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	108 size = strlen(str);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	109 if (size > PY_SSIZE_T_MAX) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	110 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	111 "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	112 return NULL;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	113 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	114 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	115 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	116 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	117 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	118 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	119 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	120 }
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	121 if (size == 1 && (op = characters[*str & UCHAR_MAX]) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	122 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	123 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	124 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	125 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	126 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	127 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	128
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	129 /* Inline PyObject_NewVar */
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	130 op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	131 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	132 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	133 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	134 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	135 op->ob_sstate = SSTATE_NOT_INTERNED;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	136 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	137 /* share short strings */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	138 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	139 PyObject t = (PyObject )op;
ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	140 PyString_InternInPlace(&t);
17721 1dea431fb0a0 Sheesh -- repair the dodge around "cast isn't an lvalue" complaints to Tim Peters <tim.peters@gmail.com> parents: 17720 diff changeset	141 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	142 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	143 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	144 } 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	145 PyObject t = (PyObject )op;
ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	146 PyString_InternInPlace(&t);
17721 1dea431fb0a0 Sheesh -- repair the dodge around "cast isn't an lvalue" complaints to Tim Peters <tim.peters@gmail.com> parents: 17720 diff changeset	147 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	148 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	149 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	150 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	151 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	152 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	153
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	154 PyObject *
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	155 PyString_FromFormatV(const char *format, va_list vargs)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	156 {
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	157 va_list count;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	158 Py_ssize_t n = 0;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	159 const char* f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	160 char *s;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	161 PyObject* string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	162
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	163 #ifdef VA_LIST_IS_ARRAY
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	164 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	165 #else
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	166 #ifdef __va_copy
81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	167 __va_copy(count, vargs);
81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	168 #else
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	169 count = vargs;
abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	170 #endif
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	171 #endif
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	172 /* 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	173 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	174 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	175 const char* p = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	176 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	177 ;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	178
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	179 /* skip the 'l' or 'z' in {%ld, %zd, %lu, %zu} since
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	180 * they don't affect the amount of space we reserve.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	181 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	182 if ((f == 'l' \|\| f == 'z') &&
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	183 (f[1] == 'd' \|\| f[1] == 'u'))
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	184 ++f;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	185
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	186 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	187 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	188 (void)va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	189 /* fall through... */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	190 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	191 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	192 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	193 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	194 (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	195 /* 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	196 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	197 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	198 n += 20;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	199 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	200 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	201 s = va_arg(count, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	202 n += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	203 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	204 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	205 (void) va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	206 /* maximum 64-bit pointer representation:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	207 * 0xffffffffffffffff
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	208 * 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	209 * 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	210 */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	211 n += 19;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	212 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	213 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	214 /* if we stumble upon an unknown
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	215 formatting code, copy the rest of
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	216 the format string to the output
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	217 string. (we cannot just skip the
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	218 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	219 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	220 n += strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	221 goto expand;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	222 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	223 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	224 n++;
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 expand:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	227 /* 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	228 /* 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	229 use sprintf directly instead of the slower PyOS_snprintf. */
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	230 string = PyString_FromStringAndSize(NULL, n);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	231 if (!string)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	232 return NULL;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	233
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	234 s = PyString_AsString(string);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	235
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	236 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	237 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	238 const char* p = f++;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	239 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	240 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	241 int size_tflag = 0;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	242 /* 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	243 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	244 n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	245 while (isdigit(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	246 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	247 if (*f == '.') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	248 f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	249 n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	250 while (isdigit(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	251 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	252 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	253 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	254 f++;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	255 /* handle the long flag, but only for %ld and %lu.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	256 others can be added when necessary. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	257 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	258 longflag = 1;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	259 ++f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	260 }
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	261 /* handle the size_t flag. */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	262 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	263 size_tflag = 1;
0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	264 ++f;
0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	265 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	266
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	267 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	268 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	269 *s++ = va_arg(vargs, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	270 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	271 case 'd':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	272 if (longflag)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	273 sprintf(s, "%ld", va_arg(vargs, long));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	274 else if (size_tflag)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	275 sprintf(s, "%" PY_FORMAT_SIZE_T "d",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	276 va_arg(vargs, Py_ssize_t));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	277 else
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	278 sprintf(s, "%d", va_arg(vargs, int));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	279 s += strlen(s);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	280 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	281 case 'u':
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	282 if (longflag)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	283 sprintf(s, "%lu",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	284 va_arg(vargs, unsigned long));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	285 else if (size_tflag)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	286 sprintf(s, "%" PY_FORMAT_SIZE_T "u",
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	287 va_arg(vargs, size_t));
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	288 else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	289 sprintf(s, "%u",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	290 va_arg(vargs, unsigned int));
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	291 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	292 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	293 case 'i':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	294 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	295 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	296 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	297 case 'x':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	298 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	299 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	300 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	301 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	302 p = va_arg(vargs, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	303 i = strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	304 if (n > 0 && i > n)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	305 i = n;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	306 Py_MEMCPY(s, p, i);
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	307 s += i;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	308 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	309 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	310 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	311 /* %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	312 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	313 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	314 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	315 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	316 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	317 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 }
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	319 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	320 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	321 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	322 *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 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	325 strcpy(s, p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	326 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	327 goto end;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	328 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	329 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	330 s++ = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	331 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	332
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	333 end:
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	334 _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	335 return string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	336 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	337
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	338 PyObject *
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	339 PyString_FromFormat(const char *format, ...)
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	340 {
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	341 PyObject* ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	342 va_list vargs;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	343
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	344 #ifdef HAVE_STDARG_PROTOTYPES
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	345 va_start(vargs, format);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	346 #else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	347 va_start(vargs);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	348 #endif
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	349 ret = PyString_FromFormatV(format, vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	350 va_end(vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	351 return ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	352 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	353
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	354
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	355 PyObject PyString_Decode(const char s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	356 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	357 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	358 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	359 {
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	360 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	361
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	362 str = PyString_FromStringAndSize(s, size);
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	363 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	364 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	365 v = PyString_AsDecodedString(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	366 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	367 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	368 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	369
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	370 PyObject PyString_AsDecodedObject(PyObject str,
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	371 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	372 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	373 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	374 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	375
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	376 if (!PyString_Check(str)) {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	377 PyErr_BadArgument();
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	378 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	379 }
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	380
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	381 if (encoding == NULL) {
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	382 #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	383 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	384 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	385 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	386 goto onError;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	387 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	388 }
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	389
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	390 /* 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	391 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	392 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	393 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	394
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	395 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	396
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	397 onError:
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	398 return NULL;
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
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	401 PyObject PyString_AsDecodedString(PyObject str,
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	402 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	403 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	404 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	405 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	406
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	407 v = PyString_AsDecodedObject(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	408 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	409 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	410
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	411 #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	412 /* 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	413 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	414 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	415 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	416 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	417 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	418 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	419 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	420 #endif
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	421 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	422 PyErr_Format(PyExc_TypeError,
13561 ea732719b3fd Fix typo in error message Andrew M. Kuchling <amk@amk.ca> parents: 13544 diff changeset	423 "decoder did not return a string object (type=%.400s)",
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	424 v->ob_type->tp_name);
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	425 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	426 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	427 }
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	428
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	429 return v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	430
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	431 onError:
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	432 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	433 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	434
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	435 PyObject PyString_Encode(const char s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	436 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	437 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	438 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	439 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	440 PyObject v, str;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	441
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	442 str = PyString_FromStringAndSize(s, size);
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	443 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	444 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	445 v = PyString_AsEncodedString(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	446 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	447 return v;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	448 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	449
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	450 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	451 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	452 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	453 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	454 PyObject *v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	455
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	456 if (!PyString_Check(str)) {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	457 PyErr_BadArgument();
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	458 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	459 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	460
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	461 if (encoding == NULL) {
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	462 #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	463 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	464 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	465 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	466 goto onError;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	467 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	468 }
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	469
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	470 /* 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	471 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	472 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	473 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	474
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	475 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	476
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	477 onError:
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	478 return NULL;
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
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	481 PyObject PyString_AsEncodedString(PyObject str,
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	482 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	483 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	484 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	485 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	486
18086 592109f2a6fd Fix for bug #432384: Recursion in PyString_AsEncodedString? Marc-André Lemburg <mal@egenix.com> parents: 17964 diff changeset	487 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	488 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	489 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	490
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	491 #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	492 /* 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	493 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	494 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	495 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	496 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	497 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	498 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	499 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	500 #endif
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	501 if (!PyString_Check(v)) {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	502 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	503 "encoder did not return a string object (type=%.400s)",
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	504 v->ob_type->tp_name);
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	505 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	506 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	507 }
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	508
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	509 return v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	510
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	511 onError:
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	512 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	513 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	514
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1282 diff changeset	515 static void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	516 string_dealloc(PyObject *op)
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	517 {
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	518 switch (PyString_CHECK_INTERNED(op)) {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	519 case SSTATE_NOT_INTERNED:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	520 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	521
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	522 case SSTATE_INTERNED_MORTAL:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	523 /* revive dead object temporarily for DelItem */
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	524 op->ob_refcnt = 3;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	525 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	526 Py_FatalError(
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	527 "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	528 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	529
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	530 case SSTATE_INTERNED_IMMORTAL:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	531 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	532
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	533 default:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	534 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	535 }
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20221 diff changeset	536 op->ob_type->tp_free(op);
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	537 }
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	538
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	539 /* 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	540 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	541 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	542 specified encoding. */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	543
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	544 PyObject PyString_DecodeEscape(const char s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	545 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	546 const char *errors,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	547 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	548 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	549 {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	550 int c;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	551 char p, buf;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	552 const char *end;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	553 PyObject *v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	554 Py_ssize_t newlen = recode_encoding ? 4*len:len;
25100 bc590beadf0b Check whether a string resize is necessary at the end Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	555 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	556 if (v == NULL)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	557 return NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	558 p = buf = PyString_AsString(v);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	559 end = s + len;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	560 while (s < end) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	561 if (*s != '\\') {
25173 f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	562 non_esc:
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	563 #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	564 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	565 PyObject u, w;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	566 char *r;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	567 const char* t;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	568 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	569 t = s;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	570 /* 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	571 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	572 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	573 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	574
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	575 /* 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	576 w = PyUnicode_AsEncodedString(
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	577 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	578 Py_DECREF(u);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	579 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	580
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	581 /* Append bytes to output buffer. */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	582 assert(PyString_Check(w));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	583 r = PyString_AS_STRING(w);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	584 rn = PyString_GET_SIZE(w);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	585 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	586 p += rn;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	587 Py_DECREF(w);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	588 s = t;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	589 } else {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	590 p++ = s++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	591 }
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 #endif
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	595 continue;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	596 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	597 s++;
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	598 if (s==end) {
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	599 PyErr_SetString(PyExc_ValueError,
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	600 "Trailing \\ in string");
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	601 goto failed;
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	602 }
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	603 switch (*s++) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	604 /* 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	605 case '\n': break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	606 case '\\': *p++ = '\\'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	607 case '\'': *p++ = '\''; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	608 case '\"': *p++ = '\"'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	609 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	610 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	611 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	612 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	613 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	614 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	615 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	616 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	617 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	618 c = s[-1] - '0';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	619 if ('0' <= s && s <= '7') {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	620 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	621 if ('0' <= s && s <= '7')
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	622 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	623 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	624 *p++ = c;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	625 break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	626 case 'x':
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	627 if (isxdigit(Py_CHARMASK(s[0]))
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	628 && isxdigit(Py_CHARMASK(s[1]))) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	629 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	630 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	631 s++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	632 if (isdigit(c))
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	633 x = c - '0';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	634 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	635 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	636 else
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	637 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	638 x = x << 4;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	639 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	640 s++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	641 if (isdigit(c))
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	642 x += c - '0';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	643 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	644 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	645 else
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	646 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	647 *p++ = x;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	648 break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	649 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	650 if (!errors \|\| strcmp(errors, "strict") == 0) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	651 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	652 "invalid \\x escape");
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	653 goto failed;
24808 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 (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	656 *p++ = '?';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	657 } 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	658 /* do nothing */;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	659 else {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	660 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	661 "decoding error; "
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	662 "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	663 errors);
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	664 goto failed;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	665 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	666 #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	667 case 'u':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	668 case 'U':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	669 case 'N':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	670 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	671 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	672 "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	673 "when Unicode disabled");
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	674 goto failed;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	675 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	676 #endif
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	677 default:
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	678 *p++ = '\\';
25173 f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	679 s--;
f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	680 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	681 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	682 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	683 }
25100 bc590beadf0b Check whether a string resize is necessary at the end Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	684 if (p-buf < newlen)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	685 _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	686 return v;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	687 failed:
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	688 Py_DECREF(v);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	689 return NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	690 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	691
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	692 /* -------------------------------------------------------------------- */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	693 /* object api */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	694
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	695 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	696 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	697 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	698 char *s;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	699 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	700 if (PyString_AsStringAndSize(op, &s, &len))
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	701 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	702 return len;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	703 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	704
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	705 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	706 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	707 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	708 char *s;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	709 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	710 if (PyString_AsStringAndSize(op, &s, &len))
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	711 return NULL;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	712 return s;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	713 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	714
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	715 Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	716 PyString_Size(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	717 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	718 if (!PyString_Check(op))
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	719 return string_getsize(op);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	720 return ((PyStringObject *)op) -> ob_size;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	721 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	722
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	723 /const/ char *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	724 PyString_AsString(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	725 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	726 if (!PyString_Check(op))
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	727 return string_getbuffer(op);
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	728 return ((PyStringObject *)op) -> ob_sval;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	729 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	730
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	731 int
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	732 PyString_AsStringAndSize(register PyObject *obj,
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	733 register char **s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	734 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	735 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	736 if (s == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	737 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	738 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	739 }
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 (!PyString_Check(obj)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	742 #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	743 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	744 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	745 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	746 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	747 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	748 else
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	749 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	750 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	751 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	752 "expected string or Unicode object, "
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	753 "%.200s found", obj->ob_type->tp_name);
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	754 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	755 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	756 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	757
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	758 *s = PyString_AS_STRING(obj);
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	759 if (len != NULL)
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	760 *len = PyString_GET_SIZE(obj);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	761 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	762 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	763 "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	764 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	765 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	766 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	767 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	768
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	769 /* -------------------------------------------------------------------- */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	770 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	771
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	772 #define STRINGLIB_CHAR char
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	773
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	774 #define STRINGLIB_CMP memcmp
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	775 #define STRINGLIB_LEN PyString_GET_SIZE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	776 #define STRINGLIB_NEW PyString_FromStringAndSize
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	777 #define STRINGLIB_STR PyString_AS_STRING
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	778
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	779 #define STRINGLIB_EMPTY nullstring
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	780
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	781 #include "stringlib/fastsearch.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	782
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	783 #include "stringlib/count.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	784 #include "stringlib/find.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	785 #include "stringlib/partition.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	786
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	787
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	788 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	789 string_print(PyStringObject op, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	790 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	791 Py_ssize_t i;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	792 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	793 int quote;
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	794
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	795 /* XXX Ought to check for interrupts when writing long strings */
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	796 if (! PyString_CheckExact(op)) {
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	797 int ret;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	798 /* A str subclass may have its own __str__ method. */
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	799 op = (PyStringObject ) PyObject_Str((PyObject )op);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	800 if (op == NULL)
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	801 return -1;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	802 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	803 Py_DECREF(op);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	804 return ret;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	805 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	806 if (flags & Py_PRINT_RAW) {
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26273 diff changeset	807 #ifdef __VMS
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26273 diff changeset	808 if (op->ob_size) fwrite(op->ob_sval, (int) op->ob_size, 1, fp);
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26273 diff changeset	809 #else
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26273 diff changeset	810 fwrite(op->ob_sval, 1, (int) op->ob_size, fp);
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 26273 diff changeset	811 #endif
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	812 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	813 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	814
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	815 /* 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	816 quote = '\'';
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	817 if (memchr(op->ob_sval, '\'', op->ob_size) &&
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	818 !memchr(op->ob_sval, '"', op->ob_size))
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	819 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	820
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	821 fputc(quote, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	822 for (i = 0; i < op->ob_size; i++) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	823 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	824 if (c == quote \|\| c == '\\')
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	825 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	826 else if (c == '\t')
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	827 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	828 else if (c == '\n')
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	829 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	830 else if (c == '\r')
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	831 fprintf(fp, "\\r");
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	832 else if (c < ' ' \|\| c >= 0x7f)
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	833 fprintf(fp, "\\x%02x", c & 0xff);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	834 else
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	835 fputc(c, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	836 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	837 fputc(quote, fp);
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	838 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	839 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	840
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	841 PyObject *
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	842 PyString_Repr(PyObject *obj, int smartquotes)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	843 {
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	844 register PyStringObject* op = (PyStringObject*) obj;
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	845 size_t newsize = 2 + 4 * op->ob_size;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	846 PyObject *v;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	847 if (newsize > PY_SSIZE_T_MAX) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	848 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	849 "string is too large to make repr");
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	850 }
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	851 v = PyString_FromStringAndSize((char *)NULL, newsize);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	852 if (v == NULL) {
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	853 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	854 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	855 else {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	856 register Py_ssize_t i;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	857 register char c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	858 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	859 int quote;
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	860
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	861 /* 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	862 quote = '\'';
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	863 if (smartquotes &&
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	864 memchr(op->ob_sval, '\'', op->ob_size) &&
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	865 !memchr(op->ob_sval, '"', op->ob_size))
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	866 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	867
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	868 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	869 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	870 for (i = 0; i < op->ob_size; i++) {
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	871 /* 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	872 and a closing quote. */
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	873 assert(newsize - (p - PyString_AS_STRING(v)) >= 5);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	874 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	875 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	876 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	877 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	878 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	879 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	880 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	881 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	882 p++ = '\\', p++ = 'r';
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	883 else if (c < ' ' \|\| c >= 0x7f) {
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	884 /* For performance, we don't want to call
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	885 PyOS_snprintf here (extra layers of
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	886 function call). */
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	887 sprintf(p, "\\x%02x", c & 0xff);
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	888 p += 4;
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	889 }
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	890 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	891 *p++ = c;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	892 }
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	893 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	894 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	895 *p = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	896 _PyString_Resize(
37904 06dcdedfc98f Merge with trunk up to revision 45620. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	897 &v, (p - PyString_AS_STRING(v)));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	898 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	899 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	900 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	901
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	902 static PyObject *
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	903 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	904 {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	905 return PyString_Repr(op, 1);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	906 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	907
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	908 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	909 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	910 {
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	911 assert(PyString_Check(s));
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	912 if (PyString_CheckExact(s)) {
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	913 Py_INCREF(s);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	914 return s;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	915 }
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	916 else {
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	917 /* Subtype -- return genuine string with the same value. */
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	918 PyStringObject t = (PyStringObject ) s;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	919 return PyString_FromStringAndSize(t->ob_sval, t->ob_size);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	920 }
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	921 }
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	922
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	923 static Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	924 string_length(PyStringObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	925 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	926 return a->ob_size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	927 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	928
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	929 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	930 string_concat(register PyStringObject a, register PyObject bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	931 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	932 register Py_ssize_t size;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	933 register PyStringObject *op;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	934 if (!PyString_Check(bb)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	935 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	936 if (PyUnicode_Check(bb))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	937 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	938 #endif
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	939 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	940 "cannot concatenate 'str' and '%.200s' objects",
12816 4272b368bf69 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12615 diff changeset	941 bb->ob_type->tp_name);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	942 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	943 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	944 #define b ((PyStringObject *)bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	945 /* Optimize cases with empty left or right operand */
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	946 if ((a->ob_size == 0 \|\| b->ob_size == 0) &&
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	947 PyString_CheckExact(a) && PyString_CheckExact(b)) {
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	948 if (a->ob_size == 0) {
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	949 Py_INCREF(bb);
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	950 return bb;
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	951 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	952 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	953 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	954 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	955 size = a->ob_size + b->ob_size;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	956 if (size < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	957 PyErr_SetString(PyExc_OverflowError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	958 "strings are too large to concat");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	959 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	960 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	961
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	962 /* Inline PyObject_NewVar */
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	963 op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	964 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	965 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	966 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	967 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	968 op->ob_sstate = SSTATE_NOT_INTERNED;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	969 Py_MEMCPY(op->ob_sval, a->ob_sval, a->ob_size);
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	970 Py_MEMCPY(op->ob_sval + a->ob_size, b->ob_sval, b->ob_size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	971 op->ob_sval[size] = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	972 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	973 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	974 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	975
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	976 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	977 string_repeat(register PyStringObject *a, register Py_ssize_t n)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	978 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	979 register Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	980 register Py_ssize_t j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	981 register Py_ssize_t size;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	982 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	983 size_t nbytes;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	984 if (n < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	985 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	986 /* 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	987 * 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	988 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	989 size = a->ob_size * n;
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	990 if (n && size / n != a->ob_size) {
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	991 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	992 "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	993 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	994 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	995 if (size == a->ob_size && PyString_CheckExact(a)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	996 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	997 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	998 }
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	999 nbytes = (size_t)size;
64534fb3afcd sizeof(char) is 1, by definition, so get rid of that expression in Tim Peters <tim.peters@gmail.com> parents: 32305 diff changeset	1000 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	1001 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	1002 "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	1003 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	1004 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1005 op = (PyStringObject *)
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	1006 PyObject_MALLOC(sizeof(PyStringObject) + nbytes);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	1007 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1008 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	1009 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1010 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	1011 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	1012 op->ob_sval[size] = '\0';
1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	1013 if (a->ob_size == 1 && n > 0) {
1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	1014 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	1015 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	1016 }
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1017 i = 0;
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1018 if (i < size) {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1019 Py_MEMCPY(op->ob_sval, a->ob_sval, a->ob_size);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1020 i = a->ob_size;
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1021 }
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1022 while (i < size) {
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1023 j = (i <= size-i) ? i : size-i;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1024 Py_MEMCPY(op->ob_sval+i, op->ob_sval, j);
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1025 i += j;
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	1026 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1027 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1028 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1029
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1030 /* 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	1031
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1032 static PyObject *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1033 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	1034 register Py_ssize_t j)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1035 /* j -- may be negative! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1036 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1037 if (i < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1038 i = 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1039 if (j < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1040 j = 0; /* Avoid signed/unsigned bug in next line */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1041 if (j > a->ob_size)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1042 j = a->ob_size;
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1043 if (i == 0 && j == a->ob_size && PyString_CheckExact(a)) {
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1044 /* It's the same as a */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1045 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1046 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1047 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1048 if (j < i)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1049 j = i;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1050 return PyString_FromStringAndSize(a->ob_sval + i, j-i);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1051 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1052
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1053 static int
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1054 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	1055 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1056 if (!PyString_CheckExact(sub_obj)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1057 #ifdef Py_USING_UNICODE
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1058 if (PyUnicode_Check(sub_obj))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1059 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	1060 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1061 if (!PyString_Check(sub_obj)) {
25017 aa4503556339 string_contains(): speed up by avoiding function calls where Guido van Rossum <guido@python.org> parents: 25004 diff changeset	1062 PyErr_SetString(PyExc_TypeError,
aa4503556339 string_contains(): speed up by avoiding function calls where Guido van Rossum <guido@python.org> parents: 25004 diff changeset	1063 "'in <string>' requires string as left operand");
aa4503556339 string_contains(): speed up by avoiding function calls where Guido van Rossum <guido@python.org> parents: 25004 diff changeset	1064 return -1;
aa4503556339 string_contains(): speed up by avoiding function calls where Guido van Rossum <guido@python.org> parents: 25004 diff changeset	1065 }
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1066 }
34620 556f6f1056a8 * Beef-up testing of str.__contains__() and str.find(). Raymond Hettinger <python@rcn.com> parents: 34522 diff changeset	1067
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1068 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	1069 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	1070
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1071 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1072 string_item(PyStringObject *a, register Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1073 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1074 char pchar;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1075 PyObject *v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1076 if (i < 0 \|\| i >= a->ob_size) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1077 PyErr_SetString(PyExc_IndexError, "string index out of range");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1078 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1079 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1080 pchar = a->ob_sval[i];
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1081 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	1082 if (v == NULL)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1083 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	1084 else {
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1085 #ifdef COUNT_ALLOCS
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1086 one_strings++;
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1087 #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	1088 Py_INCREF(v);
17712 2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	1089 }
180 a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	1090 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1091 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1092
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1093 static PyObject*
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1094 string_richcompare(PyStringObject a, PyStringObject b, int op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1095 {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1096 int c;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1097 Py_ssize_t len_a, len_b;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1098 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	1099 PyObject *result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1100
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20057 diff changeset	1101 /* Make sure both arguments are strings. */
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20057 diff changeset	1102 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	1103 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1104 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1105 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1106 if (a == b) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1107 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1108 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	1109 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1110 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1111 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	1112 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1113 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1114 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1115 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1116 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	1117 /* 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	1118 much time, since Py_NE is rarely used. */
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1119 if (a->ob_size == b->ob_size
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1120 && (a->ob_sval[0] == b->ob_sval[0]
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	1121 && memcmp(a->ob_sval, b->ob_sval,
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1122 a->ob_size) == 0)) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1123 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1124 } else {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1125 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1126 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1127 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1128 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1129 len_a = a->ob_size; len_b = b->ob_size;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1130 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	1131 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	1132 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	1133 if (c==0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1134 c = memcmp(a->ob_sval, b->ob_sval, min_len);
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1135 }else
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1136 c = 0;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1137 if (c == 0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1138 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	1139 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1140 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	1141 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	1142 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	1143 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	1144 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	1145 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	1146 default:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1147 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1148 goto out;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1149 }
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1150 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	1151 out:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1152 Py_INCREF(result);
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1153 return result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1154 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1155
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1156 int
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1157 _PyString_Eq(PyObject o1, PyObject o2)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1158 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1159 PyStringObject a = (PyStringObject) o1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1160 PyStringObject b = (PyStringObject) o2;
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1161 return a->ob_size == b->ob_size
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1162 && a->ob_sval == b->ob_sval
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	1163 && memcmp(a->ob_sval, b->ob_sval, a->ob_size) == 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1164 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1165
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1166 static long
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1167 string_hash(PyStringObject *a)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1168 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1169 register Py_ssize_t len;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1170 register unsigned char *p;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1171 register long x;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1172
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1173 if (a->ob_shash != -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1174 return a->ob_shash;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1175 len = a->ob_size;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1176 p = (unsigned char *) a->ob_sval;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1177 x = *p << 7;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1178 while (--len >= 0)
4283 839f72610ae1 Multiply by 1000003 instead of 3 in string hach Guido van Rossum <guido@python.org> parents: 3586 diff changeset	1179 x = (1000003x) ^ p++;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1180 x ^= a->ob_size;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1181 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1182 x = -2;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	1183 a->ob_shash = x;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1184 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1185 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1186
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1187 static PyObject*
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1188 string_subscript(PyStringObject* self, PyObject* item)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1189 {
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	1190 PyNumberMethods *nb = item->ob_type->tp_as_number;
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	1191 if (nb != NULL && nb->nb_index != NULL) {
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	1192 Py_ssize_t i = nb->nb_index(item);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1193 if (i == -1 && PyErr_Occurred())
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1194 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1195 if (i < 0)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1196 i += PyString_GET_SIZE(self);
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36877 diff changeset	1197 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	1198 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1199 else if (PySlice_Check(item)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1200 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	1201 char* source_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1202 char* result_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1203 PyObject* result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1204
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1205 if (PySlice_GetIndicesEx((PySliceObject*)item,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1206 PyString_GET_SIZE(self),
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1207 &start, &stop, &step, &slicelength) < 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1208 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1209 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1210
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1211 if (slicelength <= 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1212 return PyString_FromStringAndSize("", 0);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1213 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1214 else {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1215 source_buf = PyString_AsString((PyObject*)self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1216 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	1217 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	1218 return PyErr_NoMemory();
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1219
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1220 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	1221 cur += step, i++) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1222 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	1223 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1224
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1225 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	1226 slicelength);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1227 PyMem_Free(result_buf);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1228 return result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1229 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1230 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1231 else {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1232 PyErr_SetString(PyExc_TypeError,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1233 "string indices must be integers");
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1234 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1235 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1236 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1237
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1238 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1239 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	1240 {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1241 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	1242 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	1243 "accessing non-existent string segment");
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1244 return -1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1245 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1246 ptr = (void )self->ob_sval;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1247 return self->ob_size;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1248 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1249
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1250 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1251 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	1252 {
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	1253 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	1254 "Cannot use string as modifiable buffer");
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1255 return -1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1256 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1257
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1258 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1259 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	1260 {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1261 if ( lenp )
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1262 *lenp = self->ob_size;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1263 return 1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1264 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1265
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1266 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1267 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	1268 {
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1269 if ( index != 0 ) {
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1270 PyErr_SetString(PyExc_SystemError,
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1271 "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	1272 return -1;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1273 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1274 *ptr = self->ob_sval;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1275 return self->ob_size;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1276 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1277
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1278 static PySequenceMethods string_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1279 (lenfunc)string_length, /sq_length/
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	1280 (binaryfunc)string_concat, /sq_concat/
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1281 (ssizeargfunc)string_repeat, /sq_repeat/
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1282 (ssizeargfunc)string_item, /sq_item/
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1283 (ssizessizeargfunc)string_slice, /sq_slice/
259 6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	1284 0, /sq_ass_item/
6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	1285 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	1286 (objobjproc)string_contains /sq_contains/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1287 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1288
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1289 static PyMappingMethods string_as_mapping = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1290 (lenfunc)string_length,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1291 (binaryfunc)string_subscript,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1292 0,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1293 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1294
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1295 static PyBufferProcs string_as_buffer = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1296 (readbufferproc)string_buffer_getreadbuf,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1297 (writebufferproc)string_buffer_getwritebuf,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1298 (segcountproc)string_buffer_getsegcount,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1299 (charbufferproc)string_buffer_getcharbuf,
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1300 };
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1301
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1302
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1303
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1304 #define LEFTSTRIP 0
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1305 #define RIGHTSTRIP 1
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1306 #define BOTHSTRIP 2
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1307
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1308 /* Arrays indexed by above */
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1309 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	1310
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1311 #define STRIPNAME(i) (stripformat[i]+3)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1312
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1313
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1314 /* Don't call if length < 2 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1315 #define Py_STRING_MATCH(target, offset, pattern, length) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1316 (target[offset] == pattern[0] && \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1317 target[offset+length-1] == pattern[length-1] && \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1318 !memcmp(target+offset+1, pattern+1, length-2) )
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1319
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1320
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1321 /* Overallocate the initial list to reduce the number of reallocs for small
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1322 split sizes. Eg, "A A A A A A A A A A".split() (10 elements) has three
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1323 resizes, to sizes 4, 8, then 16. Most observed string splits are for human
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1324 text (roughly 11 words per line) and field delimited data (usually 1-10
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1325 fields). For large strings the split algorithms are bandwidth limited
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1326 so increasing the preallocation likely will not improve things.*/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1327
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1328 #define MAX_PREALLOC 12
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1329
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1330 /* 5 splits gives 6 elements */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1331 #define PREALLOC_SIZE(maxsplit) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1332 (maxsplit >= MAX_PREALLOC ? MAX_PREALLOC : maxsplit+1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1333
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1334 #define SPLIT_APPEND(data, left, right) \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1335 str = PyString_FromStringAndSize((data) + (left), \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1336 (right) - (left)); \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1337 if (str == NULL) \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1338 goto onError; \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1339 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	1340 Py_DECREF(str); \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1341 goto onError; \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1342 } \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1343 else \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1344 Py_DECREF(str);
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1345
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1346 #define SPLIT_ADD(data, left, right) { \
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1347 str = PyString_FromStringAndSize((data) + (left), \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1348 (right) - (left)); \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1349 if (str == NULL) \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1350 goto onError; \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1351 if (count < MAX_PREALLOC) { \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1352 PyList_SET_ITEM(list, count, str); \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1353 } else { \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1354 if (PyList_Append(list, str)) { \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1355 Py_DECREF(str); \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1356 goto onError; \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1357 } \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1358 else \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1359 Py_DECREF(str); \
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1360 } \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1361 count++; }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1362
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1363 /* Always force the list to the expected size. */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1364 #define FIX_PREALLOC_SIZE(list) ((PyListObject *)list)->ob_size = count
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1365
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1366 #define SKIP_SPACE(s, i, len) { while (i<len && isspace(Py_CHARMASK(s[i]))) i++; }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1367 #define SKIP_NONSPACE(s, i, len) { while (i<len && !isspace(Py_CHARMASK(s[i]))) i++; }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1368 #define RSKIP_SPACE(s, i) { while (i>=0 && isspace(Py_CHARMASK(s[i]))) i--; }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1369 #define RSKIP_NONSPACE(s, i) { while (i>=0 && !isspace(Py_CHARMASK(s[i]))) i--; }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1370
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1371 Py_LOCAL_INLINE(PyObject *)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1372 split_whitespace(const char *s, 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	1373 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1374 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	1375 PyObject *str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1376 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	1377
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1378 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1379 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1380
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1381 i = j = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1382
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1383 while (maxsplit-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1384 SKIP_SPACE(s, i, len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1385 if (i==len) break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1386 j = i; i++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1387 SKIP_NONSPACE(s, i, len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1388 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	1389 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1390
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1391 if (i < len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1392 /* Only occurs when maxsplit was reached */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1393 /* Skip any remaining whitespace and copy to end of string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1394 SKIP_SPACE(s, i, len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1395 if (i != len)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1396 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	1397 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1398 FIX_PREALLOC_SIZE(list);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1399 return list;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1400 onError:
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1401 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1402 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1403 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1404
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1405 Py_LOCAL_INLINE(PyObject *)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1406 split_char(const char *s, 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	1407 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1408 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	1409 PyObject *str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1410 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	1411
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1412 if (list == NULL)
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1413 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1414
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1415 i = j = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1416 while ((j < len) && (maxcount-- > 0)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1417 for(; j<len; j++) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1418 /* I found that using memchr makes no difference */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1419 if (s[j] == ch) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1420 SPLIT_ADD(s, i, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1421 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	1422 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1423 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1424 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1425 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1426 if (i <= len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1427 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	1428 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1429 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	1430 return list;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1431
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1432 onError:
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1433 Py_DECREF(list);
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1434 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1435 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1436
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1437 PyDoc_STRVAR(split__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1438 "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	1439 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1440 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	1441 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	1442 splits are done. If sep is not specified or is None, any\n\
b25c31e008c8 SF 582071 clarified the .split() method's docstring to note that sep=None Raymond Hettinger <python@rcn.com> parents: 24415 diff changeset	1443 whitespace string is a separator.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1444
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1445 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1446 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	1447 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1448 Py_ssize_t len = PyString_GET_SIZE(self), n, i, j;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1449 Py_ssize_t maxsplit = -1, count=0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1450 const char s = PyString_AS_STRING(self), sub;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1451 PyObject list, str, *subobj = Py_None;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1452 #ifdef USE_FAST
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1453 Py_ssize_t pos;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1454 #endif
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1455
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1456 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	1457 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1458 if (maxsplit < 0)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1459 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	1460 if (subobj == Py_None)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1461 return split_whitespace(s, len, maxsplit);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1462 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1463 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1464 n = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1465 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1466 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1467 else if (PyUnicode_Check(subobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1468 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	1469 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1470 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	1471 return NULL;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1472
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1473 if (n == 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1474 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	1475 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1476 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1477 else if (n == 1)
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1478 return split_char(s, len, sub[0], maxsplit);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1479
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1480 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	1481 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1482 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1483
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1484 #ifdef USE_FAST
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1485 i = j = 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1486 while (maxsplit-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1487 pos = fastsearch(s+i, len-i, sub, n, FAST_SEARCH);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1488 if (pos < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1489 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1490 j = i+pos;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1491 SPLIT_ADD(s, i, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1492 i = j + n;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1493
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1494 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1495 #else
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1496 i = j = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1497 while ((j+n <= len) && (maxsplit-- > 0)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1498 for (; j+n <= len; j++) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1499 if (Py_STRING_MATCH(s, j, sub, n)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1500 SPLIT_ADD(s, i, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1501 i = j = j + n;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1502 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1503 }
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 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1506 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1507 SPLIT_ADD(s, i, len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1508 FIX_PREALLOC_SIZE(list);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1509 return list;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1510
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1511 onError:
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1512 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1513 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1514 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1515
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1516 PyDoc_STRVAR(partition__doc__,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1517 "S.partition(sep) -> (head, sep, tail)\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1518 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1519 Searches for the separator sep in S, and returns the part before it,\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1520 the separator itself, and the part after it. If the separator is not\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1521 found, returns S and two empty strings.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1522
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1523 static PyObject *
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1524 string_partition(PyStringObject self, PyObject sep_obj)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1525 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1526 const char *sep;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1527 Py_ssize_t sep_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1528
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1529 if (PyString_Check(sep_obj)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1530 sep = PyString_AS_STRING(sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1531 sep_len = PyString_GET_SIZE(sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1532 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1533 #ifdef Py_USING_UNICODE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1534 else if (PyUnicode_Check(sep_obj))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1535 return PyUnicode_Partition((PyObject *) self, sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1536 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1537 else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1538 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1539
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1540 return stringlib_partition(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1541 (PyObject*) self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1542 PyString_AS_STRING(self), PyString_GET_SIZE(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1543 sep_obj, sep, sep_len
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1544 );
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1545 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1546
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1547 PyDoc_STRVAR(rpartition__doc__,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1548 "S.rpartition(sep) -> (head, sep, tail)\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1549 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1550 Searches for the separator sep in S, starting at the end of S, and returns\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1551 the part before it, the separator itself, and the part after it. If the\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1552 separator is not found, returns S and two empty strings.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1553
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1554 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1555 string_rpartition(PyStringObject self, PyObject sep_obj)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1556 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1557 const char *sep;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1558 Py_ssize_t sep_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1559
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1560 if (PyString_Check(sep_obj)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1561 sep = PyString_AS_STRING(sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1562 sep_len = PyString_GET_SIZE(sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1563 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1564 #ifdef Py_USING_UNICODE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1565 else if (PyUnicode_Check(sep_obj))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1566 return PyUnicode_Partition((PyObject *) self, sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1567 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1568 else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1569 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1570
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1571 return stringlib_rpartition(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1572 (PyObject*) self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1573 PyString_AS_STRING(self), PyString_GET_SIZE(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1574 sep_obj, sep, sep_len
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1575 );
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1576 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1577
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1578 Py_LOCAL_INLINE(PyObject *)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1579 rsplit_whitespace(const char *s, 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	1580 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1581 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	1582 PyObject *str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1583 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	1584
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1585 if (list == NULL)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1586 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1587
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1588 i = j = len-1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1589
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1590 while (maxsplit-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1591 RSKIP_SPACE(s, i);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1592 if (i<0) break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1593 j = i; i--;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1594 RSKIP_NONSPACE(s, i);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1595 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	1596 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1597 if (i >= 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1598 /* Only occurs when maxsplit was reached */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1599 /* Skip any remaining whitespace and copy to beginning of string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1600 RSKIP_SPACE(s, i);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1601 if (i >= 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1602 SPLIT_ADD(s, 0, i + 1);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1603
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1604 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1605 FIX_PREALLOC_SIZE(list);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1606 if (PyList_Reverse(list) < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1607 goto onError;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1608 return list;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1609 onError:
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1610 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1611 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1612 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1613
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1614 Py_LOCAL_INLINE(PyObject *)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1615 rsplit_char(const char *s, 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	1616 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1617 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	1618 PyObject *str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1619 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	1620
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1621 if (list == NULL)
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1622 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1623
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1624 i = j = len - 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1625 while ((i >= 0) && (maxcount-- > 0)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1626 for (; i >= 0; i--) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1627 if (s[i] == ch) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1628 SPLIT_ADD(s, i + 1, j + 1);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1629 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	1630 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1631 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1632 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1633 }
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1634 if (j >= -1) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1635 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	1636 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1637 FIX_PREALLOC_SIZE(list);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1638 if (PyList_Reverse(list) < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1639 goto onError;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1640 return list;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1641
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1642 onError:
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1643 Py_DECREF(list);
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1644 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1645 }
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1646
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1647 PyDoc_STRVAR(rsplit__doc__,
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1648 "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	1649 \n\
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1650 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	1651 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	1652 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	1653 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	1654 is a separator.");
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1655
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1656 static PyObject *
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1657 string_rsplit(PyStringObject self, PyObject args)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1658 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1659 Py_ssize_t len = PyString_GET_SIZE(self), n, i, j;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1660 Py_ssize_t maxsplit = -1, count=0;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1661 const char s = PyString_AS_STRING(self), sub;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1662 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	1663
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1664 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	1665 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1666 if (maxsplit < 0)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1667 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	1668 if (subobj == Py_None)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1669 return rsplit_whitespace(s, len, maxsplit);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1670 if (PyString_Check(subobj)) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1671 sub = PyString_AS_STRING(subobj);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1672 n = PyString_GET_SIZE(subobj);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1673 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1674 #ifdef Py_USING_UNICODE
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1675 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	1676 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	1677 #endif
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1678 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	1679 return NULL;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1680
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1681 if (n == 0) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1682 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	1683 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1684 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1685 else if (n == 1)
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1686 return rsplit_char(s, 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	1687
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1688 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	1689 if (list == NULL)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1690 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1691
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1692 j = len;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1693 i = j - n;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1694
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1695 while ( (i >= 0) && (maxsplit-- > 0) ) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1696 for (; i>=0; i--) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1697 if (Py_STRING_MATCH(s, i, sub, n)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1698 SPLIT_ADD(s, i + n, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1699 j = i;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1700 i -= n;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1701 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1702 }
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1703 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1704 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1705 SPLIT_ADD(s, 0, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1706 FIX_PREALLOC_SIZE(list);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1707 if (PyList_Reverse(list) < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1708 goto onError;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1709 return list;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1710
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1711 onError:
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1712 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1713 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1714 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1715
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1716
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1717 PyDoc_STRVAR(join__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1718 "S.join(sequence) -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1719 \n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1720 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	1721 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	1722
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1723 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1724 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	1725 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1726 char *sep = PyString_AS_STRING(self);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1727 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	1728 PyObject *res = NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1729 char *p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1730 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	1731 size_t sz = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1732 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	1733 PyObject seq, item;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1734
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1735 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	1736 if (seq == NULL) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1737 return NULL;
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1738 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1739
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13561 diff changeset	1740 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	1741 if (seqlen == 0) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1742 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1743 return PyString_FromString("");
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1744 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1745 if (seqlen == 1) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1746 item = PySequence_Fast_GET_ITEM(seq, 0);
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1747 if (PyString_CheckExact(item) \|\| PyUnicode_CheckExact(item)) {
03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1748 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	1749 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	1750 return item;
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1751 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1752 }
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1753
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1754 /* There are at least two things to join, or else we have a subclass
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1755 * 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	1756 * 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	1757 * 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	1758 * 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	1759 */
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1760 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	1761 const size_t old_sz = sz;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1762 item = PySequence_Fast_GET_ITEM(seq, i);
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1763 if (!PyString_Check(item)){
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1764 #ifdef Py_USING_UNICODE
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1765 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	1766 /* 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	1767 * 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	1768 * 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	1769 * 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	1770 */
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1771 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	1772 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	1773 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	1774 return result;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1775 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1776 #endif
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1777 PyErr_Format(PyExc_TypeError,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1778 "sequence item %zd: expected string,"
13544 3cf4f5aee00e small updates to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13528 diff changeset	1779 " %.80s found",
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1780 i, item->ob_type->tp_name);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1781 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1782 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1783 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1784 sz += PyString_GET_SIZE(item);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1785 if (i != 0)
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1786 sz += seplen;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1787 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	1788 PyErr_SetString(PyExc_OverflowError,
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1789 "join() is too long for a Python string");
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1790 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1791 return NULL;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1792 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1793 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1794
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1795 /* Allocate result space. */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1796 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	1797 if (res == NULL) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1798 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1799 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1800 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1801
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1802 /* Catenate everything. */
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1803 p = PyString_AS_STRING(res);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1804 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	1805 size_t n;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1806 item = PySequence_Fast_GET_ITEM(seq, i);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1807 n = PyString_GET_SIZE(item);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1808 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	1809 p += n;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1810 if (i < seqlen - 1) {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1811 Py_MEMCPY(p, sep, seplen);
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1812 p += seplen;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1813 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1814 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1815
13526 3686d12362b8 fix two refcount bugs in new string_join implementation: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13524 diff changeset	1816 Py_DECREF(seq);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1817 return res;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1818 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1819
18130 8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1820 PyObject *
8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1821 _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	1822 {
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1823 assert(sep != NULL && PyString_Check(sep));
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1824 assert(x != NULL);
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1825 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	1826 }
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1827
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1828 Py_LOCAL_INLINE(void)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1829 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	1830 {
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1831 if (*end > len)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1832 *end = len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1833 else if (*end < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1834 *end += len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1835 if (*end < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1836 *end = 0;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1837 if (*start < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1838 *start += len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1839 if (*start < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1840 *start = 0;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1841 }
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1842
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1843 Py_LOCAL_INLINE(Py_ssize_t)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1844 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	1845 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1846 PyObject *subobj;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1847 const char *sub;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1848 Py_ssize_t sub_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1849 Py_ssize_t start=0, end=PY_SSIZE_T_MAX;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1850
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1851 if (!PyArg_ParseTuple(args, "O\|O&O&:find/rfind/index/rindex", &subobj,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1852 _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	1853 return -2;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1854 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1855 sub = PyString_AS_STRING(subobj);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1856 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	1857 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1858 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1859 else if (PyUnicode_Check(subobj))
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1860 return PyUnicode_Find(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1861 (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	1862 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1863 else if (PyObject_AsCharBuffer(subobj, &sub, &sub_len))
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1864 /* XXX - the "expected a character buffer object" is pretty
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1865 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	1866 return -2;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1867
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1868 if (dir > 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1869 return stringlib_find_slice(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1870 PyString_AS_STRING(self), PyString_GET_SIZE(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1871 sub, sub_len, start, end);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1872 else
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1873 return stringlib_rfind_slice(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1874 PyString_AS_STRING(self), PyString_GET_SIZE(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1875 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	1876 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1877
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1878
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1879 PyDoc_STRVAR(find__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1880 "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	1881 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1882 Return the lowest index in S where substring sub is found,\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1883 such that sub is contained within s[start,end]. Optional\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1884 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	1885 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1886 Return -1 on failure.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1887
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1888 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1889 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	1890 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1891 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	1892 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1893 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1894 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	1895 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1896
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1897
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1898 PyDoc_STRVAR(index__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1899 "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	1900 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1901 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	1902
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1903 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1904 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	1905 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1906 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	1907 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1908 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1909 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1910 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	1911 "substring not found");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1912 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1913 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1914 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	1915 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1916
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1917
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1918 PyDoc_STRVAR(rfind__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1919 "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	1920 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1921 Return the highest index in S where substring sub is found,\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1922 such that sub is contained within s[start,end]. Optional\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1923 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	1924 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1925 Return -1 on failure.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1926
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1927 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1928 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	1929 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1930 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	1931 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1932 return NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1933 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	1934 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1935
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1936
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1937 PyDoc_STRVAR(rindex__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1938 "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	1939 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1940 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	1941
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1942 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1943 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	1944 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1945 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	1946 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1947 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1948 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1949 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	1950 "substring not found");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1951 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1952 }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1953 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	1954 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1955
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1956
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1957 Py_LOCAL_INLINE(PyObject *)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1958 do_xstrip(PyStringObject self, int striptype, PyObject sepobj)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1959 {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1960 char *s = PyString_AS_STRING(self);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1961 Py_ssize_t len = PyString_GET_SIZE(self);
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1962 char *sep = PyString_AS_STRING(sepobj);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1963 Py_ssize_t seplen = PyString_GET_SIZE(sepobj);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1964 Py_ssize_t i, j;
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1965
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1966 i = 0;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1967 if (striptype != RIGHTSTRIP) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1968 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	1969 i++;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1970 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1971 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1972
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1973 j = len;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1974 if (striptype != LEFTSTRIP) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1975 do {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1976 j--;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1977 } 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	1978 j++;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1979 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1980
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1981 if (i == 0 && j == len && PyString_CheckExact(self)) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1982 Py_INCREF(self);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1983 return (PyObject*)self;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1984 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1985 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1986 return PyString_FromStringAndSize(s+i, j-i);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1987 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1988
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1989
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1990 Py_LOCAL_INLINE(PyObject *)
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1991 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	1992 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1993 char *s = PyString_AS_STRING(self);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1994 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	1995
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1996 i = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1997 if (striptype != RIGHTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1998 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	1999 i++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2000 }
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 j = len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2004 if (striptype != LEFTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2005 do {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2006 j--;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2007 } 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	2008 j++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2009 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2010
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2011 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	2012 Py_INCREF(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2013 return (PyObject*)self;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2014 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2015 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2016 return PyString_FromStringAndSize(s+i, j-i);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2017 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2018
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2019
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2020 Py_LOCAL_INLINE(PyObject *)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2021 do_argstrip(PyStringObject self, int striptype, PyObject args)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2022 {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2023 PyObject *sep = NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2024
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2025 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	2026 return NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2027
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2028 if (sep != NULL && sep != Py_None) {
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2029 if (PyString_Check(sep))
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2030 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	2031 #ifdef Py_USING_UNICODE
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2032 else if (PyUnicode_Check(sep)) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2033 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	2034 PyObject *res;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2035 if (uniself==NULL)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2036 return NULL;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2037 res = _PyUnicode_XStrip((PyUnicodeObject *)uniself,
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2038 striptype, sep);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2039 Py_DECREF(uniself);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2040 return res;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	2041 }
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	2042 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2043 PyErr_Format(PyExc_TypeError,
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	2044 #ifdef Py_USING_UNICODE
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2045 "%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	2046 #else
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2047 "%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	2048 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2049 STRIPNAME(striptype));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2050 return NULL;
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
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2053 return do_strip(self, striptype);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2054 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2055
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2056
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2057 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	2058 "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	2059 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2060 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	2061 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	2062 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	2063 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	2064
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2065 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2066 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	2067 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2068 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2069 return do_strip(self, BOTHSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2070 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2071 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	2072 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2073
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2074
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2075 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	2076 "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	2077 \n\
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2078 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	2079 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	2080 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	2081
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2082 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2083 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	2084 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2085 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2086 return do_strip(self, LEFTSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2087 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2088 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	2089 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2090
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2091
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2092 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	2093 "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	2094 \n\
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2095 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	2096 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	2097 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	2098
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2099 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2100 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	2101 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2102 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2103 return do_strip(self, RIGHTSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2104 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	2105 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	2106 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2107
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2108
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2109 PyDoc_STRVAR(lower__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2110 "S.lower() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2111 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2112 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	2113
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2114 /* _tolower and _toupper are defined by SUSv2, but they're not ISO C */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2115 #ifndef _tolower
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2116 #define _tolower tolower
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2117 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2118
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2119 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2120 string_lower(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2121 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2122 char *s;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2123 Py_ssize_t i, n = PyString_GET_SIZE(self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2124 PyObject *newobj;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2125
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2126 newobj = PyString_FromStringAndSize(NULL, n);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2127 if (!newobj)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2128 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2129
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2130 s = PyString_AS_STRING(newobj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2131
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2132 Py_MEMCPY(s, PyString_AS_STRING(self), n);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2133
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2134 for (i = 0; i < n; i++) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2135 int c = Py_CHARMASK(s[i]);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2136 if (isupper(c))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2137 s[i] = _tolower(c);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2138 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2139
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2140 return newobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2141 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 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(upper__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2144 "S.upper() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2145 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2146 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	2147
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2148 #ifndef _toupper
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2149 #define _toupper toupper
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2150 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2151
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2152 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2153 string_upper(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2154 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2155 char *s;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2156 Py_ssize_t i, n = PyString_GET_SIZE(self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2157 PyObject *newobj;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2158
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2159 newobj = PyString_FromStringAndSize(NULL, n);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2160 if (!newobj)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2161 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2162
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2163 s = PyString_AS_STRING(newobj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2164
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2165 Py_MEMCPY(s, PyString_AS_STRING(self), n);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2166
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2167 for (i = 0; i < n; i++) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2168 int c = Py_CHARMASK(s[i]);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2169 if (islower(c))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2170 s[i] = _toupper(c);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2171 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2172
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2173 return newobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2174 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2175
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2176 PyDoc_STRVAR(title__doc__,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2177 "S.title() -> string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2178 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2179 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	2180 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	2181
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2182 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2183 string_title(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2184 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2185 char s = PyString_AS_STRING(self), s_new;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2186 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	2187 int previous_is_cased = 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2188 PyObject *newobj;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2189
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2190 newobj = PyString_FromStringAndSize(NULL, n);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2191 if (newobj == NULL)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2192 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2193 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	2194 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	2195 int c = Py_CHARMASK(*s++);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2196 if (islower(c)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2197 if (!previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2198 c = toupper(c);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2199 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2200 } else if (isupper(c)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2201 if (previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2202 c = tolower(c);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2203 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2204 } else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2205 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2206 *s_new++ = c;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2207 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2208 return newobj;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2209 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2210
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2211 PyDoc_STRVAR(capitalize__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2212 "S.capitalize() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2213 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2214 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	2215 capitalized.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2216
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2217 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2218 string_capitalize(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2219 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2220 char s = PyString_AS_STRING(self), s_new;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2221 Py_ssize_t i, n = PyString_GET_SIZE(self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2222 PyObject *newobj;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2223
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2224 newobj = PyString_FromStringAndSize(NULL, n);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2225 if (newobj == NULL)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2226 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2227 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	2228 if (0 < n) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2229 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2230 if (islower(c))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2231 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2232 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2233 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2234 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2235 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2236 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	2237 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2238 if (isupper(c))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2239 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2240 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2241 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2242 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2243 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2244 return newobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2245 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2246
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2247
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2248 PyDoc_STRVAR(count__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2249 "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	2250 \n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2251 Return the number of non-overlapping occurrences of substring sub in\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2252 string S[start:end]. Optional arguments start and end are interpreted\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2253 as in slice notation.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2254
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2255 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2256 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	2257 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2258 PyObject *sub_obj;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2259 const char str = PyString_AS_STRING(self), sub;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2260 Py_ssize_t sub_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2261 Py_ssize_t start = 0, end = PY_SSIZE_T_MAX;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2262
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2263 if (!PyArg_ParseTuple(args, "O\|O&O&:count", &sub_obj,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2264 _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	2265 return NULL;
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2266
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2267 if (PyString_Check(sub_obj)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2268 sub = PyString_AS_STRING(sub_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2269 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	2270 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2271 #ifdef Py_USING_UNICODE
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2272 else if (PyUnicode_Check(sub_obj)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2273 Py_ssize_t count;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2274 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	2275 if (count == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2276 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2277 else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2278 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	2279 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2280 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2281 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	2282 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2283
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2284 string_adjust_indices(&start, &end, PyString_GET_SIZE(self));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2285
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2286 return PyInt_FromSsize_t(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2287 stringlib_count(str + start, end - start, sub, sub_len)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2288 );
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2289 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2290
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2291 PyDoc_STRVAR(swapcase__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2292 "S.swapcase() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2293 \n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2294 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	2295 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	2296
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2297 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2298 string_swapcase(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2299 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2300 char s = PyString_AS_STRING(self), s_new;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2301 Py_ssize_t i, n = PyString_GET_SIZE(self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2302 PyObject *newobj;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2303
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2304 newobj = PyString_FromStringAndSize(NULL, n);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2305 if (newobj == NULL)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2306 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2307 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	2308 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	2309 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2310 if (islower(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2311 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2312 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2313 else if (isupper(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2314 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2315 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2316 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2317 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2318 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2319 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2320 return newobj;
11383 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
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2323
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2324 PyDoc_STRVAR(translate__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2325 "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	2326 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2327 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	2328 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	2329 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	2330 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	2331
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2332 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2333 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	2334 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2335 register char input, output;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2336 register const char *table;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2337 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	2338 PyObject input_obj = (PyObject)self;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2339 const char table1, output_start, *del_table=NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2340 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	2341 PyObject *result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2342 int trans_table[256];
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2343 PyObject tableobj, delobj = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2344
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26625 diff changeset	2345 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	2346 &tableobj, &delobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2347 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2348
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2349 if (PyString_Check(tableobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2350 table1 = PyString_AS_STRING(tableobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2351 tablen = PyString_GET_SIZE(tableobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2352 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2353 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2354 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	2355 /* 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	2356 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	2357 to be deleted. */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2358 if (delobj != NULL) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2359 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2360 "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	2361 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2362 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2363 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	2364 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2365 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2366 else if (PyObject_AsCharBuffer(tableobj, &table1, &tablen))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2367 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2368
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	2369 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	2370 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	2371 "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	2372 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	2373 }
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	2374
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2375 if (delobj != NULL) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2376 if (PyString_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2377 del_table = PyString_AS_STRING(delobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2378 dellen = PyString_GET_SIZE(delobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2379 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2380 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2381 else if (PyUnicode_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2382 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2383 "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	2384 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2385 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2386 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2387 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	2388 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2389 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2390 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2391 del_table = NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2392 dellen = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2393 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2394
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2395 table = table1;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2396 inlen = PyString_GET_SIZE(input_obj);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2397 result = PyString_FromStringAndSize((char *)NULL, inlen);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2398 if (result == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2399 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2400 output_start = output = PyString_AsString(result);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2401 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	2402
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2403 if (dellen == 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2404 /* 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	2405 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2406 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2407 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	2408 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2409 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2410 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	2411 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2412 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2413 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2414 return input_obj;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2415 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2416
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2417 for (i = 0; i < 256; i++)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2418 trans_table[i] = Py_CHARMASK(table[i]);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2419
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2420 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	2421 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	2422
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2423 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2424 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2425 if (trans_table[c] != -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2426 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	2427 continue;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2428 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2429 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2430 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	2431 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2432 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2433 return input_obj;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2434 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2435 /* 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	2436 if (inlen > 0)
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	2437 _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	2438 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2439 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2440
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2441
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2442 #define FORWARD 1
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2443 #define REVERSE -1
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2444
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2445 /* find and count characters and substrings */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2446
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2447 #define findchar(target, target_len, c) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2448 ((char )memchr((const void )(target), c, target_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2449
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2450 /* String ops must return a string. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2451 /* If the object is subclass of string, create a copy */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2452 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2453 return_self(PyStringObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2454 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2455 if (PyString_CheckExact(self)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2456 Py_INCREF(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2457 return self;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2458 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2459 return (PyStringObject *)PyString_FromStringAndSize(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2460 PyString_AS_STRING(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2461 PyString_GET_SIZE(self));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2462 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2463
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2464 Py_LOCAL_INLINE(Py_ssize_t)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2465 countchar(char *target, int target_len, char c, Py_ssize_t maxcount)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2466 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2467 Py_ssize_t count=0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2468 char *start=target;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2469 char *end=target+target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2470
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2471 while ( (start=findchar(start, end-start, c)) != NULL ) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2472 count++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2473 if (count >= maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2474 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2475 start += 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2476 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2477 return count;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2478 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2479
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2480 Py_LOCAL(Py_ssize_t)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2481 findstring(char *target, Py_ssize_t target_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2482 char *pattern, Py_ssize_t pattern_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2483 Py_ssize_t start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2484 Py_ssize_t end,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2485 int direction)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2486 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2487 if (start < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2488 start += target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2489 if (start < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2490 start = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2491 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2492 if (end > target_len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2493 end = target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2494 } else if (end < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2495 end += target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2496 if (end < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2497 end = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2498 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2499
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2500 /* zero-length substrings always match at the first attempt */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2501 if (pattern_len == 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2502 return (direction > 0) ? start : end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2503
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2504 end -= pattern_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2505
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2506 if (direction < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2507 for (; end >= start; end--)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2508 if (Py_STRING_MATCH(target, end, pattern, pattern_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2509 return end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2510 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2511 for (; start <= end; start++)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2512 if (Py_STRING_MATCH(target, start, pattern, pattern_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2513 return start;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2514 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2515 return -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
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2518 Py_LOCAL_INLINE(Py_ssize_t)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2519 countstring(char *target, Py_ssize_t target_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2520 char *pattern, Py_ssize_t pattern_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2521 Py_ssize_t start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2522 Py_ssize_t end,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2523 int direction, Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2524 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2525 Py_ssize_t count=0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2526
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2527 if (start < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2528 start += target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2529 if (start < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2530 start = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2531 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2532 if (end > target_len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2533 end = target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2534 } else if (end < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2535 end += target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2536 if (end < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2537 end = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2538 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2539
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2540 /* zero-length substrings match everywhere */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2541 if (pattern_len == 0 \|\| maxcount == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2542 if (target_len+1 < maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2543 return target_len+1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2544 return maxcount;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2545 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2546
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2547 end -= pattern_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2548 if (direction < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2549 for (; (end >= start); end--)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2550 if (Py_STRING_MATCH(target, end, pattern, pattern_len)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2551 count++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2552 if (--maxcount <= 0) break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2553 end -= pattern_len-1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2554 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2555 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2556 for (; (start <= end); start++)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2557 if (Py_STRING_MATCH(target, start, pattern, pattern_len)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2558 count++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2559 if (--maxcount <= 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2560 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2561 start += pattern_len-1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2562 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2563 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2564 return count;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2565 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2566
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2567
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2568 /* Algorithms for different cases of string replacement */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2569
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2570 /* len(self)>=1, from="", len(to)>=1, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2571 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2572 replace_interleave(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2573 PyStringObject *to,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2574 Py_ssize_t maxcount)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2575 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2576 char self_s, to_s, *result_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2577 Py_ssize_t self_len, to_len, result_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2578 Py_ssize_t count, i, product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2579 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2580
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2581 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2582 to_len = PyString_GET_SIZE(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2583
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2584 /* 1 at the end plus 1 after every character */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2585 count = self_len+1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2586 if (maxcount < count)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2587 count = maxcount;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2588
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2589 /* Check for overflow */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2590 /* result_len = count * to_len + self_len; */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2591 product = count * to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2592 if (product / to_len != count) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2593 PyErr_SetString(PyExc_OverflowError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2594 "replace string is too long");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2595 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2596 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2597 result_len = product + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2598 if (result_len < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2599 PyErr_SetString(PyExc_OverflowError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2600 "replace string is too long");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2601 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2602 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2603
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2604 if (! (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2605 PyString_FromStringAndSize(NULL, result_len)) )
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2606 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2607
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2608 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2609 to_s = PyString_AS_STRING(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2610 to_len = PyString_GET_SIZE(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2611 result_s = PyString_AS_STRING(result);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2612
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2613 /* TODO: special case single character, which doesn't need memcpy */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2614
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2615 /* Lay the first one down (guaranteed this will occur) */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2616 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2617 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2618 count -= 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2619
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2620 for (i=0; i<count; i++) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2621 result_s++ = self_s++;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2622 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2623 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2624 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2625
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2626 /* Copy the rest of the original string */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2627 Py_MEMCPY(result_s, self_s, self_len-i);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2628
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2629 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2630 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2631
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2632 /* Special case for deleting a single character */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2633 /* len(self)>=1, len(from)==1, to="", maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2634 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2635 replace_delete_single_character(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2636 char from_c, Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2637 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2638 char self_s, result_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2639 char start, next, *end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2640 Py_ssize_t self_len, result_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2641 Py_ssize_t count;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2642 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2643
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2644 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2645 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2646
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2647 count = countchar(self_s, self_len, from_c, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2648 if (count == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2649 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2650 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2651
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2652 result_len = self_len - count; /* from_len == 1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2653 assert(result_len>=0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2654
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2655 if ( (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2656 PyString_FromStringAndSize(NULL, result_len)) == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2657 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2658 result_s = PyString_AS_STRING(result);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2659
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2660 start = self_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2661 end = self_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2662 while (count-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2663 next = findchar(start, end-start, from_c);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2664 if (next == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2665 break;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2666 Py_MEMCPY(result_s, start, next-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2667 result_s += (next-start);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2668 start = next+1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2669 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2670 Py_MEMCPY(result_s, start, end-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2671
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2672 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2673 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2674
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2675 /* len(self)>=1, len(from)>=2, to="", maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2676
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2677 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2678 replace_delete_substring(PyStringObject self, PyStringObject from,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2679 Py_ssize_t maxcount) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2680 char self_s, from_s, *result_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2681 char start, next, *end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2682 Py_ssize_t self_len, from_len, result_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2683 Py_ssize_t count, offset;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2684 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2685
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2686 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2687 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2688 from_len = PyString_GET_SIZE(from);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2689 from_s = PyString_AS_STRING(from);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2690
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2691 count = countstring(self_s, self_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2692 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2693 0, self_len, 1,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2694 maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2695
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2696 if (count == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2697 /* no matches */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2698 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2699 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2700
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2701 result_len = self_len - (count * from_len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2702 assert (result_len>=0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2703
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2704 if ( (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2705 PyString_FromStringAndSize(NULL, result_len)) == NULL )
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2706 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2707
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2708 result_s = PyString_AS_STRING(result);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2709
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2710 start = self_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2711 end = self_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2712 while (count-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2713 offset = findstring(start, end-start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2714 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2715 0, end-start, FORWARD);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2716 if (offset == -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2717 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2718 next = start + offset;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2719
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2720 Py_MEMCPY(result_s, start, next-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2721
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2722 result_s += (next-start);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2723 start = next+from_len;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2724 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2725 Py_MEMCPY(result_s, start, end-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2726 return result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2727 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2728
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2729 /* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2730 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2731 replace_single_character_in_place(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2732 char from_c, char to_c,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2733 Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2734 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2735 char self_s, result_s, start, end, *next;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2736 Py_ssize_t self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2737 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2738
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2739 /* The result string will be the same size */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2740 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2741 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2742
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2743 next = findchar(self_s, self_len, from_c);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2744
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2745 if (next == NULL) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2746 /* No matches; return the original string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2747 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2748 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2749
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2750 /* Need to make a new string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2751 result = (PyStringObject *) PyString_FromStringAndSize(NULL, self_len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2752 if (result == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2753 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2754 result_s = PyString_AS_STRING(result);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2755 Py_MEMCPY(result_s, self_s, self_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2756
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2757 /* change everything in-place, starting with this one */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2758 start = result_s + (next-self_s);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2759 *start = to_c;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2760 start++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2761 end = result_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2762
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2763 while (--maxcount > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2764 next = findchar(start, end-start, from_c);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2765 if (next == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2766 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2767 *next = to_c;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2768 start = next+1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2769 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2770
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2771 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2772 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2773
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2774 /* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2775 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2776 replace_substring_in_place(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2777 PyStringObject *from,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2778 PyStringObject *to,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2779 Py_ssize_t maxcount)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2780 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2781 char result_s, start, *end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2782 char self_s, from_s, *to_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2783 Py_ssize_t self_len, from_len, offset;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2784 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2785
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2786 /* The result string will be the same size */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2787
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2788 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2789 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2790
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2791 from_s = PyString_AS_STRING(from);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2792 from_len = PyString_GET_SIZE(from);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2793 to_s = PyString_AS_STRING(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2794
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2795 offset = findstring(self_s, self_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2796 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2797 0, self_len, FORWARD);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2798
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2799 if (offset == -1) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2800 /* No matches; return the original string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2801 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2802 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2803
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2804 /* Need to make a new string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2805 result = (PyStringObject *) PyString_FromStringAndSize(NULL, self_len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2806 if (result == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2807 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2808 result_s = PyString_AS_STRING(result);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2809 Py_MEMCPY(result_s, self_s, self_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2810
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2811
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2812 /* change everything in-place, starting with this one */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2813 start = result_s + offset;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2814 Py_MEMCPY(start, to_s, from_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2815 start += from_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2816 end = result_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2817
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2818 while ( --maxcount > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2819 offset = findstring(start, end-start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2820 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2821 0, end-start, FORWARD);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2822 if (offset==-1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2823 break;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2824 Py_MEMCPY(start+offset, to_s, from_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2825 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	2826 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2827
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2828 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2829 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2830
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2831 /* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2832 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2833 replace_single_character(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2834 char from_c,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2835 PyStringObject *to,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2836 Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2837 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2838 char self_s, to_s, *result_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2839 char start, next, *end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2840 Py_ssize_t self_len, to_len, result_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2841 Py_ssize_t count, product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2842 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2843
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2844 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2845 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2846
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2847 count = countchar(self_s, self_len, from_c, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2848
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2849 if (count == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2850 /* no matches, return unchanged */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2851 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2852 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2853
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2854 to_s = PyString_AS_STRING(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2855 to_len = PyString_GET_SIZE(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2856
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2857 /* use the difference between current and new, hence the "-1" */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2858 /* result_len = self_len + count * (to_len-1) */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2859 product = count * (to_len-1);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2860 if (product / (to_len-1) != count) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2861 PyErr_SetString(PyExc_OverflowError, "replace string is too long");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2862 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2863 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2864 result_len = self_len + product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2865 if (result_len < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2866 PyErr_SetString(PyExc_OverflowError, "replace string is too long");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2867 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2868 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2869
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2870 if ( (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2871 PyString_FromStringAndSize(NULL, result_len)) == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2872 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2873 result_s = PyString_AS_STRING(result);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2874
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2875 start = self_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2876 end = self_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2877 while (count-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2878 next = findchar(start, end-start, from_c);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2879 if (next == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2880 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2881
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2882 if (next == start) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2883 /* replace with the 'to' */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2884 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2885 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2886 start += 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2887 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2888 /* copy the unchanged old then the 'to' */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2889 Py_MEMCPY(result_s, start, next-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2890 result_s += (next-start);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2891 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2892 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2893 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	2894 }
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2895 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2896 /* Copy the remainder of the remaining string */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2897 Py_MEMCPY(result_s, start, end-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2898
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2899 return result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2900 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2901
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2902 /* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2903 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2904 replace_substring(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2905 PyStringObject *from,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2906 PyStringObject *to,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2907 Py_ssize_t maxcount) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2908 char self_s, from_s, to_s, result_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2909 char start, next, *end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2910 Py_ssize_t self_len, from_len, to_len, result_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2911 Py_ssize_t count, offset, product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2912 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2913
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2914 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2915 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2916 from_s = PyString_AS_STRING(from);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2917 from_len = PyString_GET_SIZE(from);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2918
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2919 count = countstring(self_s, self_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2920 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2921 0, self_len, FORWARD, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2922 if (count == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2923 /* no matches, return unchanged */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2924 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2925 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2926
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2927 to_s = PyString_AS_STRING(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2928 to_len = PyString_GET_SIZE(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2929
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2930 /* Check for overflow */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2931 /* result_len = self_len + count * (to_len-from_len) */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2932 product = count * (to_len-from_len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2933 if (product / (to_len-from_len) != count) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2934 PyErr_SetString(PyExc_OverflowError, "replace string is too long");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2935 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2936 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2937 result_len = self_len + product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2938 if (result_len < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2939 PyErr_SetString(PyExc_OverflowError, "replace string is too long");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2940 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2941 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2942
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2943 if ( (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2944 PyString_FromStringAndSize(NULL, result_len)) == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2945 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2946 result_s = PyString_AS_STRING(result);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2947
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2948 start = self_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2949 end = self_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2950 while (count-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2951 offset = findstring(start, end-start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2952 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2953 0, end-start, FORWARD);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2954 if (offset == -1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2955 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2956 next = start+offset;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2957 if (next == start) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2958 /* replace with the 'to' */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2959 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2960 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2961 start += from_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2962 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2963 /* copy the unchanged old then the 'to' */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2964 Py_MEMCPY(result_s, start, next-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2965 result_s += (next-start);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2966 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2967 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2968 start = next+from_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2969 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2970 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2971 /* Copy the remainder of the remaining string */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2972 Py_MEMCPY(result_s, start, end-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2973
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2974 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2975 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2976
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2977
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2978 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2979 replace(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2980 PyStringObject *from,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2981 PyStringObject *to,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2982 Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2983 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2984 Py_ssize_t from_len, to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2985
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2986 if (maxcount < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2987 maxcount = PY_SSIZE_T_MAX;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2988 } else if (maxcount == 0 \|\| PyString_GET_SIZE(self) == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2989 /* nothing to do; return the original string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2990 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2991 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2992
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2993 from_len = PyString_GET_SIZE(from);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2994 to_len = PyString_GET_SIZE(to);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2995
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2996 if (maxcount == 0 \|\|
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2997 (from_len == 0 && to_len == 0)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2998 /* nothing to do; return the original string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2999 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3000 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3001
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3002 /* Handle zero-length special cases */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3003
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3004 if (from_len == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3005 /* insert the 'to' string everywhere. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3006 /* >>> "Python".replace("", ".") */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3007 /* '.P.y.t.h.o.n.' */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3008 return replace_interleave(self, to, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3009 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3010
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3011 /* Except for "".replace("", "A") == "A" there is no way beyond this */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3012 /* point for an empty self string to generate a non-empty string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3013 /* Special case so the remaining code always gets a non-empty string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3014 if (PyString_GET_SIZE(self) == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3015 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3016 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3017
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3018 if (to_len == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3019 /* delete all occurances of 'from' string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3020 if (from_len == 1) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3021 return replace_delete_single_character(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3022 self, PyString_AS_STRING(from)[0], maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3023 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3024 return replace_delete_substring(self, from, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3025 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3026 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3027
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3028 /* Handle special case where both strings have the same length */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3029
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3030 if (from_len == to_len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3031 if (from_len == 1) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3032 return replace_single_character_in_place(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3033 self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3034 PyString_AS_STRING(from)[0],
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3035 PyString_AS_STRING(to)[0],
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3036 maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3037 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3038 return replace_substring_in_place(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3039 self, from, to, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3040 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3041 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3042
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3043 /* Otherwise use the more generic algorithms */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3044 if (from_len == 1) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3045 return replace_single_character(self, PyString_AS_STRING(from)[0],
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3046 to, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3047 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3048 /* len('from')>=2, len('to')>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3049 return replace_substring(self, from, to, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3050 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3051 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3052
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3053 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	3054 "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	3055 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3056 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	3057 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	3058 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	3059
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3060 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3061 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	3062 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3063 Py_ssize_t count = -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3064 PyObject from, to;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3065 const char *tmp_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3066 Py_ssize_t tmp_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3067
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3068 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	3069 return NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3070
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3071 if (PyString_Check(from)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3072 /* Can this be made a '!check' after the Unicode check? */
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3073 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3074 #ifdef Py_USING_UNICODE
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3075 if (PyUnicode_Check(from))
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3076 return PyUnicode_Replace((PyObject *)self,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3077 from, to, count);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3078 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3079 else if (PyObject_AsCharBuffer(from, &tmp_s, &tmp_len))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3080 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3081
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3082 if (PyString_Check(to)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3083 /* Can this be made a '!check' after the Unicode check? */
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3084 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3085 #ifdef Py_USING_UNICODE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3086 else if (PyUnicode_Check(to))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3087 return PyUnicode_Replace((PyObject *)self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3088 from, to, count);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3089 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3090 else if (PyObject_AsCharBuffer(to, &tmp_s, &tmp_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3091 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3092
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3093 return (PyObject )replace((PyStringObject ) self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3094 (PyStringObject *) from,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3095 (PyStringObject *) to, count);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3096 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3097
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3098 / End DALKE /
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3099
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3100 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	3101 "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	3102 \n\
28559 aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28478 diff changeset	3103 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	3104 With optional start, test S beginning at that position.\n\
aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28478 diff changeset	3105 With optional end, stop comparing S at that position.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3106
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3107 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3108 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	3109 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3110 const char* str = PyString_AS_STRING(self);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3111 Py_ssize_t 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	3112 const char* prefix;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3113 Py_ssize_t plen;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3114 Py_ssize_t start = 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3115 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	3116 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3117
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	3118 if (!PyArg_ParseTuple(args, "O\|O&O&:startswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	3119 _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	3120 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3121 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3122 prefix = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3123 plen = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3124 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3125 #ifdef Py_USING_UNICODE
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3126 else if (PyUnicode_Check(subobj)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3127 Py_ssize_t rc;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3128 rc = PyUnicode_Tailmatch((PyObject *)self,
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3129 subobj, start, end, -1);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3130 if (rc == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3131 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3132 else
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	3133 return PyBool_FromLong((long) rc);
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3134 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3135 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3136 else if (PyObject_AsCharBuffer(subobj, &prefix, &plen))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3137 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3138
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3139 string_adjust_indices(&start, &end, len);
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3140
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3141 if (start+plen > len)
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	3142 return PyBool_FromLong(0);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3143
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3144 if (end-start >= plen)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3145 return PyBool_FromLong(!memcmp(str+start, prefix, plen));
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3146 else
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3147 return PyBool_FromLong(0);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3148 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3149
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3150
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3151 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	3152 "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	3153 \n\
28559 aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28478 diff changeset	3154 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	3155 With optional start, test S beginning at that position.\n\
aff080f2efb4 Reformat a few docstrings that caused line wraps in help() output. Guido van Rossum <guido@python.org> parents: 28478 diff changeset	3156 With optional end, stop comparing S at that position.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3157
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3158 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3159 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	3160 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3161 const char* str = PyString_AS_STRING(self);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3162 Py_ssize_t 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	3163 const char* suffix;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3164 Py_ssize_t slen;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3165 Py_ssize_t start = 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3166 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	3167 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3168
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	3169 if (!PyArg_ParseTuple(args, "O\|O&O&:endswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	3170 _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	3171 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3172 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3173 suffix = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3174 slen = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3175 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3176 #ifdef Py_USING_UNICODE
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3177 else if (PyUnicode_Check(subobj)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3178 Py_ssize_t rc;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3179 rc = PyUnicode_Tailmatch((PyObject *)self,
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3180 subobj, start, end, +1);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3181 if (rc == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3182 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3183 else
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	3184 return PyBool_FromLong((long) rc);
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	3185 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3186 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3187 else if (PyObject_AsCharBuffer(subobj, &suffix, &slen))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3188 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3189
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3190 string_adjust_indices(&start, &end, len);
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3191
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3192 if (end-start < slen \|\| start > len)
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	3193 return PyBool_FromLong(0);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3194
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3195 if (end-slen > start)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3196 start = end - slen;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3197 if (end-start >= slen)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3198 return PyBool_FromLong(!memcmp(str+start, suffix, slen));
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3199 else
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	3200 return PyBool_FromLong(0);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3201 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3202
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3203
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3204 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	3205 "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	3206 \n\
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3207 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	3208 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	3209 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	3210 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	3211 '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	3212 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	3213
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3214 static PyObject *
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3215 string_encode(PyStringObject self, PyObject args)
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3216 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3217 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	3218 char *errors = NULL;
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3219 PyObject *v;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3220
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3221 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	3222 return NULL;
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3223 v = PyString_AsEncodedObject((PyObject *)self, encoding, errors);
32552 3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3224 if (v == NULL)
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3225 goto onError;
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3226 if (!PyString_Check(v) && !PyUnicode_Check(v)) {
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3227 PyErr_Format(PyExc_TypeError,
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3228 "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	3229 "(type=%.400s)",
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3230 v->ob_type->tp_name);
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3231 Py_DECREF(v);
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3232 return NULL;
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3233 }
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3234 return v;
32552 3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3235
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3236 onError:
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3237 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	3238 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3239
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3240
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3241 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	3242 "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	3243 \n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3244 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	3245 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	3246 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	3247 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	3248 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	3249 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	3250
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3251 static PyObject *
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3252 string_decode(PyStringObject self, PyObject args)
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3253 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3254 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	3255 char *errors = NULL;
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3256 PyObject *v;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3257
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	3258 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	3259 return NULL;
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3260 v = PyString_AsDecodedObject((PyObject *)self, encoding, errors);
32552 3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3261 if (v == NULL)
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3262 goto onError;
32551 f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3263 if (!PyString_Check(v) && !PyUnicode_Check(v)) {
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3264 PyErr_Format(PyExc_TypeError,
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3265 "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	3266 "(type=%.400s)",
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3267 v->ob_type->tp_name);
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3268 Py_DECREF(v);
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3269 return NULL;
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3270 }
f46d49e2e0f0 Allow string and unicode return types from .encode()/.decode() Marc-André Lemburg <mal@egenix.com> parents: 32423 diff changeset	3271 return v;
32552 3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3272
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3273 onError:
3706a3704aea .encode()/.decode() patch part 2. Marc-André Lemburg <mal@egenix.com> parents: 32551 diff changeset	3274 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	3275 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3276
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	3277
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3278 PyDoc_STRVAR(expandtabs__doc__,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3279 "S.expandtabs([tabsize]) -> string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3280 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3281 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	3282 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	3283
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3284 static PyObject*
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3285 string_expandtabs(PyStringObject self, PyObject args)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3286 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3287 const char e, p;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3288 char *q;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3289 Py_ssize_t i, j;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3290 PyObject *u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3291 int tabsize = 8;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3292
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3293 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	3294 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3295
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	3296 /* First pass: determine size of output string */
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3297 i = j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3298 e = PyString_AS_STRING(self) + PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3299 for (p = PyString_AS_STRING(self); p < e; p++)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3300 if (*p == '\t') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3301 if (tabsize > 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3302 j += tabsize - (j % tabsize);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3303 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3304 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3305 j++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3306 if (p == '\n' \|\| p == '\r') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3307 i += j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3308 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3309 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3310 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3311
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3312 /* Second pass: create output string and fill it */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3313 u = PyString_FromStringAndSize(NULL, i + j);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3314 if (!u)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3315 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3316
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3317 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3318 q = PyString_AS_STRING(u);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3319
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3320 for (p = PyString_AS_STRING(self); p < e; p++)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3321 if (*p == '\t') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3322 if (tabsize > 0) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3323 i = tabsize - (j % tabsize);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3324 j += i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3325 while (i--)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3326 *q++ = ' ';
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3327 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3328 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3329 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3330 j++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3331 q++ = p;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3332 if (p == '\n' \|\| p == '\r')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3333 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3334 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3335
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3336 return u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3337 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3338
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3339 Py_LOCAL_INLINE(PyObject *)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3340 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	3341 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3342 PyObject *u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3343
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3344 if (left < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3345 left = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3346 if (right < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3347 right = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3348
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3349 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	3350 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3351 return (PyObject *)self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3352 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3353
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3354 u = PyString_FromStringAndSize(NULL,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3355 left + PyString_GET_SIZE(self) + right);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3356 if (u) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3357 if (left)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3358 memset(PyString_AS_STRING(u), fill, left);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3359 Py_MEMCPY(PyString_AS_STRING(u) + left,
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3360 PyString_AS_STRING(self),
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3361 PyString_GET_SIZE(self));
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3362 if (right)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3363 memset(PyString_AS_STRING(u) + left + PyString_GET_SIZE(self),
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3364 fill, right);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3365 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3366
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3367 return u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3368 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3369
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3370 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	3371 "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	3372 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3373 "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	3374 "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	3375
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3376 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3377 string_ljust(PyStringObject self, PyObject args)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3378 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3379 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	3380 char fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3381
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3382 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	3383 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3384
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3385 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	3386 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3387 return (PyObject*) self;
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
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3390 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	3391 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3392
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3393
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3394 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	3395 "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	3396 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3397 "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	3398 "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	3399
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3400 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3401 string_rjust(PyStringObject self, PyObject args)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3402 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3403 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	3404 char fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3405
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3406 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	3407 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3408
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3409 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	3410 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3411 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3412 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3413
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3414 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	3415 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3416
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3417
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3418 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	3419 "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	3420 "\n"
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3421 "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	3422 "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	3423
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3424 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3425 string_center(PyStringObject self, PyObject args)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3426 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3427 Py_ssize_t marg, left;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3428 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	3429 char fillchar = ' ';
21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3430
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3431 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	3432 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3433
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	3434 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	3435 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3436 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3437 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3438
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3439 marg = width - PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3440 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	3441
31021 21a10c3600b5 Add optional fillchar argument to ljust(), rjust(), and center() string methods. Raymond Hettinger <python@rcn.com> parents: 30751 diff changeset	3442 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	3443 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3444
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3445 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	3446 "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	3447 "\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	3448 "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	3449 "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	3450
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3451 static PyObject *
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3452 string_zfill(PyStringObject self, PyObject args)
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3453 {
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	3454 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	3455 PyObject *s;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3456 char *p;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3457 Py_ssize_t width;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3458
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3459 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	3460 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	3461
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3462 if (PyString_GET_SIZE(self) >= width) {
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	3463 if (PyString_CheckExact(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	3464 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	3465 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	3466 }
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	3467 else
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	3468 return PyString_FromStringAndSize(
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	3469 PyString_AS_STRING(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	3470 PyString_GET_SIZE(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	3471 );
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	3472 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3473
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3474 fill = width - PyString_GET_SIZE(self);
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3475
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3476 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	3477
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3478 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	3479 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	3480
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3481 p = PyString_AS_STRING(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	3482 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	3483 /* 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	3484 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	3485 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	3486 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3487
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3488 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	3489 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	3490
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3491 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	3492 "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	3493 \n\
be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3494 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	3495 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	3496
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3497 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3498 string_isspace(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3499 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3500 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3501 = (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	3502 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	3503
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3504 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3505 if (PyString_GET_SIZE(self) == 1 &&
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3506 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	3507 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3508
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3509 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3510 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	3511 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3512
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3513 e = p + PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3514 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3515 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	3516 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3517 }
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	3518 return PyBool_FromLong(1);
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
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3521
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3522 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	3523 "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	3524 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3525 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	3526 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	3527
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3528 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3529 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	3530 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3531 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3532 = (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	3533 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	3534
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3535 /* Shortcut for single character strings */
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3536 if (PyString_GET_SIZE(self) == 1 &&
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3537 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	3538 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	3539
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3540 /* Special case for empty strings */
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3541 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	3542 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	3543
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3544 e = p + PyString_GET_SIZE(self);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3545 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	3546 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	3547 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	3548 }
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	3549 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	3550 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3551
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3552
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3553 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	3554 "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	3555 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3556 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	3557 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	3558
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3559 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3560 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	3561 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3562 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3563 = (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	3564 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	3565
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3566 /* Shortcut for single character strings */
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3567 if (PyString_GET_SIZE(self) == 1 &&
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3568 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	3569 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	3570
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3571 /* Special case for empty strings */
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3572 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	3573 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	3574
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3575 e = p + PyString_GET_SIZE(self);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3576 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	3577 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	3578 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	3579 }
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	3580 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	3581 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3582
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	3583
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3584 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	3585 "S.isdigit() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3586 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3587 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	3588 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	3589
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3590 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3591 string_isdigit(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3592 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3593 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3594 = (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	3595 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	3596
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3597 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3598 if (PyString_GET_SIZE(self) == 1 &&
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3599 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	3600 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3601
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3602 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3603 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	3604 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3605
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3606 e = p + PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3607 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3608 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	3609 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3610 }
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	3611 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3612 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3613
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3614
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3615 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	3616 "S.islower() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3617 \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	3618 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	3619 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	3620
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3621 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3622 string_islower(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3623 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3624 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3625 = (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	3626 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	3627 int cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3628
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3629 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3630 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	3631 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	3632
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3633 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3634 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	3635 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3636
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3637 e = p + PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3638 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3639 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3640 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	3641 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3642 else if (!cased && islower(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3643 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3644 }
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	3645 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3646 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3647
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3648
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3649 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	3650 "S.isupper() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3651 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3652 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	3653 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	3654
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3655 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3656 string_isupper(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3657 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3658 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3659 = (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	3660 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	3661 int cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3662
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3663 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3664 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	3665 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	3666
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3667 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3668 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	3669 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3670
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3671 e = p + PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3672 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3673 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3674 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	3675 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3676 else if (!cased && isupper(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3677 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3678 }
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	3679 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3680 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3681
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3682
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3683 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	3684 "S.istitle() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3685 \n\
30706 be0ca26ad574 Patch #825679: Clarify semantics of .isfoo on empty strings. Martin v. Löwis <martin@v.loewis.de> parents: 30216 diff changeset	3686 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	3687 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	3688 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	3689 otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3690
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3691 static PyObject*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	3692 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	3693 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3694 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3695 = (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	3696 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	3697 int cased, previous_is_cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3698
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3699 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3700 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	3701 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	3702
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3703 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3704 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	3705 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	3706
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3707 e = p + PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3708 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3709 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3710 for (; p < e; p++) {
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	3711 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	3712
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3713 if (isupper(ch)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3714 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	3715 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3716 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3717 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3718 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3719 else if (islower(ch)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3720 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	3721 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3722 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3723 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3724 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3725 else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3726 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3727 }
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	3728 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3729 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3730
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3731
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3732 PyDoc_STRVAR(splitlines__doc__,
20415 621c7703e8b7 Remove extra "]" in splitlines() docstring. Fred Drake <fdrake@acm.org> parents: 20277 diff changeset	3733 "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	3734 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3735 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	3736 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	3737 is given and true.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3738
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3739 static PyObject*
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3740 string_splitlines(PyStringObject self, PyObject args)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3741 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3742 register Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3743 register Py_ssize_t j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3744 Py_ssize_t len;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3745 int keepends = 0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3746 PyObject *list;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3747 PyObject *str;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3748 char *data;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3749
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3750 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	3751 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3752
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3753 data = PyString_AS_STRING(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3754 len = PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3755
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3756 /* This does not use the preallocated list because splitlines is
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3757 usually run with hundreds of newlines. The overhead of
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3758 switching between PyList_SET_ITEM and append causes about a
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3759 2-3% slowdown for that common case. A smarter implementation
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3760 could move the if check out, so the SET_ITEMs are done first
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3761 and the appends only done when the prealloc buffer is full.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3762 That's too much work for little gain.*/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3763
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3764 list = PyList_New(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3765 if (!list)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3766 goto onError;
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 for (i = j = 0; i < len; ) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3769 Py_ssize_t eol;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3770
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3771 /* 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	3772 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	3773 i++;
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 /* 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	3776 eol = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3777 if (i < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3778 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	3779 data[i+1] == '\n')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3780 i += 2;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3781 else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3782 i++;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3783 if (keepends)
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3784 eol = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3785 }
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3786 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	3787 j = i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3788 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3789 if (j < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3790 SPLIT_APPEND(data, j, len);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3791 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3792
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3793 return list;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3794
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3795 onError:
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36866 diff changeset	3796 Py_XDECREF(list);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3797 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3798 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3799
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3800 #undef SPLIT_APPEND
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3801 #undef SPLIT_ADD
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3802 #undef MAX_PREALLOC
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3803 #undef PREALLOC_SIZE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3804
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3805 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3806 string_getnewargs(PyStringObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3807 {
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3808 return Py_BuildValue("(s#)", v->ob_sval, v->ob_size);
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3809 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3810
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3811
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3812 static PyMethodDef
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3813 string_methods[] = {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	3814 /* 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	3815 string.maketrans(). */
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3816 {"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	3817 {"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	3818 {"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	3819 {"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	3820 {"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	3821 {"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	3822 {"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	3823 {"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	3824 {"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	3825 {"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	3826 {"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	3827 {"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	3828 {"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	3829 capitalize__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3830 {"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	3831 {"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	3832 endswith__doc__},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3833 {"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	3834 {"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	3835 {"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	3836 {"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	3837 {"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	3838 {"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	3839 {"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	3840 {"rstrip", (PyCFunction)string_rstrip, METH_VARARGS, rstrip__doc__},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3841 {"rpartition", (PyCFunction)string_rpartition, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	3842 rpartition__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3843 {"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	3844 startswith__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3845 {"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	3846 {"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	3847 swapcase__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3848 {"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	3849 translate__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3850 {"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	3851 {"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	3852 {"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	3853 {"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	3854 {"zfill", (PyCFunction)string_zfill, METH_VARARGS, zfill__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3855 {"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	3856 {"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	3857 {"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	3858 expandtabs__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3859 {"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	3860 splitlines__doc__},
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	3861 {"__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	3862 {NULL, NULL} /* sentinel */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3863 };
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3864
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24184 diff changeset	3865 static PyObject *
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3866 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	3867
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3868 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3869 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	3870 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3871 PyObject *x = NULL;
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36528 diff changeset	3872 static char *kwlist[] = {"object", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3873
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3874 if (type != &PyString_Type)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3875 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	3876 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	3877 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3878 if (x == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3879 return PyString_FromString("");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3880 return PyObject_Str(x);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3881 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3882
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3883 static PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3884 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	3885 {
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3886 PyObject tmp, pnew;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3887 Py_ssize_t n;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3888
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3889 assert(PyType_IsSubtype(type, &PyString_Type));
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3890 tmp = string_new(&PyString_Type, args, kwds);
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3891 if (tmp == NULL)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3892 return NULL;
19846 662e22f99639 More on SF bug [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19632 diff changeset	3893 assert(PyString_CheckExact(tmp));
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3894 n = PyString_GET_SIZE(tmp);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3895 pnew = type->tp_alloc(type, n);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3896 if (pnew != NULL) {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3897 Py_MEMCPY(PyString_AS_STRING(pnew), PyString_AS_STRING(tmp), n+1);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3898 ((PyStringObject *)pnew)->ob_shash =
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3899 ((PyStringObject *)tmp)->ob_shash;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	3900 ((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	3901 }
19632 20fb7591f885 Fix a memory leak in str_subtype_new(). (All the other Guido van Rossum <guido@python.org> parents: 19592 diff changeset	3902 Py_DECREF(tmp);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3903 return pnew;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3904 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3905
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	3906 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	3907 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	3908 {
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	3909 PyErr_SetString(PyExc_TypeError,
23597 ed007e47b3a1 Change name from string to basestring Neal Norwitz <nnorwitz@gmail.com> parents: 23542 diff changeset	3910 "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	3911 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	3912 }
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	3913
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	3914 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	3915 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	3916 {
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	3917 if (!PyString_Check(v)) {
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	3918 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	3919 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	3920 }
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	3921 return PyString_Format(v, 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	3922 }
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	3923
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3924 PyDoc_STRVAR(basestring_doc,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3925 "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	3926
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	3927 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	3928 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	3929 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	3930 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	3931 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	3932 };
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	3933
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	3934
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	3935 PyTypeObject PyBaseString_Type = {
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	3936 PyObject_HEAD_INIT(&PyType_Type)
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	3937 0,
23597 ed007e47b3a1 Change name from string to basestring Neal Norwitz <nnorwitz@gmail.com> parents: 23542 diff changeset	3938 "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	3939 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	3940 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	3941 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	3942 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	3943 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	3944 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	3945 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	3946 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	3947 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	3948 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	3949 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	3950 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	3951 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	3952 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	3953 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	3954 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	3955 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	3956 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	3957 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	3958 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	3959 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	3960 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	3961 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	3962 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	3963 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	3964 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	3965 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	3966 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	3967 &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	3968 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	3969 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	3970 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	3971 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	3972 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	3973 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	3974 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	3975 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	3976 };
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	3977
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3978 PyDoc_STRVAR(string_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3979 "str(object) -> string\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3980 \n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3981 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	3982 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	3983
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3984 PyTypeObject PyString_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3985 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3986 0,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3987 "str",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3988 sizeof(PyStringObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3989 sizeof(char),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3990 string_dealloc, /* tp_dealloc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3991 (printfunc)string_print, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3992 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3993 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3994 0, /* tp_compare */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3995 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	3996 &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	3997 &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	3998 &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	3999 (hashfunc)string_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4000 0, /* tp_call */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	4001 string_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4002 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4003 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4004 &string_as_buffer, /* tp_as_buffer */
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38669 diff changeset	4005 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4006 string_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4007 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4008 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4009 (richcmpfunc)string_richcompare, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4010 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4011 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4012 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4013 string_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4014 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4015 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	4016 &PyBaseString_Type, /* tp_base */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4017 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4018 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4019 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4020 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4021 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4022 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	4023 string_new, /* tp_new */
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	4024 PyObject_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4025 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4026
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4027 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4028 PyString_Concat(register PyObject *pv, register PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4029 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4030 register PyObject *v;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4031 if (*pv == NULL)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4032 return;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4033 if (w == NULL \|\| !PyString_Check(*pv)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4034 Py_DECREF(*pv);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4035 *pv = NULL;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4036 return;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4037 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4038 v = string_concat((PyStringObject ) pv, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4039 Py_DECREF(*pv);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4040 *pv = v;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4041 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4042
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4043 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4044 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	4045 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4046 PyString_Concat(pv, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4047 Py_XDECREF(w);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4048 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4049
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4050
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4051 /* The following function breaks the notion that strings are immutable:
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4052 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	4053 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	4054 as creating a new string object and destroying the old one, only
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4055 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	4056 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	4057 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	4058 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	4059 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	4060 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	4061 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	4062 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	4063 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4064
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4065 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4066 _PyString_Resize(PyObject **pv, Py_ssize_t newsize)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4067 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4068 register PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4069 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	4070 v = *pv;
33030 8607ac2f81c8 This was quite a dark bug in my recent in-place string concatenation Armin Rigo <arigo@tunes.org> parents: 33023 diff changeset	4071 if (!PyString_Check(v) \|\| v->ob_refcnt != 1 \|\| newsize < 0 \|\|
8607ac2f81c8 This was quite a dark bug in my recent in-place string concatenation Armin Rigo <arigo@tunes.org> parents: 33023 diff changeset	4072 PyString_CHECK_INTERNED(v)) {
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4073 *pv = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4074 Py_DECREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4075 PyErr_BadInternalCall();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	4076 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4077 }
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	4078 /* 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	4079 _Py_DEC_REFTOTAL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4080 _Py_ForgetReference(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4081 pv = (PyObject )
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	4082 PyObject_REALLOC((char *)v, sizeof(PyStringObject) + newsize);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4083 if (*pv == NULL) {
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	4084 PyObject_Del(v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4085 PyErr_NoMemory();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	4086 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4087 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4088 _Py_NewReference(*pv);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4089 sv = (PyStringObject ) pv;
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	4090 sv->ob_size = newsize;
ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	4091 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	4092 sv->ob_shash = -1; /* invalidate cached hash value */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4093 return 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4094 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4095
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4096 /* Helpers for formatstring */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4097
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	4098 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	4099 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	4100 {
36528 76ce880dce49 Use Py_ssize_t in helper function between Py_ssize_t-using functions. Thomas Wouters <thomas@python.org> parents: 36519 diff changeset	4101 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	4102 if (argidx < arglen) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4103 (*p_argidx)++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4104 if (arglen < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4105 return args;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4106 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4107 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	4108 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4109 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4110 "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	4111 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4112 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4113
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	4114 /* 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	4115 * 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	4116 * 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	4117 * 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	4118 * 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	4119 * 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	4120 */
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4121 #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	4122 #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	4123 #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	4124 #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	4125 #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	4126
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	4127 Py_LOCAL_INLINE(int)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4128 formatfloat(char *buf, size_t buflen, int flags,
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4129 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	4130 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4131 /* fmt = '%#.' + `prec` + `type`
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4132 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	4133 char fmt[20];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4134 double x;
24415 f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4135 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	4136 if (x == -1.0 && PyErr_Occurred()) {
f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4137 PyErr_SetString(PyExc_TypeError, "float argument required");
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4138 return -1;
24415 f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4139 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4140 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4141 prec = 6;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4142 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	4143 type = 'g';
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4144 /* 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	4145
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4146 'g' formats:
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4147 fmt = %#.<prec>g
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4148 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	4149 for any double rep.)
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4150 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	4151
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4152 'f' formats:
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4153 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	4154 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	4155
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4156 If prec=0 the effective precision is 1 (the leading digit is
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	4157 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	4158
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4159 */
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4160 if ((type == 'g' && buflen <= (size_t)10 + (size_t)prec) \|\|
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4161 (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	4162 PyErr_SetString(PyExc_OverflowError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15082 diff changeset	4163 "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	4164 return -1;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4165 }
26825 e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4166 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	4167 (flags&F_ALT) ? "#" : "",
e153961f961f Patch for bug #659709: bogus computation of float length Marc-André Lemburg <mal@egenix.com> parents: 26818 diff changeset	4168 prec, type);
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 31350 diff changeset	4169 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	4170 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	4171 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4172
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	4173 /* _PyString_FormatLong emulates the format codes d, u, o, x and X, and
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	4174 * 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	4175 * 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	4176 * 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	4177 * . *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	4178 * *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	4179 * 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	4180 * 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	4181 * "-"? ("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	4182 * "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	4183 * 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	4184 * 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	4185 * 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	4186 * 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	4187 * 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	4188 * 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	4189 * 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	4190 *
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	4191 * 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	4192 * 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	4193 */
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	4194 PyObject*
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	4195 _PyString_FormatLong(PyObject *val, int flags, int prec, int 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	4196 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	4197 {
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	4198 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	4199 char *buf;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4200 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	4201 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	4202 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	4203 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	4204 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	4205 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	4206
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	4207 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	4208 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	4209 case 'u':
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	4210 result = val->ob_type->tp_str(val);
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	4211 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	4212 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	4213 result = val->ob_type->tp_as_number->nb_oct(val);
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	4214 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	4215 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	4216 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	4217 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	4218 result = val->ob_type->tp_as_number->nb_hex(val);
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	4219 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	4220 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	4221 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	4222 }
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	4223 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	4224 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	4225
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	4226 /* To modify the string in-place, there can only be one reference. */
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	4227 if (result->ob_refcnt != 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	4228 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	4229 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	4230 }
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	4231 buf = PyString_AsString(result);
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4232 llen = PyString_Size(result);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	4233 if (llen > PY_SSIZE_T_MAX) {
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4234 PyErr_SetString(PyExc_ValueError, "string too large in _PyString_FormatLong");
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4235 return NULL;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4236 }
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4237 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	4238 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	4239 --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	4240 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	4241 }
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	4242 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	4243 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	4244 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	4245 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	4246
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4247 /* 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	4248 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	4249 /* 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	4250 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	4251 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	4252 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	4253 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	4254 /* 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	4255 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	4256 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	4257 --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	4258 }
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	4259 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	4260 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	4261 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	4262 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	4263 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	4264 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	4265 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	4266 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	4267 }
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	4268 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	4269 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	4270 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	4271 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	4272 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	4273 }
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	4274 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	4275 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	4276 }
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	4277
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	4278 /* 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	4279 if (prec > 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	4280 PyObject *r1 = PyString_FromStringAndSize(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	4281 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	4282 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	4283 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	4284 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	4285 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	4286 }
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	4287 b1 = PyString_AS_STRING(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	4288 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	4289 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	4290 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	4291 *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	4292 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	4293 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	4294 *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	4295 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	4296 result = 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	4297 buf = PyString_AS_STRING(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	4298 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	4299 }
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
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	4301 /* 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	4302 if (type == 'X') {
27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	4303 /* 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	4304 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	4305 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	4306 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	4307 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	4308 }
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	4309 *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	4310 *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	4311 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	4312 }
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	4313
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	4314 Py_LOCAL_INLINE(int)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4315 formatint(char *buf, size_t buflen, int flags,
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4316 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	4317 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4318 /* 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	4319 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	4320 + 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	4321 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	4322 char *sign;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4323 long x;
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4324
24415 f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4325 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	4326 if (x == -1 && PyErr_Occurred()) {
f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4327 PyErr_SetString(PyExc_TypeError, "int argument required");
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4328 return -1;
24415 f5cfa0ee02cf Fix the problem of not raising a TypeError exception when doing: Neal Norwitz <nnorwitz@gmail.com> parents: 24409 diff changeset	4329 }
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4330 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	4331 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	4332 }
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4333 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	4334 sign = "-";
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4335 else
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4336 sign = "";
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4337 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4338 prec = 1;
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4339
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4340 if ((flags & F_ALT) &&
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4341 (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	4342 /* 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	4343 * 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	4344 * - 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	4345 * 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	4346 * %#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	4347 * hex() function
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4348 * - 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	4349 * 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	4350 * (Metrowerks, Compaq Tru64)
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4351 * - 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	4352 * 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	4353 * 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	4354 *
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4355 * 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	4356 * 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	4357 * of %#x/%#X.
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4358 *
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4359 * 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	4360 * formatint() in unicodeobject.c
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4361 */
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4362 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	4363 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	4364 }
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4365 else {
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4366 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	4367 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	4368 prec, type);
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4369 }
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	4370
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4371 /* 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	4372 * 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	4373 */
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4374 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	4375 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	4376 "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	4377 return -1;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4378 }
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4379 if (sign[0])
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4380 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	4381 else
9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4382 PyOS_snprintf(buf, buflen, fmt, x);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4383 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	4384 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4385
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	4386 Py_LOCAL_INLINE(int)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4387 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	4388 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4389 /* presume that the buffer is at least 2 characters long */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4390 if (PyString_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4391 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	4392 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4393 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4394 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4395 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	4396 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4397 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4398 buf[1] = '\0';
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4399 return 1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4400 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4401
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4402 /* 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	4403
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4404 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	4405 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	4406 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	4407 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	4408 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	4409 */
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4410 #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	4411
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4412 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4413 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	4414 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4415 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	4416 Py_ssize_t arglen, argidx;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4417 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	4418 int args_owned = 0;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4419 PyObject result, orig_args;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4420 #ifdef Py_USING_UNICODE
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4421 PyObject v, w;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4422 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4423 PyObject *dict = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4424 if (format == NULL \|\| !PyString_Check(format) \|\| args == NULL) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4425 PyErr_BadInternalCall();
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4426 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4427 }
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4428 orig_args = args;
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4429 fmt = PyString_AS_STRING(format);
19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4430 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	4431 reslen = rescnt = fmtcnt + 100;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4432 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	4433 if (result == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4434 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4435 res = PyString_AsString(result);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4436 if (PyTuple_Check(args)) {
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4437 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	4438 argidx = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4439 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4440 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4441 arglen = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4442 argidx = -2;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4443 }
26164 63a08639dae2 Fix SF # 635969, No error "not all arguments converted" Neal Norwitz <nnorwitz@gmail.com> parents: 25721 diff changeset	4444 if (args->ob_type->tp_as_mapping && !PyTuple_Check(args) &&
63a08639dae2 Fix SF # 635969, No error "not all arguments converted" Neal Norwitz <nnorwitz@gmail.com> parents: 25721 diff changeset	4445 !PyObject_TypeCheck(args, &PyBaseString_Type))
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4446 dict = args;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4447 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4448 if (*fmt != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4449 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	4450 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	4451 reslen += rescnt;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4452 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	4453 return NULL;
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4454 res = PyString_AS_STRING(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4455 + reslen - rescnt;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4456 --rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4457 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4458 res++ = fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4459 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4460 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4461 /* Got a format specifier */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4462 int flags = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4463 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	4464 int prec = -1;
1408 18df674539da Three micro fixes to formatstring Guido van Rossum <guido@python.org> parents: 1380 diff changeset	4465 int c = '\0';
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4466 int fill;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4467 PyObject *v = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4468 PyObject *temp = NULL;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4469 char *pbuf;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4470 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	4471 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	4472 char formatbuf[FORMATBUFLEN];
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4473 /* For format{float,int,char}() */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4474 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4475 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	4476 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	4477 #endif
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	4478
4588 4dc67fdd9e0b Make gcc -Wall happy Guido van Rossum <guido@python.org> parents: 4503 diff changeset	4479 fmt++;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4480 if (*fmt == '(') {
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4481 char *keystart;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4482 Py_ssize_t keylen;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4483 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	4484 int pcount = 1;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4485
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4486 if (dict == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4487 PyErr_SetString(PyExc_TypeError,
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	4488 "format requires a mapping");
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4489 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4490 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4491 ++fmt;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4492 --fmtcnt;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4493 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	4494 /* 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	4495 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	4496 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	4497 --pcount;
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4498 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	4499 ++pcount;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4500 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	4501 }
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	4502 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	4503 if (fmtcnt < 0 \|\| pcount > 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4504 PyErr_SetString(PyExc_ValueError,
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4505 "incomplete format key");
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4506 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4507 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4508 key = PyString_FromStringAndSize(keystart,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4509 keylen);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4510 if (key == NULL)
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4511 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	4512 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4513 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	4514 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	4515 }
977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	4516 args = PyObject_GetItem(dict, key);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4517 Py_DECREF(key);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4518 if (args == NULL) {
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4519 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4520 }
3570 977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	4521 args_owned = 1;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4522 arglen = -1;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4523 argidx = -2;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4524 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4525 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4526 switch (c = *fmt++) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4527 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	4528 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	4529 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	4530 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	4531 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	4532 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4533 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4534 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4535 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4536 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	4537 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4538 goto error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4539 if (!PyInt_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4540 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4541 "* wants int");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4542 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4543 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4544 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	4545 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	4546 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	4547 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	4548 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4549 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4550 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4551 }
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	4552 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	4553 width = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4554 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	4555 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	4556 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4557 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4558 if ((width*10) / 10 != width) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4559 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4560 PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4561 "width too big");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4562 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4563 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4564 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	4565 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4566 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4567 if (c == '.') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4568 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4569 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4570 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4571 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4572 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	4573 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4574 goto error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4575 if (!PyInt_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4576 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4577 PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4578 "* wants int");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4579 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4580 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4581 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	4582 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4583 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4584 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4585 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4586 }
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	4587 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	4588 prec = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4589 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	4590 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	4591 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4592 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4593 if ((prec*10) / 10 != prec) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4594 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4595 PyExc_ValueError,
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4596 "prec too big");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4597 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4598 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4599 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	4600 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4601 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4602 } /* prec */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4603 if (fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4604 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	4605 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4606 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4607 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4608 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4609 if (fmtcnt < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4610 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4611 "incomplete format");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4612 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4613 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4614 if (c != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4615 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	4616 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4617 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4618 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4619 sign = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4620 fill = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4621 switch (c) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4622 case '%':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4623 pbuf = "%";
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4624 len = 1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4625 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4626 case 's':
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4627 #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	4628 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	4629 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	4630 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	4631 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	4632 }
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	4633 #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	4634 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	4635 #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	4636 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	4637 Py_DECREF(temp);
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4638 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	4639 argidx = argidx_start;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4640 goto unicode;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4641 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4642 #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	4643 /* Fall through */
29529 f48bb94f3289 Fix whitespace. Walter Dörwald <walter@livinglogic.de> parents: 28575 diff changeset	4644 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	4645 if (c == 'r')
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	4646 temp = PyObject_Repr(v);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4647 if (temp == NULL)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4648 goto error;
8468 c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	4649 if (!PyString_Check(temp)) {
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	4650 PyErr_SetString(PyExc_TypeError,
25683 38843d35b646 Undo this part of the previous checkin: Guido van Rossum <guido@python.org> parents: 25682 diff changeset	4651 "%s argument has non-string str()");
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4652 Py_DECREF(temp);
8468 c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	4653 goto error;
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	4654 }
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4655 pbuf = PyString_AS_STRING(temp);
19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4656 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	4657 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	4658 len = prec;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4659 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4660 case 'i':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4661 case 'd':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4662 case 'u':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4663 case 'o':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4664 case 'x':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4665 case 'X':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4666 if (c == 'i')
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4667 c = 'd';
15455 d0146d128897 Fox for SF bug #123859: %[duxXo] long formats inconsistent. Tim Peters <tim.peters@gmail.com> parents: 15435 diff changeset	4668 if (PyLong_Check(v)) {
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4669 int ilen;
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	4670 temp = _PyString_FormatLong(v, flags,
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4671 prec, c, &pbuf, &ilen);
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	4672 len = ilen;
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	4673 if (!temp)
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	4674 goto 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	4675 sign = 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	4676 }
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	4677 else {
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	4678 pbuf = formatbuf;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4679 len = formatint(pbuf,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4680 sizeof(formatbuf),
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	4681 flags, prec, c, v);
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	4682 if (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	4683 goto error;
31042 9c846c3df6f3 - Removed FutureWarnings related to hex/oct literals and conversions Guido van Rossum <guido@python.org> parents: 31021 diff changeset	4684 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	4685 }
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	4686 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	4687 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4688 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4689 case 'e':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4690 case 'E':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4691 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	4692 case 'F':
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4693 case 'g':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4694 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	4695 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	4696 c = 'f';
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4697 pbuf = formatbuf;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	4698 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	4699 flags, prec, c, v);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	4700 if (len < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4701 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4702 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	4703 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	4704 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4705 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4706 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	4707 #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	4708 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	4709 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	4710 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	4711 goto unicode;
8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4712 }
8802de0da533 Fix PyString_Format() so that '%c' % u'a' returns u'a' Walter Dörwald <walter@livinglogic.de> parents: 27521 diff changeset	4713 #endif
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4714 pbuf = formatbuf;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4715 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	4716 if (len < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4717 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4718 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4719 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	4720 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	4721 "unsupported format character '%c' (0x%x) "
31d78f361530 [ Patch #102852 ] Make % error a bit more informative by indicates the Andrew M. Kuchling <amk@amk.ca> parents: 15484 diff changeset	4722 "at index %i",
25233 8d751b62ecc4 Fix warnings on 64-bit platforms about casts from pointers to ints. Guido van Rossum <guido@python.org> parents: 25173 diff changeset	4723 c, c,
8d751b62ecc4 Fix warnings on 64-bit platforms about casts from pointers to ints. Guido van Rossum <guido@python.org> parents: 25173 diff changeset	4724 (int)(fmt - 1 - PyString_AsString(format)));
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4725 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4726 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4727 if (sign) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4728 if (pbuf == '-' \|\| pbuf == '+') {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	4729 sign = *pbuf++;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4730 len--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4731 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4732 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	4733 sign = '+';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4734 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	4735 sign = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4736 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	4737 sign = 0;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4738 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4739 if (width < len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4740 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	4741 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	4742 reslen -= rescnt;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	4743 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	4744 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	4745 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	4746 Py_DECREF(result);
f532e9b69551 Fix a nasty endcase reported by Armin Rigo in SF bug 618623: Guido van Rossum <guido@python.org> parents: 25683 diff changeset	4747 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	4748 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4749 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	4750 return NULL;
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	4751 res = PyString_AS_STRING(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4752 + reslen - rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4753 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4754 if (sign) {
1409 f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	4755 if (fill != ' ')
f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	4756 *res++ = sign;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4757 rescnt--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4758 if (width > len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4759 width--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4760 }
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	4761 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	4762 assert(pbuf[0] == '0');
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4763 assert(pbuf[1] == c);
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4764 if (fill != ' ') {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4765 res++ = pbuf++;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4766 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	4767 }
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4768 rescnt -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4769 width -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4770 if (width < 0)
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4771 width = 0;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4772 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	4773 }
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	4774 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	4775 do {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4776 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4777 *res++ = fill;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4778 } while (--width > len);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4779 }
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	4780 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	4781 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	4782 *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	4783 if ((flags & F_ALT) &&
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4784 (c == 'x' \|\| c == 'X')) {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4785 assert(pbuf[0] == '0');
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	4786 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	4787 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	4788 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	4789 }
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	4790 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	4791 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	4792 res += len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4793 rescnt -= len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4794 while (--width >= len) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4795 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4796 *res++ = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4797 }
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	4798 if (dict && (argidx < arglen) && c != '%') {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4799 PyErr_SetString(PyExc_TypeError,
23494 76f376bea5e5 Patch 549187. Improve string formatting error message. Raymond Hettinger <python@rcn.com> parents: 23430 diff changeset	4800 "not all arguments converted during string formatting");
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4801 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	4802 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4803 Py_XDECREF(temp);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4804 } /* '%' */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4805 } /* 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	4806 if (argidx < arglen && !dict) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4807 PyErr_SetString(PyExc_TypeError,
23494 76f376bea5e5 Patch 549187. Improve string formatting error message. Raymond Hettinger <python@rcn.com> parents: 23430 diff changeset	4808 "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	4809 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4810 }
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	4811 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4812 Py_DECREF(args);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	4813 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4814 _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	4815 return result;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4816
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4817 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4818 unicode:
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4819 if (args_owned) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4820 Py_DECREF(args);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4821 args_owned = 0;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4822 }
17655 0470babdae49 Fix for bug #417030: "print '%s' fails for unicode string" Marc-André Lemburg <mal@egenix.com>* parents: 17645 diff changeset	4823 /* Fiddle args right (remove the first argidx arguments) */
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4824 if (PyTuple_Check(orig_args) && argidx > 0) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4825 PyObject *v;
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36510 diff changeset	4826 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	4827 v = PyTuple_New(n);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4828 if (v == NULL)
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4829 goto error;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4830 while (--n >= 0) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4831 PyObject *w = PyTuple_GET_ITEM(orig_args, n + argidx);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4832 Py_INCREF(w);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4833 PyTuple_SET_ITEM(v, n, w);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4834 }
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4835 args = v;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4836 } else {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4837 Py_INCREF(orig_args);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4838 args = orig_args;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4839 }
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	4840 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	4841 /* 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	4842 function format the rest of the input. */
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4843 rescnt = res - PyString_AS_STRING(result);
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	4844 if (_PyString_Resize(&result, rescnt))
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	4845 goto error;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4846 fmtcnt = PyString_GET_SIZE(format) - \
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4847 (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	4848 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	4849 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	4850 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	4851 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	4852 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	4853 if (v == NULL)
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4854 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	4855 /* 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	4856 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	4857 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	4858 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	4859 Py_DECREF(v);
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	4860 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	4861 return w;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	4862 #endif /* Py_USING_UNICODE */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	4863
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4864 error:
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4865 Py_DECREF(result);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	4866 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4867 Py_DECREF(args);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	4868 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4869 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	4870 }
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4871
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4872 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4873 PyString_InternInPlace(PyObject **p)
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4874 {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4875 register PyStringObject s = (PyStringObject )(*p);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4876 PyObject *t;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4877 if (s == NULL \|\| !PyString_Check(s))
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4878 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	4879 /* 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	4880 it in the interned dict might do. */
5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	4881 if (!PyString_CheckExact(s))
5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	4882 return;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4883 if (PyString_CHECK_INTERNED(s))
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4884 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4885 if (interned == NULL) {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4886 interned = PyDict_New();
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4887 if (interned == NULL) {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4888 PyErr_Clear(); /* Don't leave an exception */
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4889 return;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4890 }
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4891 }
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	4892 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	4893 if (t) {
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4894 Py_INCREF(t);
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4895 Py_DECREF(*p);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4896 *p = t;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4897 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4898 }
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	4899
33023 4f588f57a93b Fixed some compiler warnings. Armin Rigo <arigo@tunes.org> parents: 33019 diff changeset	4900 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	4901 PyErr_Clear();
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4902 return;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4903 }
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	4904 /* 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	4905 The string deallocator will take care of this */
33023 4f588f57a93b Fixed some compiler warnings. Armin Rigo <arigo@tunes.org> parents: 33019 diff changeset	4906 s->ob_refcnt -= 2;
33019 5218bff56449 Subclasses of string can no longer be interned. The semantics of Jeremy Hylton <jeremy@alum.mit.edu> parents: 32552 diff changeset	4907 PyString_CHECK_INTERNED(s) = SSTATE_INTERNED_MORTAL;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4908 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4909
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4910 void
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4911 PyString_InternImmortal(PyObject **p)
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4912 {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4913 PyString_InternInPlace(p);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4914 if (PyString_CHECK_INTERNED(*p) != SSTATE_INTERNED_IMMORTAL) {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4915 PyString_CHECK_INTERNED(*p) = SSTATE_INTERNED_IMMORTAL;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4916 Py_INCREF(*p);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4917 }
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4918 }
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4919
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4920
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4921 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4922 PyString_InternFromString(const char *cp)
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4923 {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4924 PyObject *s = PyString_FromString(cp);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4925 if (s == NULL)
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4926 return NULL;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4927 PyString_InternInPlace(&s);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4928 return s;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4929 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	4930
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4931 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	4932 PyString_Fini(void)
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4933 {
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4934 int i;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4935 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	4936 Py_XDECREF(characters[i]);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4937 characters[i] = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4938 }
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4939 Py_XDECREF(nullstring);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4940 nullstring = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	4941 }
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	4942
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	4943 void _Py_ReleaseInternedStrings(void)
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	4944 {
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4945 PyObject *keys;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4946 PyStringObject *s;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	4947 Py_ssize_t i, n;
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4948
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4949 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	4950 return;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4951 keys = PyDict_Keys(interned);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4952 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	4953 PyErr_Clear();
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4954 return;
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	4955 }
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4956
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4957 /* 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	4958 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	4959 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	4960 the interned dict. */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	4961
24901 bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4962 fprintf(stderr, "releasing interned strings\n");
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4963 n = PyList_GET_SIZE(keys);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4964 for (i = 0; i < n; i++) {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4965 s = (PyStringObject *) PyList_GET_ITEM(keys, i);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4966 switch (s->ob_sstate) {
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4967 case SSTATE_NOT_INTERNED:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4968 /* XXX Shouldn't happen */
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4969 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4970 case SSTATE_INTERNED_IMMORTAL:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4971 s->ob_refcnt += 1;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4972 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4973 case SSTATE_INTERNED_MORTAL:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4974 s->ob_refcnt += 2;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4975 break;
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4976 default:
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4977 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	4978 }
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4979 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	4980 }
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4981 Py_DECREF(keys);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4982 PyDict_Clear(interned);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4983 Py_DECREF(interned);
bc660f73795c SF patch 576101, by Oren Tirosh: alternative implementation of Guido van Rossum <guido@python.org> parents: 24898 diff changeset	4984 interned = NULL;
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	4985 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/stringobject.c @ 39222:b0cdcbcc5f45