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

annotate Objects/stringobject.c @ 24042:63fbbed10714 legacy-trunk

Simplify HTTPSConnection constructor. See discussion in SF bug 458463.

author	Jeremy Hylton <jeremy@alum.mit.edu>
date	Fri, 28 Jun 2002 23:38:14 +0000
parents	854583cd63c7
children	c4dcb80f48ea

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
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3 #include "Python.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	5 #include <ctype.h>
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	6
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	7 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	8 int null_strings, one_strings;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	9 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	10
14869 25ddd3dc7a7a Rationalize use of limits.h, moving the inclusion to Python.h. Fred Drake <fdrake@acm.org> parents: 14713 diff changeset	11 #if !defined(HAVE_LIMITS_H) && !defined(UCHAR_MAX)
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	12 #define UCHAR_MAX 255
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	13 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	14
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	15 static PyStringObject *characters[UCHAR_MAX + 1];
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	16 static PyStringObject *nullstring;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	17
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	18 /*
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	19 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	20 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	21 null terminating character.
30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	22
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	23 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	24 string containing exactly `size' bytes.
30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	25
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	26 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	27 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	28 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	29 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	30 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	31 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	32 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	33 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	34 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	35 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	36
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	37 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	38 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	39 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	40 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	41 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	42 parameter (for PyString_FromString()).
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	43 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	44 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	45 PyString_FromStringAndSize(const char *str, int size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	46 {
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	47 register PyStringObject *op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	48 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	49 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	50 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	51 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	52 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	53 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	54 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	55 if (size == 1 && str != NULL &&
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	56 (op = characters[*str & UCHAR_MAX]) != NULL)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	57 {
1356 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 one_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 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	64
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	65 /* PyObject_NewVar is inlined */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	66 op = (PyStringObject *)
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	67 PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	68 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	69 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	70 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	71 op->ob_shash = -1;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	72 op->ob_sinterned = NULL;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	73 if (str != NULL)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	74 memcpy(op->ob_sval, str, size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	75 op->ob_sval[size] = '\0';
22689 614167df2096 Eliminate DONT_SHARE_SHORT_STRINGS. Tim Peters <tim.peters@gmail.com> parents: 22651 diff changeset	76 /* share short strings */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	77 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	78 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	79 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	80 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	81 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	82 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	83 } 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	84 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	85 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	86 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	87 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	88 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	89 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	90 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	91 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	92
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	93 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	94 PyString_FromString(const char *str)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	95 {
21263 2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	96 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	97 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	98
2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	99 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	100 size = strlen(str);
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	101 if (size > INT_MAX) {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	102 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	103 "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	104 return NULL;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	105 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	106 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	107 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	108 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	109 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	110 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	111 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	112 }
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	113 if (size == 1 && (op = characters[*str & UCHAR_MAX]) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	114 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	115 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	116 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	117 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	118 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	119 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	120
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	121 /* PyObject_NewVar is inlined */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	122 op = (PyStringObject *)
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	123 PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	124 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	125 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	126 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	127 op->ob_shash = -1;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	128 op->ob_sinterned = NULL;
21327 34a1a50e6ab6 SF patch #491049 (David Jacobs): Small PyString_FromString optimization Guido van Rossum <guido@python.org> parents: 21263 diff changeset	129 memcpy(op->ob_sval, str, size+1);
22689 614167df2096 Eliminate DONT_SHARE_SHORT_STRINGS. Tim Peters <tim.peters@gmail.com> parents: 22651 diff changeset	130 /* share short strings */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	131 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	132 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	133 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	134 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	135 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	136 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	137 } 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	138 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	139 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	140 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	141 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	142 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	143 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	144 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	145 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	146
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	147 PyObject *
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	148 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	149 {
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	150 va_list count;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	151 int n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	152 const char* f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	153 char *s;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	154 PyObject* string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	155
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	156 #ifdef VA_LIST_IS_ARRAY
abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	157 memcpy(count, vargs, sizeof(va_list));
abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	158 #else
abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	159 count = vargs;
abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	160 #endif
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	161 /* 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	162 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	163 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	164 const char* p = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	165 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	166 ;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	167
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	168 /* skip the 'l' in %ld, since it doesn't change the
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	169 width. although only %d is supported (see
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	170 "expand" section below), others can be easily
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	171 added */
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	172 if (f == 'l' && (f+1) == 'd')
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	173 ++f;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	174
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	175 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	176 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	177 (void)va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	178 /* fall through... */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	179 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	180 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	181 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	182 case 'd': case 'i': case 'x':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	183 (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	184 /* 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	185 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	186 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	187 n += 20;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	188 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	189 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	190 s = va_arg(count, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	191 n += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	192 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	193 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	194 (void) va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	195 /* maximum 64-bit pointer representation:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	196 * 0xffffffffffffffff
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	197 * 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	198 * 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	199 */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	200 n += 19;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	201 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	202 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	203 /* if we stumble upon an unknown
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	204 formatting code, copy the rest of
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	205 the format string to the output
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	206 string. (we cannot just skip the
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	207 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	208 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	209 n += strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	210 goto expand;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	211 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	212 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	213 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	214 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	215 expand:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	216 /* 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	217 /* 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	218 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	219 string = PyString_FromStringAndSize(NULL, n);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	220 if (!string)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	221 return NULL;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	222
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	223 s = PyString_AsString(string);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	224
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	225 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	226 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	227 const char* p = f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	228 int i, longflag = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	229 /* 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	230 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	231 n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	232 while (isdigit(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	233 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	234 if (*f == '.') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	235 f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	236 n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	237 while (isdigit(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	238 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	239 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	240 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	241 f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	242 /* handle the long flag, but only for %ld. others
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	243 can be added when necessary. */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	244 if (f == 'l' && (f+1) == 'd') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	245 longflag = 1;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	246 ++f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	247 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	248
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	249 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	250 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	251 *s++ = va_arg(vargs, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	252 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	253 case 'd':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	254 if (longflag)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	255 sprintf(s, "%ld", va_arg(vargs, long));
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	256 else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	257 sprintf(s, "%d", va_arg(vargs, int));
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	258 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	259 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	260 case 'i':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	261 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	262 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	263 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	264 case 'x':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	265 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	266 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	267 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	268 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	269 p = va_arg(vargs, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	270 i = strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	271 if (n > 0 && i > n)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	272 i = n;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	273 memcpy(s, p, i);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	274 s += i;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	275 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	276 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	277 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	278 /* %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	279 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	280 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	281 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	282 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	283 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	284 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	285 }
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	286 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	287 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	288 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	289 *s++ = '%';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	290 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	291 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	292 strcpy(s, p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	293 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	294 goto end;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	295 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	296 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	297 s++ = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	298 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	299
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	300 end:
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	301 _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	302 return string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	303 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	304
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	305 PyObject *
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	306 PyString_FromFormat(const char *format, ...)
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	307 {
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	308 PyObject* ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	309 va_list vargs;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	310
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	311 #ifdef HAVE_STDARG_PROTOTYPES
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	312 va_start(vargs, format);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	313 #else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	314 va_start(vargs);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	315 #endif
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	316 ret = PyString_FromFormatV(format, vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	317 va_end(vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	318 return ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	319 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	320
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	321
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	322 PyObject PyString_Decode(const char s,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	323 int size,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	324 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	325 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	326 {
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	327 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	328
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	329 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	330 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	331 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	332 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	333 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	334 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	335 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	336
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	337 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	338 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	339 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	340 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	341 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	342
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	343 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	344 PyErr_BadArgument();
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	345 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	346 }
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	347
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	348 if (encoding == NULL) {
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	349 #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	350 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	351 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	352 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	353 goto onError;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	354 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	355 }
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	356
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	357 /* 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	358 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	359 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	360 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	361
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	362 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	363
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	364 onError:
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	365 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	366 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	367
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	368 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	369 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	370 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	371 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	372 PyObject *v;
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 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	375 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	376 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	377
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	378 #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	379 /* 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	380 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	381 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	382 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	383 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	384 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	385 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	386 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	387 #endif
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	388 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	389 PyErr_Format(PyExc_TypeError,
13561 ea732719b3fd Fix typo in error message Andrew M. Kuchling <amk@amk.ca> parents: 13544 diff changeset	390 "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	391 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	392 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	393 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	394 }
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	395
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	396 return v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	397
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	398 onError:
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	399 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	400 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	401
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	402 PyObject PyString_Encode(const char s,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	403 int size,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	404 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	405 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	406 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	407 PyObject v, str;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	408
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	409 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	410 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	411 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	412 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	413 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	414 return v;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	415 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	416
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	417 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	418 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	419 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	420 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	421 PyObject *v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	422
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	423 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	424 PyErr_BadArgument();
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	425 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	426 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	427
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	428 if (encoding == NULL) {
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	429 #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	430 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	431 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	432 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	433 goto onError;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	434 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	435 }
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	436
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	437 /* 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	438 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	439 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	440 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	441
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	442 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	443
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	444 onError:
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	445 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	446 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	447
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	448 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	449 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	450 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	451 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	452 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	453
18086 592109f2a6fd Fix for bug #432384: Recursion in PyString_AsEncodedString? Marc-André Lemburg <mal@egenix.com> parents: 17964 diff changeset	454 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	455 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	456 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	457
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	458 #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	459 /* 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	460 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	461 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	462 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	463 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	464 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	465 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	466 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	467 #endif
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	468 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	469 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	470 "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	471 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	472 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	473 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	474 }
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	475
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	476 return v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	477
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	478 onError:
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	479 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	480 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	481
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1282 diff changeset	482 static void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	483 string_dealloc(PyObject *op)
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	484 {
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 20221 diff changeset	485 op->ob_type->tp_free(op);
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	486 }
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	487
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	488 static int
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	489 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	490 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	491 char *s;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	492 int len;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	493 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	494 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	495 return len;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	496 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	497
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	498 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	499 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	500 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	501 char *s;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	502 int len;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	503 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	504 return NULL;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	505 return s;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	506 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	507
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1908 diff changeset	508 int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	509 PyString_Size(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	510 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	511 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	512 return string_getsize(op);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	513 return ((PyStringObject *)op) -> ob_size;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	514 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	515
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	516 /const/ char *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	517 PyString_AsString(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	518 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	519 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	520 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	521 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	522 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	523
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	524 int
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	525 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	526 register char **s,
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	527 register int *len)
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	528 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	529 if (s == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	530 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	531 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	532 }
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	533
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	534 if (!PyString_Check(obj)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	535 #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	536 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	537 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	538 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	539 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	540 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	541 else
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	542 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	543 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	544 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	545 "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	546 "%.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	547 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	548 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	549 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	550
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	551 *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	552 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	553 *len = PyString_GET_SIZE(obj);
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	554 else if ((int)strlen(*s) != PyString_GET_SIZE(obj)) {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	555 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	556 "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	557 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	558 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	559 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	560 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	561
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	562 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	563
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	564 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	565 string_print(PyStringObject op, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	566 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	567 int i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	568 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	569 int quote;
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	570
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	571 /* 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	572 if (! PyString_CheckExact(op)) {
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	573 int ret;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	574 /* 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	575 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	576 if (op == NULL)
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	577 return -1;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	578 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	579 Py_DECREF(op);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	580 return ret;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	581 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	582 if (flags & Py_PRINT_RAW) {
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	583 fwrite(op->ob_sval, 1, (int) op->ob_size, fp);
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	584 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	585 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	586
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	587 /* 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	588 quote = '\'';
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	589 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	590 !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	591 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	592
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	593 fputc(quote, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	594 for (i = 0; i < op->ob_size; i++) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	595 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	596 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	597 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	598 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	599 fprintf(fp, "\\t");
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	600 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	601 fprintf(fp, "\\n");
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	602 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	603 fprintf(fp, "\\r");
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	604 else if (c < ' ' \|\| c >= 0x7f)
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	605 fprintf(fp, "\\x%02x", c & 0xff);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	606 else
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	607 fputc(c, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	608 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	609 fputc(quote, fp);
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	610 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	611 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	612
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	613 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	614 string_repr(register PyStringObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	615 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	616 size_t newsize = 2 + 4 * op->ob_size * sizeof(char);
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	617 PyObject *v;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	618 if (newsize > INT_MAX) {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	619 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	620 "string is too large to make repr");
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	621 }
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	622 v = PyString_FromStringAndSize((char *)NULL, newsize);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	623 if (v == NULL) {
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	624 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	625 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	626 else {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	627 register int i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	628 register char c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	629 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	630 int quote;
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	631
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	632 /* 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	633 quote = '\'';
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	634 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	635 !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	636 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	637
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	638 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	639 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	640 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	641 /* 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	642 and a closing quote. */
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	643 assert(newsize - (p - PyString_AS_STRING(v)) >= 5);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	644 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	645 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	646 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	647 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	648 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	649 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	650 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	651 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	652 p++ = '\\', p++ = 'r';
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	653 else if (c < ' ' \|\| c >= 0x7f) {
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	654 /* For performance, we don't want to call
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	655 PyOS_snprintf here (extra layers of
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	656 function call). */
16226 c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	657 sprintf(p, "\\x%02x", c & 0xff);
c7c404b35f33 Show '\011', '\012', and '\015' as '\t', '\n', '\r' in strings. Ka-Ping Yee <ping@zesty.ca> parents: 16014 diff changeset	658 p += 4;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	659 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	660 else
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	661 *p++ = c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	662 }
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	663 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	664 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	665 *p = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	666 _PyString_Resize(
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	667 &v, (int) (p - PyString_AS_STRING(v)));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	668 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	669 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	670 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	671
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	672 static PyObject *
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	673 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	674 {
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	675 assert(PyString_Check(s));
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	676 if (PyString_CheckExact(s)) {
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	677 Py_INCREF(s);
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	678 return s;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	679 }
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	680 else {
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	681 /* 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	682 PyStringObject t = (PyStringObject ) s;
98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	683 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	684 }
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	685 }
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	686
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	687 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	688 string_length(PyStringObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	689 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	690 return a->ob_size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	691 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	692
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	693 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	694 string_concat(register PyStringObject a, register PyObject bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	695 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	696 register unsigned int size;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	697 register PyStringObject *op;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	698 if (!PyString_Check(bb)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	699 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	700 if (PyUnicode_Check(bb))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	701 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	702 #endif
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	703 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	704 "cannot concatenate 'str' and '%.200s' objects",
12816 4272b368bf69 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12615 diff changeset	705 bb->ob_type->tp_name);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	706 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	707 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	708 #define b ((PyStringObject *)bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	709 /* 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	710 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	711 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	712 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	713 Py_INCREF(bb);
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	714 return bb;
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	715 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	716 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	717 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	718 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	719 size = a->ob_size + b->ob_size;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	720 /* PyObject_NewVar is inlined */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	721 op = (PyStringObject *)
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	722 PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	723 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	724 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	725 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	726 op->ob_shash = -1;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	727 op->ob_sinterned = NULL;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	728 memcpy(op->ob_sval, a->ob_sval, (int) a->ob_size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	729 memcpy(op->ob_sval + a->ob_size, b->ob_sval, (int) b->ob_size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	730 op->ob_sval[size] = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	731 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	732 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	733 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	734
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	735 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	736 string_repeat(register PyStringObject *a, register int n)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	737 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	738 register int i;
5288 0f1711b7d367 Tweaks to keep the Microsoft compiler quiet. Guido van Rossum <guido@python.org> parents: 5098 diff changeset	739 register int size;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	740 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	741 size_t nbytes;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	742 if (n < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	743 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	744 /* 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	745 * 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	746 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	747 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	748 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	749 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	750 "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	751 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	752 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	753 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	754 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	755 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	756 }
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	757 nbytes = size * sizeof(char);
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	758 if (nbytes / sizeof(char) != (size_t)size \|\|
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	759 nbytes + sizeof(PyStringObject) <= nbytes) {
7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	760 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	761 "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	762 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	763 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	764 op = (PyStringObject *)
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	765 PyObject_MALLOC(sizeof(PyStringObject) + nbytes);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	766 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	767 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	768 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	769 op->ob_shash = -1;
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	770 op->ob_sinterned = NULL;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	771 for (i = 0; i < size; i += a->ob_size)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	772 memcpy(op->ob_sval+i, a->ob_sval, (int) a->ob_size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	773 op->ob_sval[size] = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	774 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	775 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	776
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	777 /* 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	778
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	779 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	780 string_slice(register PyStringObject *a, register int i, register int j)
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	781 /* j -- may be negative! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	782 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	783 if (i < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	784 i = 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	785 if (j < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	786 j = 0; /* Avoid signed/unsigned bug in next line */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	787 if (j > a->ob_size)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	788 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	789 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	790 /* It's the same as a */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	791 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	792 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	793 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	794 if (j < i)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	795 j = i;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	796 return PyString_FromStringAndSize(a->ob_sval + i, (int) (j-i));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	797 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	798
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	799 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	800 string_contains(PyObject a, PyObject el)
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	801 {
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	802 register char s, end;
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	803 register char c;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	804 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	805 if (PyUnicode_Check(el))
11998 f94d10b6d0f4 Fix typo in replace() detected by Mark Hammond and fixed by Marc-Andre. Guido van Rossum <guido@python.org> parents: 11969 diff changeset	806 return PyUnicode_Contains(a, el);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	807 #endif
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	808 if (!PyString_Check(el) \|\| PyString_Size(el) != 1) {
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	809 PyErr_SetString(PyExc_TypeError,
12902 98eb3059ae76 Patch from Michael Hudson: improve unclear error message Andrew M. Kuchling <amk@amk.ca> parents: 12816 diff changeset	810 "'in <string>' requires character as left operand");
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	811 return -1;
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	812 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	813 c = PyString_AsString(el)[0];
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	814 s = PyString_AsString(a);
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	815 end = s + PyString_Size(a);
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	816 while (s < end) {
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	817 if (c == *s++)
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	818 return 1;
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	819 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	820 return 0;
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	821 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	822
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	823 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	824 string_item(PyStringObject *a, register int i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	825 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	826 PyObject *v;
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	827 char *pchar;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	828 if (i < 0 \|\| i >= a->ob_size) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	829 PyErr_SetString(PyExc_IndexError, "string index out of range");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	830 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	831 }
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	832 pchar = a->ob_sval + i;
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	833 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	834 if (v == NULL)
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	835 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	836 else {
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	837 #ifdef COUNT_ALLOCS
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	838 one_strings++;
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	839 #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	840 Py_INCREF(v);
17712 2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	841 }
180 a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	842 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	843 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	844
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	845 static PyObject*
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	846 string_richcompare(PyStringObject a, PyStringObject b, int op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	847 {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	848 int c;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	849 int len_a, len_b;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	850 int min_len;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	851 PyObject *result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	852
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20057 diff changeset	853 /* 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	854 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	855 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	856 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	857 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	858 if (a == b) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	859 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	860 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	861 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	862 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	863 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	864 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	865 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	866 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	867 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	868 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	869 /* 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	870 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	871 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	872 && (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	873 && 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	874 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	875 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	876 } else {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	877 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	878 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	879 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	880 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	881 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	882 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	883 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	884 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	885 if (c==0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	886 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	887 }else
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	888 c = 0;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	889 if (c == 0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	890 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	891 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	892 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	893 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	894 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	895 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	896 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	897 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	898 default:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	899 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	900 goto out;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	901 }
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	902 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	903 out:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	904 Py_INCREF(result);
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	905 return result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	906 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	907
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	908 int
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	909 _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	910 {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	911 PyStringObject a, b;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	912 a = (PyStringObject*)o1;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	913 b = (PyStringObject*)o2;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	914 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	915 && 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	916 && memcmp(a->ob_sval, b->ob_sval, a->ob_size) == 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	917 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	918
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	919 static long
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	920 string_hash(PyStringObject *a)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	921 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	922 register int len;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	923 register unsigned char *p;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	924 register long x;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	925
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	926 if (a->ob_shash != -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	927 return a->ob_shash;
5098 a44586bd9fab Slight tweak: in string_hash(), if the hash hasn't been computed yet, Guido van Rossum <guido@python.org> parents: 5057 diff changeset	928 if (a->ob_sinterned != NULL)
a44586bd9fab Slight tweak: in string_hash(), if the hash hasn't been computed yet, Guido van Rossum <guido@python.org> parents: 5057 diff changeset	929 return (a->ob_shash =
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	930 ((PyStringObject *)(a->ob_sinterned))->ob_shash);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	931 len = a->ob_size;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	932 p = (unsigned char *) a->ob_sval;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	933 x = *p << 7;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	934 while (--len >= 0)
4283 839f72610ae1 Multiply by 1000003 instead of 3 in string hach Guido van Rossum <guido@python.org> parents: 3586 diff changeset	935 x = (1000003x) ^ p++;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	936 x ^= a->ob_size;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	937 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	938 x = -2;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	939 a->ob_shash = x;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	940 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	941 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	942
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	943 static PyObject*
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	944 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	945 {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	946 if (PyInt_Check(item)) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	947 long i = PyInt_AS_LONG(item);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	948 if (i < 0)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	949 i += PyString_GET_SIZE(self);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	950 return string_item(self,i);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	951 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	952 else if (PyLong_Check(item)) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	953 long i = PyLong_AsLong(item);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	954 if (i == -1 && PyErr_Occurred())
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	955 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	956 if (i < 0)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	957 i += PyString_GET_SIZE(self);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	958 return string_item(self,i);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	959 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	960 else if (PySlice_Check(item)) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	961 int start, stop, step, slicelength, cur, i;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	962 char* source_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	963 char* result_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	964 PyObject* result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	965
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	966 if (PySlice_GetIndicesEx((PySliceObject*)item,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	967 PyString_GET_SIZE(self),
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	968 &start, &stop, &step, &slicelength) < 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	969 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	970 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	971
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	972 if (slicelength <= 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	973 return PyString_FromStringAndSize("", 0);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	974 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	975 else {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	976 source_buf = PyString_AsString((PyObject*)self);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	977 result_buf = PyMem_Malloc(slicelength);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	978
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	979 for (cur = start, i = 0; i < slicelength;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	980 cur += step, i++) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	981 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	982 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	983
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	984 result = PyString_FromStringAndSize(result_buf,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	985 slicelength);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	986 PyMem_Free(result_buf);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	987 return result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	988 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	989 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	990 else {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	991 PyErr_SetString(PyExc_TypeError,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	992 "string indices must be integers");
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	993 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	994 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	995 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	996
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	997 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	998 string_buffer_getreadbuf(PyStringObject self, int index, const void *ptr)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	999 {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1000 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	1001 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	1002 "accessing non-existent string segment");
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1003 return -1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1004 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1005 ptr = (void )self->ob_sval;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1006 return self->ob_size;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1007 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1008
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1009 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1010 string_buffer_getwritebuf(PyStringObject self, int index, const void *ptr)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1011 {
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	1012 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	1013 "Cannot use string as modifiable buffer");
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1014 return -1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1015 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1016
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1017 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1018 string_buffer_getsegcount(PyStringObject self, int lenp)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1019 {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1020 if ( lenp )
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1021 *lenp = self->ob_size;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1022 return 1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1023 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1024
9305 083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1025 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1026 string_buffer_getcharbuf(PyStringObject self, int 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	1027 {
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1028 if ( index != 0 ) {
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1029 PyErr_SetString(PyExc_SystemError,
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1030 "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	1031 return -1;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1032 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1033 *ptr = self->ob_sval;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1034 return self->ob_size;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1035 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1036
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1037 static PySequenceMethods string_as_sequence = {
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	1038 (inquiry)string_length, /sq_length/
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	1039 (binaryfunc)string_concat, /sq_concat/
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	1040 (intargfunc)string_repeat, /sq_repeat/
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	1041 (intargfunc)string_item, /sq_item/
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	1042 (intintargfunc)string_slice, /sq_slice/
259 6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	1043 0, /sq_ass_item/
6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	1044 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	1045 (objobjproc)string_contains /sq_contains/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1046 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1047
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1048 static PyMappingMethods string_as_mapping = {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1049 (inquiry)string_length,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1050 (binaryfunc)string_subscript,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1051 0,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1052 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	1053
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1054 static PyBufferProcs string_as_buffer = {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1055 (getreadbufferproc)string_buffer_getreadbuf,
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1056 (getwritebufferproc)string_buffer_getwritebuf,
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1057 (getsegcountproc)string_buffer_getsegcount,
9305 083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	1058 (getcharbufferproc)string_buffer_getcharbuf,
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1059 };
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	1060
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1061
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1062
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1063 #define LEFTSTRIP 0
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1064 #define RIGHTSTRIP 1
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1065 #define BOTHSTRIP 2
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1066
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1067 /* Arrays indexed by above */
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1068 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	1069
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1070 #define STRIPNAME(i) (stripformat[i]+3)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1071
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1072
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1073 static PyObject *
13460 e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	1074 split_whitespace(const char *s, int len, int maxsplit)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1075 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1076 int i, j, err;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1077 PyObject* item;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1078 PyObject *list = PyList_New(0);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1079
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1080 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1081 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1082
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1083 for (i = j = 0; i < len; ) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1084 while (i < len && isspace(Py_CHARMASK(s[i])))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1085 i++;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1086 j = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1087 while (i < len && !isspace(Py_CHARMASK(s[i])))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1088 i++;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1089 if (j < i) {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1090 if (maxsplit-- <= 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1091 break;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1092 item = PyString_FromStringAndSize(s+j, (int)(i-j));
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1093 if (item == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1094 goto finally;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1095 err = PyList_Append(list, item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1096 Py_DECREF(item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1097 if (err < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1098 goto finally;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1099 while (i < len && isspace(Py_CHARMASK(s[i])))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1100 i++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1101 j = i;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1102 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1103 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1104 if (j < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1105 item = PyString_FromStringAndSize(s+j, (int)(len - j));
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1106 if (item == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1107 goto finally;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1108 err = PyList_Append(list, item);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1109 Py_DECREF(item);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1110 if (err < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1111 goto finally;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1112 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1113 return list;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1114 finally:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1115 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1116 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1117 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1118
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1119
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1120 PyDoc_STRVAR(split__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1121 "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	1122 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1123 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	1124 delimiter string. If maxsplit is given, at most maxsplit\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1125 splits are done. If sep is not specified, any whitespace string\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1126 is a separator.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1127
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1128 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1129 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	1130 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1131 int len = PyString_GET_SIZE(self), n, i, j, err;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1132 int maxsplit = -1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1133 const char s = PyString_AS_STRING(self), sub;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1134 PyObject list, item, *subobj = Py_None;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1135
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1136 if (!PyArg_ParseTuple(args, "\|Oi:split", &subobj, &maxsplit))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1137 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1138 if (maxsplit < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1139 maxsplit = INT_MAX;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1140 if (subobj == Py_None)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1141 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	1142 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1143 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1144 n = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1145 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1146 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1147 else if (PyUnicode_Check(subobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1148 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	1149 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1150 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	1151 return NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1152 if (n == 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1153 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	1154 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1155 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1156
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1157 list = PyList_New(0);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1158 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1159 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1160
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1161 i = j = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1162 while (i+n <= len) {
12966 447efb64c72d Fredrik Lundh <effbot@telia.com>: Fred Drake <fdrake@acm.org> parents: 12924 diff changeset	1163 if (s[i] == sub[0] && memcmp(s+i, sub, n) == 0) {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1164 if (maxsplit-- <= 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1165 break;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1166 item = PyString_FromStringAndSize(s+j, (int)(i-j));
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1167 if (item == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1168 goto fail;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1169 err = PyList_Append(list, item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1170 Py_DECREF(item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1171 if (err < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1172 goto fail;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1173 i = j = i + n;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1174 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1175 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1176 i++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1177 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1178 item = PyString_FromStringAndSize(s+j, (int)(len-j));
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1179 if (item == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1180 goto fail;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1181 err = PyList_Append(list, item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1182 Py_DECREF(item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1183 if (err < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1184 goto fail;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1185
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1186 return list;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1187
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1188 fail:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1189 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1190 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1191 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1192
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1193
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1194 PyDoc_STRVAR(join__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1195 "S.join(sequence) -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1196 \n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1197 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	1198 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	1199
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1200 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	1201 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	1202 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1203 char *sep = PyString_AS_STRING(self);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1204 const int 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	1205 PyObject *res = NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1206 char *p;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1207 int seqlen = 0;
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1208 size_t sz = 0;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1209 int 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	1210 PyObject seq, item;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1211
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1212 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	1213 if (seq == NULL) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1214 if (PyErr_ExceptionMatches(PyExc_TypeError))
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1215 PyErr_Format(PyExc_TypeError,
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1216 "sequence expected, %.80s found",
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1217 orig->ob_type->tp_name);
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1218 return NULL;
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1219 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1220
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13561 diff changeset	1221 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	1222 if (seqlen == 0) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1223 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1224 return PyString_FromString("");
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1225 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1226 if (seqlen == 1) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1227 item = PySequence_Fast_GET_ITEM(seq, 0);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1228 if (!PyString_Check(item) && !PyUnicode_Check(item)) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1229 PyErr_Format(PyExc_TypeError,
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1230 "sequence item 0: expected string,"
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1231 " %.80s found",
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1232 item->ob_type->tp_name);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1233 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1234 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1235 }
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1236 Py_INCREF(item);
13528 e848d6ed3eb9 string_join(): Some cleaning up of reference counting. In the Barry Warsaw <barry@python.org> parents: 13526 diff changeset	1237 Py_DECREF(seq);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1238 return item;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1239 }
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1240
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1241 /* There are at least two things to join. Do a pre-pass to figure out
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1242 * the total amount of space we'll need (sz), see whether any argument
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1243 * is absurd, and defer to the Unicode join if appropriate.
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1244 */
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1245 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	1246 const size_t old_sz = sz;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1247 item = PySequence_Fast_GET_ITEM(seq, i);
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1248 if (!PyString_Check(item)){
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1249 #ifdef Py_USING_UNICODE
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1250 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	1251 /* 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	1252 * 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	1253 * 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	1254 * 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	1255 */
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1256 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	1257 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	1258 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	1259 return result;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1260 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1261 #endif
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1262 PyErr_Format(PyExc_TypeError,
13544 3cf4f5aee00e small updates to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13528 diff changeset	1263 "sequence item %i: expected string,"
3cf4f5aee00e small updates to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13528 diff changeset	1264 " %.80s found",
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1265 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	1266 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1267 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1268 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1269 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	1270 if (i != 0)
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1271 sz += seplen;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1272 if (sz < old_sz \|\| sz > INT_MAX) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1273 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	1274 "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	1275 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1276 return NULL;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1277 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1278 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1279
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1280 /* Allocate result space. */
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1281 res = PyString_FromStringAndSize((char*)NULL, (int)sz);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1282 if (res == NULL) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1283 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1284 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1285 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1286
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1287 /* Catenate everything. */
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1288 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	1289 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	1290 size_t n;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1291 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	1292 n = 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	1293 memcpy(p, PyString_AS_STRING(item), n);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1294 p += n;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1295 if (i < seqlen - 1) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1296 memcpy(p, sep, seplen);
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1297 p += seplen;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1298 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1299 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1300
13526 3686d12362b8 fix two refcount bugs in new string_join implementation: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13524 diff changeset	1301 Py_DECREF(seq);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1302 return res;
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
18130 8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1305 PyObject *
8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1306 _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	1307 {
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1308 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	1309 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	1310 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	1311 }
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1312
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1313 static void
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1314 string_adjust_indices(int start, int end, int len)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1315 {
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1316 if (*end > len)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1317 *end = len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1318 else if (*end < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1319 *end += len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1320 if (*end < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1321 *end = 0;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1322 if (*start < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1323 *start += len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1324 if (*start < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1325 *start = 0;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1326 }
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1327
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1328 static long
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1329 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	1330 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1331 const char s = PyString_AS_STRING(self), sub;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1332 int len = PyString_GET_SIZE(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1333 int n, i = 0, last = INT_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1334 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1335
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1336 if (!PyArg_ParseTuple(args, "O\|O&O&:find/rfind/index/rindex",
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	1337 &subobj, _PyEval_SliceIndex, &i, _PyEval_SliceIndex, &last))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1338 return -2;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1339 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1340 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1341 n = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1342 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1343 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1344 else if (PyUnicode_Check(subobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1345 return PyUnicode_Find((PyObject *)self, subobj, i, last, 1);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1346 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1347 else if (PyObject_AsCharBuffer(subobj, &sub, &n))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1348 return -2;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1349
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1350 string_adjust_indices(&i, &last, len);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1351
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1352 if (dir > 0) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1353 if (n == 0 && i <= last)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1354 return (long)i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1355 last -= n;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1356 for (; i <= last; ++i)
12966 447efb64c72d Fredrik Lundh <effbot@telia.com>: Fred Drake <fdrake@acm.org> parents: 12924 diff changeset	1357 if (s[i] == sub[0] && memcmp(&s[i], sub, n) == 0)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1358 return (long)i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1359 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1360 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1361 int j;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1362
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1363 if (n == 0 && i <= last)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1364 return (long)last;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1365 for (j = last-n; j >= i; --j)
12966 447efb64c72d Fredrik Lundh <effbot@telia.com>: Fred Drake <fdrake@acm.org> parents: 12924 diff changeset	1366 if (s[j] == sub[0] && memcmp(&s[j], sub, n) == 0)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1367 return (long)j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1368 }
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1369
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1370 return -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1371 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1372
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1373
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1374 PyDoc_STRVAR(find__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1375 "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	1376 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1377 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	1378 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	1379 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	1380 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1381 Return -1 on failure.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1382
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1383 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1384 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	1385 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1386 long 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	1387 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1388 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1389 return PyInt_FromLong(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1390 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1391
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1392
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1393 PyDoc_STRVAR(index__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1394 "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	1395 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1396 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	1397
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1398 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1399 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	1400 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1401 long 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	1402 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1403 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1404 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1405 PyErr_SetString(PyExc_ValueError,
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1406 "substring not found in string.index");
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1407 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1408 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1409 return PyInt_FromLong(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1410 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1411
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1412
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1413 PyDoc_STRVAR(rfind__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1414 "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	1415 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1416 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	1417 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	1418 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	1419 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1420 Return -1 on failure.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1421
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1422 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1423 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	1424 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1425 long 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	1426 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1427 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1428 return PyInt_FromLong(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1429 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1430
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1431
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1432 PyDoc_STRVAR(rindex__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1433 "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	1434 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1435 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	1436
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1437 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1438 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	1439 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1440 long 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	1441 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1442 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1443 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1444 PyErr_SetString(PyExc_ValueError,
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1445 "substring not found in string.rindex");
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1446 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1447 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1448 return PyInt_FromLong(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1449 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1450
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1451
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1452 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1453 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	1454 {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1455 char *s = PyString_AS_STRING(self);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1456 int len = PyString_GET_SIZE(self);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1457 char *sep = PyString_AS_STRING(sepobj);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1458 int seplen = PyString_GET_SIZE(sepobj);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1459 int i, j;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1460
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1461 i = 0;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1462 if (striptype != RIGHTSTRIP) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1463 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	1464 i++;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1465 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1466 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1467
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1468 j = len;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1469 if (striptype != LEFTSTRIP) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1470 do {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1471 j--;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1472 } 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	1473 j++;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1474 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1475
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1476 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	1477 Py_INCREF(self);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1478 return (PyObject*)self;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1479 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1480 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1481 return PyString_FromStringAndSize(s+i, j-i);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1482 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1483
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1484
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1485 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	1486 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	1487 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1488 char *s = PyString_AS_STRING(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1489 int len = PyString_GET_SIZE(self), i, j;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1490
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1491 i = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1492 if (striptype != RIGHTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1493 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	1494 i++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1495 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1496 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1497
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1498 j = len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1499 if (striptype != LEFTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1500 do {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1501 j--;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1502 } 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	1503 j++;
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
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1506 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	1507 Py_INCREF(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1508 return (PyObject*)self;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1509 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1510 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1511 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	1512 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1513
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1514
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1515 static PyObject *
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1516 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	1517 {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1518 PyObject *sep = NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1519
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1520 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	1521 return NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1522
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1523 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	1524 if (PyString_Check(sep))
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1525 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	1526 #ifdef Py_USING_UNICODE
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1527 else if (PyUnicode_Check(sep)) {
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1528 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	1529 PyObject *res;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1530 if (uniself==NULL)
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1531 return NULL;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1532 res = _PyUnicode_XStrip((PyUnicodeObject *)uniself,
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1533 striptype, sep);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1534 Py_DECREF(uniself);
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1535 return res;
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1536 }
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	1537 #endif
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1538 else {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1539 PyErr_Format(PyExc_TypeError,
23430 1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	1540 #ifdef Py_USING_UNICODE
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1541 "%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	1542 #else
1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	1543 "%s arg must be None or str",
1be6e79b1d46 Add #ifdef PY_USING_UNICODE sections, so that Walter Dörwald <walter@livinglogic.de> parents: 23295 diff changeset	1544 #endif
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1545 STRIPNAME(striptype));
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1546 return NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1547 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1548 return do_xstrip(self, striptype, sep);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1549 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1550
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1551 return do_strip(self, striptype);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1552 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1553
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1554
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1555 PyDoc_STRVAR(strip__doc__,
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1556 "S.strip([sep]) -> string or unicode\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1557 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1558 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	1559 whitespace removed.\n\
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1560 If sep is given and not None, remove characters in sep instead.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1561 If sep 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	1562
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1563 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1564 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	1565 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1566 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1567 return do_strip(self, BOTHSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1568 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1569 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	1570 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1571
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1572
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1573 PyDoc_STRVAR(lstrip__doc__,
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1574 "S.lstrip([sep]) -> string or unicode\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1575 \n\
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1576 Return a copy of the string S with leading whitespace removed.\n\
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1577 If sep is given and not None, remove characters in sep instead.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1578 If sep 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	1579
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1580 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1581 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	1582 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1583 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1584 return do_strip(self, LEFTSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1585 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1586 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	1587 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1588
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1589
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1590 PyDoc_STRVAR(rstrip__doc__,
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1591 "S.rstrip([sep]) -> string or unicode\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1592 \n\
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1593 Return a copy of the string S with trailing whitespace removed.\n\
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1594 If sep is given and not None, remove characters in sep instead.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1595 If sep 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	1596
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1597 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1598 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	1599 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1600 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1601 return do_strip(self, RIGHTSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1602 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1603 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	1604 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1605
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1606
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1607 PyDoc_STRVAR(lower__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1608 "S.lower() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1609 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1610 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	1611
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1612 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	1613 string_lower(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1614 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1615 char s = PyString_AS_STRING(self), s_new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1616 int i, n = PyString_GET_SIZE(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1617 PyObject *new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1618
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1619 new = PyString_FromStringAndSize(NULL, n);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1620 if (new == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1621 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1622 s_new = PyString_AsString(new);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1623 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	1624 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1625 if (isupper(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1626 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1627 } else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1628 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1629 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1630 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1631 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1632 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1633
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1634
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1635 PyDoc_STRVAR(upper__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1636 "S.upper() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1637 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1638 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	1639
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1640 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	1641 string_upper(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1642 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1643 char s = PyString_AS_STRING(self), s_new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1644 int i, n = PyString_GET_SIZE(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1645 PyObject *new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1646
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1647 new = PyString_FromStringAndSize(NULL, n);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1648 if (new == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1649 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1650 s_new = PyString_AsString(new);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1651 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	1652 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1653 if (islower(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1654 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1655 } else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1656 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1657 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1658 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1659 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1660 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1661
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1662
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1663 PyDoc_STRVAR(title__doc__,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1664 "S.title() -> string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1665 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1666 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	1667 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	1668
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1669 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	1670 string_title(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1671 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1672 char s = PyString_AS_STRING(self), s_new;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1673 int i, n = PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1674 int previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1675 PyObject *new;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1676
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1677 new = PyString_FromStringAndSize(NULL, n);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1678 if (new == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1679 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1680 s_new = PyString_AsString(new);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1681 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	1682 int c = Py_CHARMASK(*s++);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1683 if (islower(c)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1684 if (!previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1685 c = toupper(c);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1686 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1687 } else if (isupper(c)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1688 if (previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1689 c = tolower(c);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1690 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1691 } else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1692 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1693 *s_new++ = c;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1694 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1695 return new;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1696 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1697
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1698 PyDoc_STRVAR(capitalize__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1699 "S.capitalize() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1700 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1701 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	1702 capitalized.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1703
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1704 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	1705 string_capitalize(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1706 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1707 char s = PyString_AS_STRING(self), s_new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1708 int i, n = PyString_GET_SIZE(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1709 PyObject *new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1710
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1711 new = PyString_FromStringAndSize(NULL, n);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1712 if (new == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1713 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1714 s_new = PyString_AsString(new);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1715 if (0 < n) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1716 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1717 if (islower(c))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1718 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1719 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1720 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1721 s_new++;
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 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	1724 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1725 if (isupper(c))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1726 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1727 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1728 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1729 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1730 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1731 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1732 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1733
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1734
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1735 PyDoc_STRVAR(count__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1736 "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	1737 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1738 Return the number of occurrences of substring sub in string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1739 S[start:end]. Optional arguments start and end are\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1740 interpreted as in slice notation.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1741
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1742 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1743 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	1744 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1745 const char s = PyString_AS_STRING(self), sub;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1746 int len = PyString_GET_SIZE(self), n;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1747 int i = 0, last = INT_MAX;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1748 int m, r;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1749 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1750
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	1751 if (!PyArg_ParseTuple(args, "O\|O&O&:count", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	1752 _PyEval_SliceIndex, &i, _PyEval_SliceIndex, &last))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1753 return NULL;
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	1754
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1755 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1756 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1757 n = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1758 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1759 #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	1760 else if (PyUnicode_Check(subobj)) {
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1761 int count;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1762 count = PyUnicode_Count((PyObject *)self, subobj, i, last);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1763 if (count == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1764 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1765 else
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1766 return PyInt_FromLong((long) count);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1767 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1768 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1769 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	1770 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1771
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1772 string_adjust_indices(&i, &last, len);
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1773
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1774 m = last + 1 - n;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1775 if (n == 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1776 return PyInt_FromLong((long) (m-i));
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1777
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1778 r = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1779 while (i < m) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1780 if (!memcmp(s+i, sub, n)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1781 r++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1782 i += n;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1783 } else {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1784 i++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1785 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1786 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1787 return PyInt_FromLong((long) r);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1788 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1789
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1790
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1791 PyDoc_STRVAR(swapcase__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1792 "S.swapcase() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1793 \n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1794 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	1795 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	1796
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1797 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	1798 string_swapcase(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1799 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1800 char s = PyString_AS_STRING(self), s_new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1801 int i, n = PyString_GET_SIZE(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1802 PyObject *new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1803
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1804 new = PyString_FromStringAndSize(NULL, n);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1805 if (new == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1806 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1807 s_new = PyString_AsString(new);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1808 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	1809 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1810 if (islower(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1811 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1812 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1813 else if (isupper(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1814 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1815 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1816 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1817 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1818 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1819 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1820 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1821 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1822
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1823
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1824 PyDoc_STRVAR(translate__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1825 "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	1826 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1827 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	1828 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	1829 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	1830 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	1831
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1832 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1833 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	1834 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1835 register char input, output;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1836 register const char *table;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1837 register int i, c, changed = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1838 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	1839 const char table1, output_start, *del_table=NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1840 int inlen, tablen, dellen = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1841 PyObject *result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1842 int trans_table[256];
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1843 PyObject tableobj, delobj = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1844
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1845 if (!PyArg_ParseTuple(args, "O\|O:translate",
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1846 &tableobj, &delobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1847 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1848
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1849 if (PyString_Check(tableobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1850 table1 = PyString_AS_STRING(tableobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1851 tablen = PyString_GET_SIZE(tableobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1852 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1853 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1854 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	1855 /* 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	1856 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	1857 to be deleted. */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1858 if (delobj != NULL) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1859 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1860 "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	1861 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1862 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1863 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	1864 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1865 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1866 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	1867 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1868
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1869 if (delobj != NULL) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1870 if (PyString_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1871 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	1872 dellen = PyString_GET_SIZE(delobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1873 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1874 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1875 else if (PyUnicode_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1876 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1877 "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	1878 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1879 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1880 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1881 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	1882 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1883
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1884 if (tablen != 256) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1885 PyErr_SetString(PyExc_ValueError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1886 "translation table must be 256 characters long");
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1887 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1888 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1889 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1890 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1891 del_table = NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1892 dellen = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1893 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1894
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1895 table = table1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1896 inlen = PyString_Size(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1897 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	1898 if (result == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1899 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1900 output_start = output = PyString_AsString(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1901 input = PyString_AsString(input_obj);
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 if (dellen == 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1904 /* 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	1905 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1906 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1907 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	1908 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1909 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1910 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	1911 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1912 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1913 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1914 return input_obj;
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 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	1918 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	1919
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1920 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	1921 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	1922
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1923 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1924 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1925 if (trans_table[c] != -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1926 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	1927 continue;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1928 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1929 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1930 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	1931 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1932 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1933 return input_obj;
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 /* 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	1936 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	1937 _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	1938 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1939 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1940
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 /* What follows is used for implementing replace(). Perry Stoll. */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1943
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1944 /*
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1945 mymemfind
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1946
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1947 strstr replacement for arbitrary blocks of memory.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1948
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11998 diff changeset	1949 Locates the first occurrence in the memory pointed to by MEM of the
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1950 contents of memory pointed to by PAT. Returns the index into MEM if
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1951 found, or -1 if not found. If len of PAT is greater than length of
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1952 MEM, the function returns -1.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1953 */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1954 static int
13460 e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	1955 mymemfind(const char mem, int len, const char pat, int pat_len)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1956 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1957 register int ii;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1958
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1959 /* pattern can not occur in the last pat_len-1 chars */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1960 len -= pat_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1961
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1962 for (ii = 0; ii <= len; ii++) {
12966 447efb64c72d Fredrik Lundh <effbot@telia.com>: Fred Drake <fdrake@acm.org> parents: 12924 diff changeset	1963 if (mem[ii] == pat[0] && memcmp(&mem[ii], pat, pat_len) == 0) {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1964 return ii;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1965 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1966 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1967 return -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1968 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1969
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1970 /*
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1971 mymemcnt
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1972
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1973 Return the number of distinct times PAT is found in MEM.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1974 meaning mem=1111 and pat==11 returns 2.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1975 mem=11111 and pat==11 also return 2.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1976 */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1977 static int
13460 e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	1978 mymemcnt(const char mem, int len, const char pat, int pat_len)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1979 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1980 register int offset = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1981 int nfound = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1982
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1983 while (len >= 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1984 offset = mymemfind(mem, len, pat, pat_len);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1985 if (offset == -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1986 break;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1987 mem += offset + pat_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1988 len -= offset + pat_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1989 nfound++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1990 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1991 return nfound;
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
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1994 /*
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1995 mymemreplace
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1996
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	1997 Return a string in which all occurrences of PAT in memory STR are
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1998 replaced with SUB.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1999
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	2000 If length of PAT is less than length of STR or there are no occurrences
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2001 of PAT in STR, then the original string is returned. Otherwise, a new
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2002 string is allocated here and returned.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2003
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2004 on return, out_len is:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2005 the length of output string, or
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2006 -1 if the input string is returned, or
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2007 unchanged if an error occurs (no memory).
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2008
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2009 return value is:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2010 the new string allocated locally, or
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2011 NULL if an error occurred.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2012 */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2013 static char *
13460 e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	2014 mymemreplace(const char str, int len, / input string */
e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	2015 const char pat, int pat_len, / pattern string to find */
e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	2016 const char sub, int sub_len, / substitution string */
e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	2017 int count, /* number of replacements */
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2018 int *out_len)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2019 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2020 char *out_s;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2021 char *new_s;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2022 int nfound, offset, new_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2023
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2024 if (len == 0 \|\| pat_len > len)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2025 goto return_same;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2026
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2027 /* find length of output string */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2028 nfound = mymemcnt(str, len, pat, pat_len);
17751 c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	2029 if (count < 0)
c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	2030 count = INT_MAX;
c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	2031 else if (nfound > count)
c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	2032 nfound = count;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2033 if (nfound == 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2034 goto return_same;
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2035
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2036 new_len = len + nfound*(sub_len - pat_len);
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2037 if (new_len == 0) {
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2038 /* Have to allocate something for the caller to free(). */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2039 out_s = (char *)PyMem_MALLOC(1);
17751 c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	2040 if (out_s == NULL)
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2041 return NULL;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2042 out_s[0] = '\0';
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2043 }
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2044 else {
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2045 assert(new_len > 0);
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2046 new_s = (char *)PyMem_MALLOC(new_len);
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2047 if (new_s == NULL)
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2048 return NULL;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2049 out_s = new_s;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2050
17751 c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	2051 for (; count > 0 && len > 0; --count) {
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2052 /* find index of next instance of pattern */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2053 offset = mymemfind(str, len, pat, pat_len);
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2054 if (offset == -1)
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2055 break;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2056
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2057 /* copy non matching part of input string */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2058 memcpy(new_s, str, offset);
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2059 str += offset + pat_len;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2060 len -= offset + pat_len;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2061
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2062 /* copy substitute into the output string */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2063 new_s += offset;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2064 memcpy(new_s, sub, sub_len);
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2065 new_s += sub_len;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2066 }
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2067 /* copy any remaining values into output string */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2068 if (len > 0)
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2069 memcpy(new_s, str, len);
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2070 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2071 *out_len = new_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2072 return out_s;
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 return_same:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2075 *out_len = -1;
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2076 return (char )str; / cast away const */
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2077 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2078
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2079
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2080 PyDoc_STRVAR(replace__doc__,
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2081 "S.replace (old, new[, maxsplit]) -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2082 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2083 Return a copy of string S with all occurrences of substring\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2084 old replaced by new. If the optional argument maxsplit is\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2085 given, only the first maxsplit occurrences are replaced.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2086
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2087 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2088 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	2089 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2090 const char str = PyString_AS_STRING(self), sub, *repl;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2091 char *new_s;
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2092 const int len = PyString_GET_SIZE(self);
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2093 int sub_len, repl_len, out_len;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2094 int count = -1;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2095 PyObject *new;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2096 PyObject subobj, replobj;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2097
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2098 if (!PyArg_ParseTuple(args, "OO\|i:replace",
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2099 &subobj, &replobj, &count))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2100 return NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2101
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2102 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2103 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2104 sub_len = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2105 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2106 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2107 else if (PyUnicode_Check(subobj))
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2108 return PyUnicode_Replace((PyObject *)self,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2109 subobj, replobj, count);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2110 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2111 else if (PyObject_AsCharBuffer(subobj, &sub, &sub_len))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2112 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2113
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2114 if (PyString_Check(replobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2115 repl = PyString_AS_STRING(replobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2116 repl_len = PyString_GET_SIZE(replobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2117 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2118 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2119 else if (PyUnicode_Check(replobj))
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2120 return PyUnicode_Replace((PyObject *)self,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2121 subobj, replobj, count);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2122 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2123 else if (PyObject_AsCharBuffer(replobj, &repl, &repl_len))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2124 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2125
11998 f94d10b6d0f4 Fix typo in replace() detected by Mark Hammond and fixed by Marc-Andre. Guido van Rossum <guido@python.org> parents: 11969 diff changeset	2126 if (sub_len <= 0) {
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11998 diff changeset	2127 PyErr_SetString(PyExc_ValueError, "empty pattern string");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2128 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2129 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2130 new_s = mymemreplace(str,len,sub,sub_len,repl,repl_len,count,&out_len);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2131 if (new_s == NULL) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2132 PyErr_NoMemory();
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2133 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2134 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2135 if (out_len == -1) {
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2136 if (PyString_CheckExact(self)) {
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2137 /* we're returning another reference to self */
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2138 new = (PyObject*)self;
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2139 Py_INCREF(new);
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2140 }
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2141 else {
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2142 new = PyString_FromStringAndSize(str, len);
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2143 if (new == NULL)
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2144 return NULL;
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2145 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2146 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2147 else {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2148 new = PyString_FromStringAndSize(new_s, out_len);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	2149 PyMem_FREE(new_s);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2150 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2151 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2152 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2153
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2154
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2155 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	2156 "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	2157 \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	2158 Return True if S starts with the specified prefix, False otherwise. With\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2159 optional start, test S beginning at that position. With optional end, stop\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2160 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	2161
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2162 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2163 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	2164 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2165 const char* str = PyString_AS_STRING(self);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2166 int 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	2167 const char* prefix;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2168 int plen;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2169 int start = 0;
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2170 int end = INT_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2171 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2172
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2173 if (!PyArg_ParseTuple(args, "O\|O&O&:startswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2174 _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	2175 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2176 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2177 prefix = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2178 plen = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2179 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2180 #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	2181 else if (PyUnicode_Check(subobj)) {
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2182 int rc;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2183 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	2184 subobj, start, end, -1);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2185 if (rc == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2186 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2187 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	2188 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	2189 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2190 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2191 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	2192 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2193
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2194 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	2195
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2196 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	2197 return PyBool_FromLong(0);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2198
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2199 if (end-start >= plen)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2200 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	2201 else
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2202 return PyBool_FromLong(0);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2203 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2204
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2205
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2206 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	2207 "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	2208 \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	2209 Return True if S ends with the specified suffix, False otherwise. With\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2210 optional start, test S beginning at that position. With optional end, stop\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2211 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	2212
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2213 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2214 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	2215 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2216 const char* str = PyString_AS_STRING(self);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2217 int 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	2218 const char* suffix;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2219 int slen;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2220 int start = 0;
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2221 int end = INT_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2222 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2223
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2224 if (!PyArg_ParseTuple(args, "O\|O&O&:endswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2225 _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	2226 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2227 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2228 suffix = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2229 slen = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2230 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2231 #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	2232 else if (PyUnicode_Check(subobj)) {
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2233 int rc;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2234 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	2235 subobj, start, end, +1);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2236 if (rc == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2237 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2238 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	2239 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	2240 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2241 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2242 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	2243 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2244
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2245 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	2246
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2247 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	2248 return PyBool_FromLong(0);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2249
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2250 if (end-slen > start)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2251 start = end - slen;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2252 if (end-start >= slen)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2253 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	2254 else
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2255 return PyBool_FromLong(0);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2256 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2257
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2258
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2259 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	2260 "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	2261 \n\
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2262 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	2263 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	2264 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2265 a ValueError. Other possible values are 'ignore' and 'replace'.");
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2266
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2267 static PyObject *
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2268 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	2269 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2270 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	2271 char *errors = NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2272 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	2273 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	2274 return PyString_AsEncodedObject((PyObject *)self, encoding, errors);
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2275 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2276
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2277
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2278 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	2279 "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	2280 \n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2281 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	2282 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	2283 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2284 a ValueError. Other possible values are 'ignore' and 'replace'.");
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2285
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2286 static PyObject *
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2287 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	2288 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2289 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	2290 char *errors = NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2291 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	2292 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2293 return PyString_AsDecodedObject((PyObject *)self, encoding, errors);
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2294 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2295
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2296
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2297 PyDoc_STRVAR(expandtabs__doc__,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2298 "S.expandtabs([tabsize]) -> string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2299 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2300 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	2301 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	2302
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2303 static PyObject*
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2304 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	2305 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2306 const char e, p;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2307 char *q;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2308 int i, j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2309 PyObject *u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2310 int tabsize = 8;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2311
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2312 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	2313 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2314
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	2315 /* 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	2316 i = j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2317 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	2318 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	2319 if (*p == '\t') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2320 if (tabsize > 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2321 j += tabsize - (j % tabsize);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2322 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2323 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2324 j++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2325 if (p == '\n' \|\| p == '\r') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2326 i += j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2327 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2328 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2329 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2330
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2331 /* 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	2332 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	2333 if (!u)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2334 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2335
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2336 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2337 q = PyString_AS_STRING(u);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2338
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2339 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	2340 if (*p == '\t') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2341 if (tabsize > 0) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2342 i = tabsize - (j % tabsize);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2343 j += i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2344 while (i--)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2345 *q++ = ' ';
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2346 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2347 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2348 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2349 j++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2350 q++ = p;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2351 if (p == '\n' \|\| p == '\r')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2352 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2353 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2354
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2355 return u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2356 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2357
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2358 static PyObject *
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2359 pad(PyStringObject *self, int left, int right, char fill)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2360 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2361 PyObject *u;
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 if (left < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2364 left = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2365 if (right < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2366 right = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2367
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2368 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	2369 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2370 return (PyObject *)self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2371 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2372
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2373 u = PyString_FromStringAndSize(NULL,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2374 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	2375 if (u) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2376 if (left)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2377 memset(PyString_AS_STRING(u), fill, left);
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2378 memcpy(PyString_AS_STRING(u) + left,
9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2379 PyString_AS_STRING(self),
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2380 PyString_GET_SIZE(self));
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2381 if (right)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2382 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	2383 fill, right);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2384 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2385
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2386 return u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2387 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2388
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2389 PyDoc_STRVAR(ljust__doc__,
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2390 "S.ljust(width) -> string\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2391 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2392 "Return S left justified in a string of length width. Padding is\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2393 "done using spaces.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2394
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2395 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2396 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	2397 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2398 int width;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2399 if (!PyArg_ParseTuple(args, "i:ljust", &width))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2400 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2401
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2402 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	2403 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2404 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2405 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2406
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2407 return pad(self, 0, width - PyString_GET_SIZE(self), ' ');
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2408 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2409
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2410
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2411 PyDoc_STRVAR(rjust__doc__,
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2412 "S.rjust(width) -> string\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2413 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2414 "Return S right justified in a string of length width. Padding is\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2415 "done using spaces.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2416
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2417 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2418 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	2419 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2420 int width;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2421 if (!PyArg_ParseTuple(args, "i:rjust", &width))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2422 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2423
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2424 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	2425 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2426 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2427 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2428
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2429 return pad(self, width - PyString_GET_SIZE(self), 0, ' ');
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2430 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2431
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2432
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2433 PyDoc_STRVAR(center__doc__,
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2434 "S.center(width) -> string\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2435 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2436 "Return S centered in a string of length width. Padding is done\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2437 "using spaces.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2438
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2439 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2440 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	2441 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2442 int marg, left;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2443 int width;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2444
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2445 if (!PyArg_ParseTuple(args, "i:center", &width))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2446 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2447
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2448 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	2449 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2450 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2451 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2452
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2453 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	2454 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	2455
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2456 return pad(self, left, marg - left, ' ');
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2457 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2458
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2459 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	2460 "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	2461 "\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	2462 "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	2463 "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	2464
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2465 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	2466 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	2467 {
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2468 int 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	2469 PyObject *s;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2470 char *p;
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	2471
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2472 int width;
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2473 if (!PyArg_ParseTuple(args, "i:zfill", &width))
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2474 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	2475
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2476 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	2477 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	2478 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	2479 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	2480 }
19ea00feda33 Return the orginal string only if it's a real str or unicode Walter Dörwald <walter@livinglogic.de> parents: 23046 diff changeset	2481 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	2482 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	2483 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	2484 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	2485 );
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	2486 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2487
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2488 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	2489
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2490 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	2491
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2492 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	2493 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	2494
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2495 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	2496 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	2497 /* 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	2498 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	2499 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	2500 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2501
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2502 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	2503 }
8b1268bc371a Apply the second version of SF patch http://www.python.org/sf/536241 Walter Dörwald <walter@livinglogic.de> parents: 23015 diff changeset	2504
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2505 PyDoc_STRVAR(isspace__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	2506 "S.isspace() -> bool\n"
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2507 "\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	2508 "Return True if there are only whitespace characters in S,\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2509 "False otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2510
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2511 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	2512 string_isspace(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2513 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2514 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2515 = (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	2516 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	2517
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2518 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2519 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	2520 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	2521 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2522
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2523 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2524 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	2525 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2526
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2527 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	2528 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2529 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	2530 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2531 }
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	2532 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2533 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2534
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2535
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2536 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	2537 "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	2538 \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	2539 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	2540 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	2541
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2542 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	2543 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	2544 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2545 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2546 = (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	2547 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	2548
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2549 /* 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	2550 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	2551 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	2552 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	2553
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2554 /* 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	2555 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	2556 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	2557
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2558 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	2559 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	2560 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	2561 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	2562 }
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	2563 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	2564 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2565
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2566
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2567 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	2568 "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	2569 \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	2570 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	2571 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	2572
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2573 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	2574 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	2575 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2576 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2577 = (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	2578 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	2579
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2580 /* 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	2581 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	2582 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	2583 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	2584
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2585 /* 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	2586 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	2587 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	2588
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2589 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	2590 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	2591 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	2592 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	2593 }
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	2594 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	2595 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2596
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2597
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2598 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	2599 "S.isdigit() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2600 \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	2601 Return True if there are only digit characters in S,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2602 False otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2603
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2604 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	2605 string_isdigit(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2606 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2607 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2608 = (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	2609 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	2610
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2611 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2612 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	2613 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	2614 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2615
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2616 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2617 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	2618 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2619
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2620 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	2621 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2622 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	2623 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2624 }
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	2625 return PyBool_FromLong(1);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2626 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2627
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2628
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2629 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	2630 "S.islower() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2631 \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	2632 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	2633 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	2634
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2635 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	2636 string_islower(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2637 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2638 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2639 = (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	2640 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	2641 int cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2642
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2643 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2644 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	2645 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	2646
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2647 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2648 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	2649 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2650
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2651 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	2652 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2653 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2654 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	2655 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2656 else if (!cased && islower(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2657 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2658 }
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	2659 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2660 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2661
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2662
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2663 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	2664 "S.isupper() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2665 \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	2666 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	2667 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	2668
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2669 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	2670 string_isupper(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2671 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2672 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2673 = (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	2674 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	2675 int cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2676
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2677 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2678 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	2679 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	2680
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2681 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2682 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	2683 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2684
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2685 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	2686 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2687 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2688 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	2689 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2690 else if (!cased && isupper(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2691 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2692 }
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	2693 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2694 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2695
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2696
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2697 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	2698 "S.istitle() -> bool\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2699 \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	2700 Return True if S is a titlecased string, i.e. uppercase characters\n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2701 may only follow uncased characters and lowercase characters only cased\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2702 ones. Return False otherwise.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2703
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2704 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	2705 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	2706 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2707 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2708 = (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	2709 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	2710 int cased, previous_is_cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2711
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2712 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2713 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	2714 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	2715
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2716 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2717 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	2718 return PyBool_FromLong(0);
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2719
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2720 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	2721 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2722 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2723 for (; p < e; p++) {
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	2724 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	2725
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2726 if (isupper(ch)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2727 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	2728 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2729 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2730 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2731 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2732 else if (islower(ch)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2733 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	2734 return PyBool_FromLong(0);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2735 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2736 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2737 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2738 else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2739 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2740 }
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	2741 return PyBool_FromLong(cased);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2742 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2743
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2744
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2745 PyDoc_STRVAR(splitlines__doc__,
20415 621c7703e8b7 Remove extra "]" in splitlines() docstring. Fred Drake <fdrake@acm.org> parents: 20277 diff changeset	2746 "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	2747 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2748 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	2749 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	2750 is given and true.");
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2751
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2752 #define SPLIT_APPEND(data, left, right) \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2753 str = PyString_FromStringAndSize(data + left, right - left); \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2754 if (!str) \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2755 goto onError; \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2756 if (PyList_Append(list, str)) { \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2757 Py_DECREF(str); \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2758 goto onError; \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2759 } \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2760 else \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2761 Py_DECREF(str);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2762
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2763 static PyObject*
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2764 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	2765 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2766 register int i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2767 register int j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2768 int len;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2769 int keepends = 0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2770 PyObject *list;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2771 PyObject *str;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2772 char *data;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2773
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2774 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	2775 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2776
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2777 data = PyString_AS_STRING(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2778 len = PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2779
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2780 list = PyList_New(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2781 if (!list)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2782 goto onError;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2783
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2784 for (i = j = 0; i < len; ) {
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2785 int eol;
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2786
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2787 /* 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	2788 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	2789 i++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2790
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2791 /* 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	2792 eol = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2793 if (i < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2794 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	2795 data[i+1] == '\n')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2796 i += 2;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2797 else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2798 i++;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2799 if (keepends)
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2800 eol = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2801 }
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2802 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	2803 j = i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2804 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2805 if (j < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2806 SPLIT_APPEND(data, j, len);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2807 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2808
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2809 return list;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2810
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2811 onError:
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2812 Py_DECREF(list);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2813 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2814 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2815
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2816 #undef SPLIT_APPEND
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2817
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2818
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2819 static PyMethodDef
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2820 string_methods[] = {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2821 /* 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	2822 string.maketrans(). */
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2823 {"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	2824 {"split", (PyCFunction)string_split, METH_VARARGS, split__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2825 {"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	2826 {"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	2827 {"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	2828 {"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	2829 {"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	2830 {"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	2831 {"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	2832 {"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	2833 {"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	2834 {"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	2835 capitalize__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2836 {"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	2837 {"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	2838 endswith__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2839 {"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	2840 {"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	2841 {"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	2842 {"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	2843 {"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	2844 {"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	2845 {"rstrip", (PyCFunction)string_rstrip, METH_VARARGS, rstrip__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2846 {"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	2847 startswith__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2848 {"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	2849 {"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	2850 swapcase__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2851 {"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	2852 translate__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2853 {"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	2854 {"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	2855 {"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	2856 {"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	2857 {"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	2858 {"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	2859 {"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	2860 {"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	2861 expandtabs__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2862 {"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	2863 splitlines__doc__},
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2864 {NULL, NULL} /* sentinel */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2865 };
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2866
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2867 staticforward PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2868 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	2869
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2870 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2871 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	2872 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2873 PyObject *x = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2874 static char *kwlist[] = {"object", 0};
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2875
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2876 if (type != &PyString_Type)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2877 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	2878 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	2879 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2880 if (x == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2881 return PyString_FromString("");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2882 return PyObject_Str(x);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2883 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2884
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2885 static PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2886 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	2887 {
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2888 PyObject tmp, pnew;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2889 int n;
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2890
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2891 assert(PyType_IsSubtype(type, &PyString_Type));
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2892 tmp = string_new(&PyString_Type, args, kwds);
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2893 if (tmp == NULL)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2894 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	2895 assert(PyString_CheckExact(tmp));
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2896 n = PyString_GET_SIZE(tmp);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2897 pnew = type->tp_alloc(type, n);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2898 if (pnew != NULL) {
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2899 memcpy(PyString_AS_STRING(pnew), PyString_AS_STRING(tmp), n+1);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2900 ((PyStringObject *)pnew)->ob_shash =
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2901 ((PyStringObject *)tmp)->ob_shash;
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2902 ((PyStringObject *)pnew)->ob_sinterned =
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2903 ((PyStringObject *)tmp)->ob_sinterned;
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2904 }
19632 20fb7591f885 Fix a memory leak in str_subtype_new(). (All the other Guido van Rossum <guido@python.org> parents: 19592 diff changeset	2905 Py_DECREF(tmp);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2906 return pnew;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2907 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2908
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	2909 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	2910 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	2911 {
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	2912 PyErr_SetString(PyExc_TypeError,
23597 ed007e47b3a1 Change name from string to basestring Neal Norwitz <nnorwitz@gmail.com> parents: 23542 diff changeset	2913 "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	2914 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	2915 }
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	2916
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2917 PyDoc_STRVAR(basestring_doc,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2918 "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	2919
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	2920 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	2921 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	2922 0,
23597 ed007e47b3a1 Change name from string to basestring Neal Norwitz <nnorwitz@gmail.com> parents: 23542 diff changeset	2923 "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	2924 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	2925 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	2926 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	2927 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	2928 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	2929 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	2930 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	2931 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	2932 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	2933 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	2934 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	2935 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	2936 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	2937 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	2938 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	2939 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	2940 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	2941 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	2942 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	2943 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	2944 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	2945 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	2946 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	2947 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	2948 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	2949 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	2950 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	2951 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	2952 &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	2953 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	2954 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	2955 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	2956 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	2957 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	2958 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	2959 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	2960 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	2961 };
220b98f06415 - A new type object, 'string', is added. This is a common base type Guido van Rossum <guido@python.org> parents: 23494 diff changeset	2962
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2963 PyDoc_STRVAR(string_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2964 "str(object) -> string\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2965 \n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2966 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	2967 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	2968
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2969 PyTypeObject PyString_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2970 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2971 0,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2972 "str",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2973 sizeof(PyStringObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2974 sizeof(char),
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2975 (destructor)string_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2976 (printfunc)string_print, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2977 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2978 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2979 0, /* tp_compare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2980 (reprfunc)string_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2981 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2982 &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	2983 &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	2984 (hashfunc)string_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2985 0, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2986 (reprfunc)string_str, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2987 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2988 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2989 &string_as_buffer, /* tp_as_buffer */
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2990 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	2991 string_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2992 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2993 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2994 (richcmpfunc)string_richcompare, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2995 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2996 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2997 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2998 string_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2999 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3000 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	3001 &PyBaseString_Type, /* tp_base */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3002 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3003 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3004 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3005 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3006 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3007 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3008 string_new, /* tp_new */
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	3009 PyObject_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3010 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3011
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3012 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3013 PyString_Concat(register PyObject *pv, register PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3014 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3015 register PyObject *v;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3016 if (*pv == NULL)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3017 return;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3018 if (w == NULL \|\| !PyString_Check(*pv)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3019 Py_DECREF(*pv);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3020 *pv = NULL;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3021 return;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3022 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3023 v = string_concat((PyStringObject ) pv, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3024 Py_DECREF(*pv);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3025 *pv = v;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3026 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3027
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3028 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3029 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	3030 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3031 PyString_Concat(pv, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3032 Py_XDECREF(w);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3033 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3034
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3035
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3036 /* The following function breaks the notion that strings are immutable:
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3037 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	3038 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	3039 as creating a new string object and destroying the old one, only
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3040 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	3041 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	3042 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	3043 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	3044 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	3045 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	3046 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	3047 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	3048 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3049
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3050 int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3051 _PyString_Resize(PyObject **pv, int newsize)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3052 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3053 register PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3054 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	3055 v = *pv;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3056 if (!PyString_Check(v) \|\| v->ob_refcnt != 1) {
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3057 *pv = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3058 Py_DECREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3059 PyErr_BadInternalCall();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	3060 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3061 }
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	3062 /* XXX UNREF/NEWREF interface should be more symmetrical */
3586 36cc3ee54f28 new debugger symbol names Guido van Rossum <guido@python.org> parents: 3571 diff changeset	3063 #ifdef Py_REF_DEBUG
2612 ca6b60d4ea90 fix dusty debugging macros Guido van Rossum <guido@python.org> parents: 2504 diff changeset	3064 --_Py_RefTotal;
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	3065 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3066 _Py_ForgetReference(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3067 pv = (PyObject )
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	3068 PyObject_REALLOC((char *)v,
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3069 sizeof(PyStringObject) + newsize * sizeof(char));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3070 if (*pv == NULL) {
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	3071 PyObject_Del(v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3072 PyErr_NoMemory();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	3073 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3074 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3075 _Py_NewReference(*pv);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3076 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	3077 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	3078 sv->ob_sval[newsize] = '\0';
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3079 return 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3080 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3081
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3082 /* Helpers for formatstring */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3083
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3084 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3085 getnextarg(PyObject args, int arglen, int p_argidx)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3086 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3087 int argidx = *p_argidx;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3088 if (argidx < arglen) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3089 (*p_argidx)++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3090 if (arglen < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3091 return args;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3092 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3093 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	3094 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3095 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3096 "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	3097 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3098 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3099
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	3100 /* 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	3101 * 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	3102 * 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	3103 * 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	3104 * 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	3105 * 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	3106 */
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3107 #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	3108 #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	3109 #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	3110 #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	3111 #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	3112
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3113 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3114 formatfloat(char *buf, size_t buflen, int flags,
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3115 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	3116 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3117 /* fmt = '%#.' + `prec` + `type`
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3118 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	3119 char fmt[20];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3120 double x;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3121 if (!PyArg_Parse(v, "d;float argument required", &x))
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3122 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3123 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3124 prec = 6;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3125 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	3126 type = 'g';
21073 304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 20604 diff changeset	3127 PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%d%c",
304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 20604 diff changeset	3128 (flags&F_ALT) ? "#" : "",
304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 20604 diff changeset	3129 prec, type);
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3130 /* worst case length calc to ensure no buffer overrun:
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3131 fmt = %#.<prec>g
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3132 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	3133 for any double rep.)
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3134 len = 1 + prec + 1 + 2 + 5 = 9 + prec
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3135 If prec=0 the effective precision is 1 (the leading digit is
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3136 always given), therefore increase by one to 10+prec. */
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3137 if (buflen <= (size_t)10 + (size_t)prec) {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3138 PyErr_SetString(PyExc_OverflowError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15082 diff changeset	3139 "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	3140 return -1;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3141 }
21073 304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 20604 diff changeset	3142 PyOS_snprintf(buf, buflen, fmt, x);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3143 return strlen(buf);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3144 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3145
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	3146 /* _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	3147 * 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	3148 * 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	3149 * 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	3150 * . *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	3151 * *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	3152 * 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	3153 * 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	3154 * "-"? ("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	3155 * "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	3156 * 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	3157 * 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	3158 * 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	3159 * 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	3160 * 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	3161 * 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	3162 * 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	3163 *
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3164 * 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	3165 * 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	3166 */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3167 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	3168 _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	3169 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	3170 {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3171 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	3172 char *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	3173 int 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	3174 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	3175 int len; /* number of characters */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3176 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	3177 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	3178
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3179 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	3180 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	3181 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	3182 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	3183 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	3184 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	3185 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	3186 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	3187 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	3188 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	3189 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	3190 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	3191 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	3192 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	3193 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	3194 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3195 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	3196 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	3197
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3198 /* 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	3199 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	3200 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	3201 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	3202 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3203 buf = PyString_AsString(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	3204 len = PyString_Size(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	3205 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	3206 --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	3207 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	3208 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3209 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	3210 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	3211 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	3212 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	3213
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3214 /* 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	3215 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	3216 /* 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	3217 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	3218 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	3219 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	3220 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	3221 /* 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	3222 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	3223 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	3224 --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	3225 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3226 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	3227 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	3228 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	3229 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	3230 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	3231 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	3232 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	3233 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	3234 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3235 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	3236 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	3237 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	3238 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	3239 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	3240 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3241 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	3242 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	3243 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3244
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3245 /* 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	3246 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	3247 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	3248 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	3249 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	3250 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	3251 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	3252 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	3253 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3254 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	3255 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	3256 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	3257 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	3258 *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	3259 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	3260 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	3261 *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	3262 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	3263 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	3264 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	3265 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	3266 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3267
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3268 /* Fix up case for hex conversions. */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3269 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	3270 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	3271 /* Need to convert all upper case letters to lower case. */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3272 for (i = 0; i < len; 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	3273 if (buf[i] >= 'A' && buf[i] <= 'F')
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3274 buf[i] += 'a'-'A';
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3275 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	3276 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	3277 /* Need to convert 0x to 0X (and -0x to -0X). */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3278 if (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	3279 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	3280 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	3281 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3282 *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	3283 *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	3284 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	3285 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3286
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3287 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3288 formatint(char *buf, size_t buflen, int flags,
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3289 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	3290 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3291 /* 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	3292 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	3293 + 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	3294 char fmt[64]; /* plenty big enough! */
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3295 long x;
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3296
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3297 if (!PyArg_Parse(v, "l;int argument required", &x))
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3298 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3299 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3300 prec = 1;
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3301
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3302 if ((flags & F_ALT) &&
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3303 (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	3304 /* 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	3305 * 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	3306 * - 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	3307 * 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	3308 * %#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	3309 * hex() function
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3310 * - 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	3311 * 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	3312 * (Metrowerks, Compaq Tru64)
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3313 * - 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	3314 * 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	3315 * 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	3316 *
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3317 * 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	3318 * 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	3319 * of %#x/%#X.
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3320 *
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3321 * 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	3322 * formatint() in unicodeobject.c
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3323 */
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3324 PyOS_snprintf(fmt, sizeof(fmt), "0%c%%.%dl%c",
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3325 type, prec, type);
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3326 }
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3327 else {
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3328 PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%dl%c",
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3329 (flags&F_ALT) ? "#" : "",
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3330 prec, type);
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3331 }
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3332
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	3333 /* buf = '+'/'-'/'0'/'0x' + '[0-9]'*max(prec, len(x in octal))
22087 5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3334 * worst case buf = '0x' + [0-9]*prec, where prec >= 11
5b24a6ae2dc4 %#x/%#X format conversion cleanup (see patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22053 diff changeset	3335 */
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	3336 if (buflen <= 13 \|\| buflen <= (size_t)2 + (size_t)prec) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3337 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	3338 "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	3339 return -1;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3340 }
21073 304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 20604 diff changeset	3341 PyOS_snprintf(buf, buflen, fmt, x);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3342 return strlen(buf);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3343 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3344
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3345 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3346 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	3347 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3348 /* 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	3349 if (PyString_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3350 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	3351 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3352 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3353 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3354 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	3355 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3356 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3357 buf[1] = '\0';
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3358 return 1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3359 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3360
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3361
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3362 /* 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	3363
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3364 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	3365 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	3366 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	3367 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	3368 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	3369 */
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3370 #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	3371
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3372 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3373 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	3374 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3375 char fmt, res;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3376 int fmtcnt, rescnt, reslen, arglen, argidx;
3570 977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	3377 int args_owned = 0;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3378 PyObject result, orig_args;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3379 #ifdef Py_USING_UNICODE
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3380 PyObject v, w;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3381 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3382 PyObject *dict = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3383 if (format == NULL \|\| !PyString_Check(format) \|\| args == NULL) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3384 PyErr_BadInternalCall();
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3385 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3386 }
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3387 orig_args = args;
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3388 fmt = PyString_AS_STRING(format);
19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3389 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	3390 reslen = rescnt = fmtcnt + 100;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3391 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	3392 if (result == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3393 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3394 res = PyString_AsString(result);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3395 if (PyTuple_Check(args)) {
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3396 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	3397 argidx = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3398 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3399 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3400 arglen = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3401 argidx = -2;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3402 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	3403 if (args->ob_type->tp_as_mapping && !PyTuple_Check(args))
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3404 dict = args;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3405 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3406 if (*fmt != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3407 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	3408 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	3409 reslen += rescnt;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3410 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	3411 return NULL;
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3412 res = PyString_AS_STRING(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3413 + reslen - rescnt;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3414 --rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3415 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3416 res++ = fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3417 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3418 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3419 /* Got a format specifier */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3420 int flags = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3421 int width = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3422 int prec = -1;
1408 18df674539da Three micro fixes to formatstring Guido van Rossum <guido@python.org> parents: 1380 diff changeset	3423 int c = '\0';
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3424 int fill;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3425 PyObject *v = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3426 PyObject *temp = NULL;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3427 char *pbuf;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3428 int sign;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3429 int len;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3430 char formatbuf[FORMATBUFLEN];
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3431 /* For format{float,int,char}() */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3432 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3433 char *fmt_start = fmt;
17655 0470babdae49 Fix for bug #417030: "print '%s' fails for unicode string" Marc-André Lemburg <mal@egenix.com>* parents: 17645 diff changeset	3434 int argidx_start = argidx;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3435 #endif
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3436
4588 4dc67fdd9e0b Make gcc -Wall happy Guido van Rossum <guido@python.org> parents: 4503 diff changeset	3437 fmt++;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3438 if (*fmt == '(') {
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3439 char *keystart;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3440 int keylen;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3441 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	3442 int pcount = 1;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3443
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3444 if (dict == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3445 PyErr_SetString(PyExc_TypeError,
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3446 "format requires a mapping");
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3447 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3448 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3449 ++fmt;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3450 --fmtcnt;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3451 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	3452 /* 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	3453 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	3454 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	3455 --pcount;
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	3456 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	3457 ++pcount;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3458 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	3459 }
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	3460 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	3461 if (fmtcnt < 0 \|\| pcount > 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3462 PyErr_SetString(PyExc_ValueError,
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3463 "incomplete format key");
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3464 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3465 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3466 key = PyString_FromStringAndSize(keystart,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3467 keylen);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3468 if (key == NULL)
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3469 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	3470 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3471 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	3472 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	3473 }
977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	3474 args = PyObject_GetItem(dict, key);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3475 Py_DECREF(key);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3476 if (args == NULL) {
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3477 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3478 }
3570 977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	3479 args_owned = 1;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3480 arglen = -1;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3481 argidx = -2;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3482 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3483 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3484 switch (c = *fmt++) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3485 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	3486 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	3487 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	3488 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	3489 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	3490 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3491 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3492 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3493 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3494 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	3495 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3496 goto error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3497 if (!PyInt_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3498 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3499 "* wants int");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3500 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3501 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3502 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	3503 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	3504 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	3505 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	3506 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3507 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3508 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3509 }
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	3510 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	3511 width = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3512 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	3513 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	3514 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3515 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3516 if ((width*10) / 10 != width) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3517 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3518 PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3519 "width too big");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3520 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3521 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3522 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	3523 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3524 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3525 if (c == '.') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3526 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3527 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3528 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3529 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3530 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	3531 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3532 goto error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3533 if (!PyInt_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3534 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3535 PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3536 "* wants int");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3537 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3538 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3539 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	3540 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3541 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3542 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3543 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3544 }
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	3545 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	3546 prec = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3547 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	3548 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	3549 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3550 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3551 if ((prec*10) / 10 != prec) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3552 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3553 PyExc_ValueError,
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3554 "prec too big");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3555 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3556 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3557 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	3558 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3559 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3560 } /* prec */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3561 if (fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3562 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	3563 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3564 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3565 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3566 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3567 if (fmtcnt < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3568 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3569 "incomplete format");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3570 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3571 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3572 if (c != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3573 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	3574 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3575 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3576 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3577 sign = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3578 fill = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3579 switch (c) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3580 case '%':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3581 pbuf = "%";
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3582 len = 1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3583 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3584 case 's':
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3585 case 'r':
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3586 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3587 if (PyUnicode_Check(v)) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3588 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	3589 argidx = argidx_start;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3590 goto unicode;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3591 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3592 #endif
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3593 if (c == 's')
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3594 temp = PyObject_Str(v);
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3595 else
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3596 temp = PyObject_Repr(v);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3597 if (temp == NULL)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3598 goto error;
8468 c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3599 if (!PyString_Check(temp)) {
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3600 PyErr_SetString(PyExc_TypeError,
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3601 "%s argument has non-string str()");
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3602 Py_DECREF(temp);
8468 c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3603 goto error;
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3604 }
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3605 pbuf = PyString_AS_STRING(temp);
19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3606 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	3607 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	3608 len = prec;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3609 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3610 case 'i':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3611 case 'd':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3612 case 'u':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3613 case 'o':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3614 case 'x':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3615 case 'X':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3616 if (c == 'i')
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3617 c = 'd';
15455 d0146d128897 Fox for SF bug #123859: %[duxXo] long formats inconsistent. Tim Peters <tim.peters@gmail.com> parents: 15435 diff changeset	3618 if (PyLong_Check(v)) {
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	3619 temp = _PyString_FormatLong(v, flags,
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3620 prec, c, &pbuf, &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	3621 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	3622 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	3623 /* unbounded ints can always produce
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3624 a sign character! */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3625 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	3626 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3627 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	3628 pbuf = formatbuf;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3629 len = formatint(pbuf,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3630 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	3631 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	3632 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	3633 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	3634 /* only d conversion is signed */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3635 sign = c == '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	3636 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3637 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	3638 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3639 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3640 case 'e':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3641 case 'E':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3642 case 'f':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3643 case 'g':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3644 case 'G':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3645 pbuf = formatbuf;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	3646 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	3647 flags, prec, c, v);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3648 if (len < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3649 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3650 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	3651 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	3652 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3653 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3654 case 'c':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3655 pbuf = formatbuf;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3656 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	3657 if (len < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3658 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3659 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3660 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	3661 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	3662 "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	3663 "at index %i",
31d78f361530 [ Patch #102852 ] Make % error a bit more informative by indicates the Andrew M. Kuchling <amk@amk.ca> parents: 15484 diff changeset	3664 c, c, 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	3665 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3666 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3667 if (sign) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3668 if (pbuf == '-' \|\| pbuf == '+') {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3669 sign = *pbuf++;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3670 len--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3671 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3672 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	3673 sign = '+';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3674 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	3675 sign = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3676 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	3677 sign = 0;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3678 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3679 if (width < len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3680 width = len;
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	3681 if (rescnt < width + (sign != 0)) {
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	3682 reslen -= rescnt;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	3683 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	3684 reslen += rescnt;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3685 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	3686 return NULL;
21254 19186b17d25a Little stuff. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21149 diff changeset	3687 res = PyString_AS_STRING(result)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3688 + reslen - rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3689 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3690 if (sign) {
1409 f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	3691 if (fill != ' ')
f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	3692 *res++ = sign;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3693 rescnt--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3694 if (width > len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3695 width--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3696 }
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	3697 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	3698 assert(pbuf[0] == '0');
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3699 assert(pbuf[1] == c);
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3700 if (fill != ' ') {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3701 res++ = pbuf++;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3702 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	3703 }
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3704 rescnt -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3705 width -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3706 if (width < 0)
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3707 width = 0;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3708 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	3709 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3710 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	3711 do {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3712 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3713 *res++ = fill;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3714 } while (--width > len);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3715 }
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	3716 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	3717 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	3718 *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	3719 if ((flags & F_ALT) &&
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3720 (c == 'x' \|\| c == 'X')) {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3721 assert(pbuf[0] == '0');
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3722 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	3723 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	3724 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	3725 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3726 }
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3727 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	3728 res += len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3729 rescnt -= len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3730 while (--width >= len) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3731 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3732 *res++ = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3733 }
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	3734 if (dict && (argidx < arglen) && c != '%') {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3735 PyErr_SetString(PyExc_TypeError,
23494 76f376bea5e5 Patch 549187. Improve string formatting error message. Raymond Hettinger <python@rcn.com> parents: 23430 diff changeset	3736 "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	3737 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3738 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3739 Py_XDECREF(temp);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3740 } /* '%' */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3741 } /* 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	3742 if (argidx < arglen && !dict) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3743 PyErr_SetString(PyExc_TypeError,
23494 76f376bea5e5 Patch 549187. Improve string formatting error message. Raymond Hettinger <python@rcn.com> parents: 23430 diff changeset	3744 "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	3745 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3746 }
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	3747 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3748 Py_DECREF(args);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	3749 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3750 _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	3751 return result;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3752
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3753 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3754 unicode:
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3755 if (args_owned) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3756 Py_DECREF(args);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3757 args_owned = 0;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3758 }
17655 0470babdae49 Fix for bug #417030: "print '%s' fails for unicode string" Marc-André Lemburg <mal@egenix.com>* parents: 17645 diff changeset	3759 /* Fiddle args right (remove the first argidx arguments) */
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3760 if (PyTuple_Check(orig_args) && argidx > 0) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3761 PyObject *v;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3762 int n = PyTuple_GET_SIZE(orig_args) - argidx;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3763 v = PyTuple_New(n);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3764 if (v == NULL)
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3765 goto error;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3766 while (--n >= 0) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3767 PyObject *w = PyTuple_GET_ITEM(orig_args, n + argidx);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3768 Py_INCREF(w);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3769 PyTuple_SET_ITEM(v, n, w);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3770 }
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3771 args = v;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3772 } else {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3773 Py_INCREF(orig_args);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3774 args = orig_args;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3775 }
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	3776 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	3777 /* 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	3778 function format the rest of the input. */
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3779 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	3780 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	3781 goto error;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3782 fmtcnt = PyString_GET_SIZE(format) - \
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3783 (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	3784 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	3785 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	3786 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	3787 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	3788 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	3789 if (v == NULL)
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3790 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	3791 /* 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	3792 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	3793 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	3794 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	3795 Py_DECREF(v);
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3796 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	3797 return w;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3798 #endif /* Py_USING_UNICODE */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3799
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3800 error:
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3801 Py_DECREF(result);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	3802 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3803 Py_DECREF(args);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	3804 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3805 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3806 }
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3807
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3808
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3809
14018 0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3810 /* This dictionary will leak at PyString_Fini() time. That's acceptable
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3811 * because PyString_Fini() specifically frees interned strings that are
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3812 * only referenced by this dictionary. The CVS log entry for revision 2.45
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3813 * says:
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3814 *
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3815 * Change the Fini function to only remove otherwise unreferenced
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3816 * strings from the interned table. There are references in
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3817 * hard-to-find static variables all over the interpreter, and it's not
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3818 * worth trying to get rid of all those; but "uninterning" isn't fair
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3819 * either and may cause subtle failures later -- so we have to keep them
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3820 * in the interned table.
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3821 */
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3822 static PyObject *interned;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3823
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3824 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3825 PyString_InternInPlace(PyObject **p)
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3826 {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3827 register PyStringObject s = (PyStringObject )(*p);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3828 PyObject *t;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3829 if (s == NULL \|\| !PyString_Check(s))
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3830 Py_FatalError("PyString_InternInPlace: strings only please!");
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3831 if ((t = s->ob_sinterned) != NULL) {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3832 if (t == (PyObject *)s)
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3833 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3834 Py_INCREF(t);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3835 *p = t;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3836 Py_DECREF(s);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3837 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3838 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3839 if (interned == NULL) {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3840 interned = PyDict_New();
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3841 if (interned == NULL)
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3842 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3843 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3844 if ((t = PyDict_GetItem(interned, (PyObject *)s)) != NULL) {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3845 Py_INCREF(t);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3846 *p = s->ob_sinterned = t;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3847 Py_DECREF(s);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3848 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3849 }
19887 b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3850 /* Ensure that only true string objects appear in the intern dict,
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3851 and as the value of ob_sinterned. */
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3852 if (PyString_CheckExact(s)) {
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3853 t = (PyObject *)s;
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3854 if (PyDict_SetItem(interned, t, t) == 0) {
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3855 s->ob_sinterned = t;
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3856 return;
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3857 }
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3858 }
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3859 else {
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3860 t = PyString_FromStringAndSize(PyString_AS_STRING(s),
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3861 PyString_GET_SIZE(s));
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3862 if (t != NULL) {
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3863 if (PyDict_SetItem(interned, t, t) == 0) {
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3864 *p = s->ob_sinterned = t;
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3865 Py_DECREF(s);
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3866 return;
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3867 }
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3868 Py_DECREF(t);
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3869 }
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3870 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3871 PyErr_Clear();
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3872 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3873
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3874
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3875 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3876 PyString_InternFromString(const char *cp)
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3877 {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3878 PyObject *s = PyString_FromString(cp);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3879 if (s == NULL)
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3880 return NULL;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3881 PyString_InternInPlace(&s);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3882 return s;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3883 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3884
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3885 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3886 PyString_Fini(void)
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3887 {
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3888 int i;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3889 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	3890 Py_XDECREF(characters[i]);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3891 characters[i] = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3892 }
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3893 Py_XDECREF(nullstring);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3894 nullstring = NULL;
5935 d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3895 if (interned) {
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3896 int pos, changed;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3897 PyObject key, value;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3898 do {
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3899 changed = 0;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3900 pos = 0;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3901 while (PyDict_Next(interned, &pos, &key, &value)) {
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3902 if (key->ob_refcnt == 2 && key == value) {
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3903 PyDict_DelItem(interned, key);
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3904 changed = 1;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3905 }
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3906 }
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3907 } while (changed);
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3908 }
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3909 }
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3910
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3911 void _Py_ReleaseInternedStrings(void)
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3912 {
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3913 if (interned) {
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17450 diff changeset	3914 fprintf(stderr, "releasing interned strings\n");
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17450 diff changeset	3915 PyDict_Clear(interned);
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3916 Py_DECREF(interned);
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3917 interned = NULL;
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3918 }
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3919 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/stringobject.c @ 24042:63fbbed10714 legacy-trunk