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

annotate Objects/stringobject.c @ 19975:4e445a3e07c6 legacy-trunk

Enable two checks for comparing a complex to a complex subtype instance. Split a string comparison test in two halves, replacing "a==b==a" with separate tests for a==b and b==a. (Reason: while experimenting, this test failed, and I wanted to know if it was the first or the second == operator that failed.)

author	Guido van Rossum <guido@python.org>
date	Wed, 19 Sep 2001 01:16:16 +0000
parents	b28fc8c36e3d
children	5b1ad7acabb5

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* String object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4 #include "Python.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	6 #include <ctype.h>
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	7
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	8 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	9 int null_strings, one_strings;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	10 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	11
14869 25ddd3dc7a7a Rationalize use of limits.h, moving the inclusion to Python.h. Fred Drake <fdrake@acm.org> parents: 14713 diff changeset	12 #if !defined(HAVE_LIMITS_H) && !defined(UCHAR_MAX)
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	13 #define UCHAR_MAX 255
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	14 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	15
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	16 static PyStringObject *characters[UCHAR_MAX + 1];
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	17 #ifndef DONT_SHARE_SHORT_STRINGS
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	18 static PyStringObject *nullstring;
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	19 #endif
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	20
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	21 /*
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	22 Newsizedstringobject() and newstringobject() try in certain cases
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	23 to share string objects. When the size of the string is zero,
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	24 these routines always return a pointer to the same string object;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	25 when the size is one, they return a pointer to an already existing
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	26 object if the contents of the string is known. For
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	27 newstringobject() this is always the case, for
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	28 newsizedstringobject() this is the case when the first argument in
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	29 not NULL.
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	30 A common practice to allocate a string and then fill it in or
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	31 change it must be done carefully. It is only allowed to change the
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	32 contents of the string if the obect was gotten from
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	33 newsizedstringobject() with a NULL first argument, because in the
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	34 future these routines may try to do even more sharing of objects.
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	35 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	36 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	37 PyString_FromStringAndSize(const char *str, int size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	38 {
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	39 register PyStringObject *op;
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	40 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	41 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	42 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	43 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	44 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	45 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	46 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	47 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	48 if (size == 1 && str != NULL &&
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	49 (op = characters[*str & UCHAR_MAX]) != NULL)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	50 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	51 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	52 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	53 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	54 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	55 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	56 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	57 #endif /* DONT_SHARE_SHORT_STRINGS */
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	58
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	59 /* PyObject_NewVar is inlined */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	60 op = (PyStringObject *)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	61 PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	62 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	63 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	64 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	65 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	66 op->ob_shash = -1;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	67 #endif
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	68 #ifdef INTERN_STRINGS
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	69 op->ob_sinterned = NULL;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	70 #endif
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	71 if (str != NULL)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	72 memcpy(op->ob_sval, str, size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	73 op->ob_sval[size] = '\0';
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	74 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	75 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	76 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	77 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	78 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	79 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	80 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	81 } 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	82 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	83 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	84 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	85 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	86 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	87 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	88 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	89 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	90 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	91
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	92 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	93 PyString_FromString(const char *str)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	94 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	95 register size_t size = strlen(str);
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	96 register PyStringObject *op;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	97 if (size > INT_MAX) {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	98 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	99 "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	100 return NULL;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	101 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	102 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	103 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	104 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	105 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	106 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	107 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	108 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	109 }
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	110 if (size == 1 && (op = characters[*str & UCHAR_MAX]) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	111 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	112 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	113 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	114 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	115 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	116 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	117 #endif /* DONT_SHARE_SHORT_STRINGS */
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	118
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	119 /* PyObject_NewVar is inlined */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	120 op = (PyStringObject *)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	121 PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	122 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	123 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	124 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	125 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	126 op->ob_shash = -1;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	127 #endif
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	128 #ifdef INTERN_STRINGS
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	129 op->ob_sinterned = NULL;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	130 #endif
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	131 strcpy(op->ob_sval, str);
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	132 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	133 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	134 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	135 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	136 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	137 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	138 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	139 } 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	140 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	141 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	142 op = (PyStringObject *)t;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	143 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	144 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	145 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	146 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	147 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	148 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	149
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	150 PyObject *
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	151 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	152 {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	153 va_list count = vargs;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	154 int n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	155 const char* f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	156 char *s;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	157 PyObject* string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	158
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	159 /* 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	160 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	161 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	162 const char* p = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	163 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	164 ;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	165
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	166 /* 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	167 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	168 "expand" section below), others can be easily
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	169 add */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	170 if (f == 'l' && (f+1) == 'd')
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	171 ++f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	172
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	173 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	174 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	175 (void)va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	176 /* fall through... */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	177 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	178 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	179 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	180 case 'd': case 'i': case 'x':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	181 (void) va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	182 /* 20 bytes should be enough to hold a 64-bit
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	183 integer */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	184 n += 20;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	185 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	186 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	187 s = va_arg(count, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	188 n += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	189 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	190 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	191 (void) va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	192 /* maximum 64-bit pointer representation:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	193 * 0xffffffffffffffff
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	194 * so 19 characters is enough.
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	195 */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	196 n += 19;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	197 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	198 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	199 /* if we stumble upon an unknown
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	200 formatting code, copy the rest of
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	201 the format string to the output
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	202 string. (we cannot just skip the
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	203 code, since there's no way to know
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	204 what's in the argument list) */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	205 n += strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	206 goto expand;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	207 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	208 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	209 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	210 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	211 expand:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	212 /* step 2: fill the buffer */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	213 string = PyString_FromStringAndSize(NULL, n);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	214 if (!string)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	215 return NULL;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	216
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	217 s = PyString_AsString(string);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	218
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	219 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	220 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	221 const char* p = f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	222 int i, longflag = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	223 /* 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	224 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	225 n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	226 while (isdigit(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	227 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	228 if (*f == '.') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	229 f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	230 n = 0;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	231 while (isdigit(Py_CHARMASK(*f)))
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	232 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	233 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	234 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	235 f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	236 /* 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	237 can be added when necessary. */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	238 if (f == 'l' && (f+1) == 'd') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	239 longflag = 1;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	240 ++f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	241 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	242
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	243 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	244 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	245 *s++ = va_arg(vargs, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	246 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	247 case 'd':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	248 if (longflag)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	249 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	250 else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	251 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	252 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	253 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	254 case 'i':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	255 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	256 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	257 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	258 case 'x':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	259 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	260 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	261 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	262 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	263 p = va_arg(vargs, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	264 i = strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	265 if (n > 0 && i > n)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	266 i = n;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	267 memcpy(s, p, i);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	268 s += i;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	269 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	270 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	271 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	272 /* %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	273 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	274 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	275 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	276 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	277 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	278 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	279 }
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	280 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	281 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	282 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	283 *s++ = '%';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	284 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	285 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	286 strcpy(s, p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	287 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	288 goto end;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	289 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	290 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	291 s++ = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	292 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	293
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	294 end:
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	295 _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	296 return string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	297 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	298
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	299 PyObject *
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	300 PyString_FromFormat(const char *format, ...)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	301 {
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	302 PyObject* ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	303 va_list vargs;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	304
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	305 #ifdef HAVE_STDARG_PROTOTYPES
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	306 va_start(vargs, format);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	307 #else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	308 va_start(vargs);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	309 #endif
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	310 ret = PyString_FromFormatV(format, vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	311 va_end(vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	312 return ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	313 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	314
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	315
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	316 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	317 int size,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	318 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	319 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	320 {
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	321 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	322
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	323 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	324 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	325 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	326 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	327 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	328 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	329 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	330
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	331 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	332 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	333 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	334 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	335 PyObject *v;
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 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	338 PyErr_BadArgument();
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	339 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	340 }
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	341
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	342 if (encoding == NULL) {
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	343 #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	344 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	345 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	346 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	347 goto onError;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	348 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	349 }
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	350
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	351 /* 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	352 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	353 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	354 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	355
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	356 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	357
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	358 onError:
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	359 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	360 }
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 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	363 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	364 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	365 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	366 PyObject *v;
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 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	369 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	370 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	371
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	372 #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	373 /* 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	374 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	375 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	376 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	377 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	378 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	379 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	380 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	381 #endif
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	382 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	383 PyErr_Format(PyExc_TypeError,
13561 ea732719b3fd Fix typo in error message Andrew M. Kuchling <amk@amk.ca> parents: 13544 diff changeset	384 "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	385 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	386 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	387 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	388 }
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	389
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	390 return v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	391
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	392 onError:
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	393 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	394 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	395
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	396 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	397 int size,
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	398 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	399 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	400 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	401 PyObject v, str;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	402
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	403 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	404 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	405 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	406 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	407 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	408 return v;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	409 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	410
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	411 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	412 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	413 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	414 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	415 PyObject *v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	416
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	417 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	418 PyErr_BadArgument();
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	419 goto onError;
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
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	422 if (encoding == NULL) {
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	423 #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	424 encoding = PyUnicode_GetDefaultEncoding();
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	425 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	426 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	427 goto onError;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	428 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	429 }
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	430
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	431 /* 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	432 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	433 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	434 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	435
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	436 return v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	437
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	438 onError:
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	439 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	440 }
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 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	443 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	444 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	445 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	446 PyObject *v;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	447
18086 592109f2a6fd Fix for bug #432384: Recursion in PyString_AsEncodedString? Marc-André Lemburg <mal@egenix.com> parents: 17964 diff changeset	448 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	449 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	450 goto onError;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	451
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	452 #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	453 /* 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	454 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	455 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	456 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	457 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	458 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	459 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	460 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	461 #endif
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	462 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	463 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	464 "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	465 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	466 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	467 goto onError;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	468 }
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	469
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	470 return v;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	471
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	472 onError:
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	473 return NULL;
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	474 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	475
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1282 diff changeset	476 static void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	477 string_dealloc(PyObject *op)
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	478 {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	479 PyObject_DEL(op);
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	480 }
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	481
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	482 static int
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	483 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	484 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	485 char *s;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	486 int len;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	487 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	488 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	489 return len;
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
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	492 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	493 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	494 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	495 char *s;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	496 int len;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	497 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	498 return NULL;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	499 return s;
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
2053 de49d49044d7 Lots of minor changes. Note for mappingobject.c: the hash table pointer Guido van Rossum <guido@python.org> parents: 1908 diff changeset	502 int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	503 PyString_Size(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	504 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	505 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	506 return string_getsize(op);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	507 return ((PyStringObject *)op) -> ob_size;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	508 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	509
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	510 /const/ char *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	511 PyString_AsString(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	512 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	513 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	514 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	515 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	516 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	517
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	518 int
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	519 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	520 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	521 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	522 {
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	523 if (s == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	524 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	525 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	526 }
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	527
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	528 if (!PyString_Check(obj)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	529 #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	530 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	531 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	532 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	533 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	534 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	535 else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	536 #endif
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	537 {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	538 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	539 "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	540 "%.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	541 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	542 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	543 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	544
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	545 *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	546 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	547 *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	548 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	549 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	550 "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	551 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	552 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	553 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	554 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	555
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	556 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	557
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	558 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	559 string_print(PyStringObject op, FILE fp, int flags)
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 int i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	562 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	563 int quote;
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	564 /* XXX Ought to check for interrupts when writing long strings */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	565 if (flags & Py_PRINT_RAW) {
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	566 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	567 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	568 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	569
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	570 /* 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	571 quote = '\'';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	572 if (strchr(op->ob_sval, '\'') && !strchr(op->ob_sval, '"'))
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	573 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	574
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	575 fputc(quote, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	576 for (i = 0; i < op->ob_size; i++) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	577 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	578 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	579 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	580 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	581 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	582 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	583 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	584 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	585 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	586 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	587 fprintf(fp, "\\x%02x", c & 0xff);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	588 else
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	589 fputc(c, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	590 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	591 fputc(quote, fp);
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	592 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	593 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	594
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	595 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	596 string_repr(register PyStringObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	597 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	598 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	599 PyObject *v;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	600 if (newsize > INT_MAX) {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	601 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	602 "string is too large to make repr");
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	603 }
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	604 v = PyString_FromStringAndSize((char *)NULL, newsize);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	605 if (v == NULL) {
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	606 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	607 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	608 else {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	609 register int i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	610 register char c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	611 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	612 int quote;
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	613
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	614 /* 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	615 quote = '\'';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	616 if (strchr(op->ob_sval, '\'') && !strchr(op->ob_sval, '"'))
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	617 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	618
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	619 p = ((PyStringObject *)v)->ob_sval;
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	620 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	621 for (i = 0; i < op->ob_size; i++) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	622 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	623 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	624 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	625 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	626 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	627 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	628 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	629 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	630 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	631 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	632 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	633 p += 4;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	634 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	635 else
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	636 *p++ = c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	637 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	638 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	639 *p = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	640 _PyString_Resize(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	641 &v, (int) (p - ((PyStringObject *)v)->ob_sval));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	642 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	643 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	644 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	645
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	646 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	647 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	648 {
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	649 Py_INCREF(s);
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	650 return s;
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	651 }
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	652
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	653 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	654 string_length(PyStringObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	655 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	656 return a->ob_size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	657 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	658
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	659 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	660 string_concat(register PyStringObject a, register PyObject bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	661 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	662 register unsigned int size;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	663 register PyStringObject *op;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	664 if (!PyString_Check(bb)) {
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	665 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	666 if (PyUnicode_Check(bb))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	667 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	668 #endif
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	669 PyErr_Format(PyExc_TypeError,
12816 4272b368bf69 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12615 diff changeset	670 "cannot add type \"%.200s\" to string",
4272b368bf69 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12615 diff changeset	671 bb->ob_type->tp_name);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	672 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	673 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	674 #define b ((PyStringObject *)bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	675 /* 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	676 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	677 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	678 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	679 Py_INCREF(bb);
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	680 return bb;
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	681 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	682 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	683 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	684 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	685 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	686 /* PyObject_NewVar is inlined */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	687 op = (PyStringObject *)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	688 PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	689 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	690 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	691 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	692 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	693 op->ob_shash = -1;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	694 #endif
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	695 #ifdef INTERN_STRINGS
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	696 op->ob_sinterned = NULL;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	697 #endif
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	698 memcpy(op->ob_sval, a->ob_sval, (int) a->ob_size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	699 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	700 op->ob_sval[size] = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	701 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	702 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	703 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	704
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	705 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	706 string_repeat(register PyStringObject *a, register int n)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	707 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	708 register int i;
5288 0f1711b7d367 Tweaks to keep the Microsoft compiler quiet. Guido van Rossum <guido@python.org> parents: 5098 diff changeset	709 register int size;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	710 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	711 size_t nbytes;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	712 if (n < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	713 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	714 /* 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	715 * 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	716 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	717 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	718 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	719 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	720 "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	721 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	722 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	723 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	724 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	725 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	726 }
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	727 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	728 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	729 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	730 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	731 "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	732 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	733 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	734 op = (PyStringObject *)
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	735 PyObject_MALLOC(sizeof(PyStringObject) + nbytes);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	736 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	737 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	738 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	739 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	740 op->ob_shash = -1;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	741 #endif
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	742 #ifdef INTERN_STRINGS
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	743 op->ob_sinterned = NULL;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	744 #endif
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	745 for (i = 0; i < size; i += a->ob_size)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	746 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	747 op->ob_sval[size] = '\0';
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	748 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	749 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	750
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	751 /* 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	752
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	753 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	754 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	755 /* j -- may be negative! */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	756 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	757 if (i < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	758 i = 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	759 if (j < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	760 j = 0; /* Avoid signed/unsigned bug in next line */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	761 if (j > a->ob_size)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	762 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	763 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	764 /* It's the same as a */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	765 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	766 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	767 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	768 if (j < i)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	769 j = i;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	770 return PyString_FromStringAndSize(a->ob_sval + i, (int) (j-i));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	771 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	772
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	773 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	774 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	775 {
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	776 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	777 register char c;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	778 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	779 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	780 return PyUnicode_Contains(a, el);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	781 #endif
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	782 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	783 PyErr_SetString(PyExc_TypeError,
12902 98eb3059ae76 Patch from Michael Hudson: improve unclear error message Andrew M. Kuchling <amk@amk.ca> parents: 12816 diff changeset	784 "'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	785 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	786 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	787 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	788 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	789 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	790 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	791 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	792 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	793 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	794 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	795 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	796
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	797 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	798 string_item(PyStringObject *a, register int i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	799 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	800 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	801 char *pchar;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	802 if (i < 0 \|\| i >= a->ob_size) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	803 PyErr_SetString(PyExc_IndexError, "string index out of range");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	804 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	805 }
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	806 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	807 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	808 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	809 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	810 else {
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	811 #ifdef COUNT_ALLOCS
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	812 one_strings++;
2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	813 #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	814 Py_INCREF(v);
17712 2a7cfc172a68 Ack! Restore the COUNT_ALLOCS one_strings code. Tim Peters <tim.peters@gmail.com> parents: 17711 diff changeset	815 }
180 a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	816 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	817 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	818
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	819 static PyObject*
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	820 string_richcompare(PyStringObject a, PyStringObject b, int op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	821 {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	822 int c;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	823 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	824 int min_len;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	825 PyObject *result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	826
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	827 /* One of the objects is a string object. Make sure the
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	828 other one is one, too. */
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	829 if (a->ob_type != b->ob_type) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	830 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	831 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	832 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	833 if (a == b) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	834 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	835 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	836 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	837 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	838 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	839 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	840 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	841 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	842 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	843 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	844 /* 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	845 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	846 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	847 && (a->ob_sval[0] == b->ob_sval[0]
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	848 && memcmp(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	849 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	850 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	851 } else {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	852 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	853 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	854 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	855 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	856 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	857 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	858 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	859 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	860 if (c==0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	861 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	862 }else
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	863 c = 0;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	864 if (c == 0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	865 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	866 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	867 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	868 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	869 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	870 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	871 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	872 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	873 default:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	874 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	875 goto out;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	876 }
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	877 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	878 out:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	879 Py_INCREF(result);
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	880 return result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	881 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	882
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	883 int
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	884 _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	885 {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	886 PyStringObject a, b;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	887 a = (PyStringObject*)o1;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	888 b = (PyStringObject*)o2;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	889 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	890 && 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	891 && memcmp(a->ob_sval, b->ob_sval, a->ob_size) == 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	892 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	893
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	894 static long
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	895 string_hash(PyStringObject *a)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	896 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	897 register int len;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	898 register unsigned char *p;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	899 register long x;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	900
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	901 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	902 if (a->ob_shash != -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	903 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	904 #ifdef INTERN_STRINGS
a44586bd9fab Slight tweak: in string_hash(), if the hash hasn't been computed yet, Guido van Rossum <guido@python.org> parents: 5057 diff changeset	905 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	906 return (a->ob_shash =
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	907 ((PyStringObject *)(a->ob_sinterned))->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	908 #endif
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	909 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	910 len = a->ob_size;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	911 p = (unsigned char *) a->ob_sval;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	912 x = *p << 7;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	913 while (--len >= 0)
4283 839f72610ae1 Multiply by 1000003 instead of 3 in string hach Guido van Rossum <guido@python.org> parents: 3586 diff changeset	914 x = (1000003x) ^ p++;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	915 x ^= a->ob_size;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	916 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	917 x = -2;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	918 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	919 a->ob_shash = x;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	920 #endif
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	921 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	922 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	923
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	924 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	925 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	926 {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	927 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	928 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	929 "accessing non-existent string segment");
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	930 return -1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	931 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	932 ptr = (void )self->ob_sval;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	933 return self->ob_size;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	934 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	935
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	936 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	937 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	938 {
6286 82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	939 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	940 "Cannot use string as modifiable buffer");
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	941 return -1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	942 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	943
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	944 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	945 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	946 {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	947 if ( lenp )
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	948 *lenp = self->ob_size;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	949 return 1;
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	950 }
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	951
9305 083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	952 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	953 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	954 {
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	955 if ( index != 0 ) {
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	956 PyErr_SetString(PyExc_SystemError,
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	957 "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	958 return -1;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	959 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	960 *ptr = self->ob_sval;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	961 return self->ob_size;
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	962 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	963
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	964 static PySequenceMethods string_as_sequence = {
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	965 (inquiry)string_length, /sq_length/
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	966 (binaryfunc)string_concat, /sq_concat/
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	967 (intargfunc)string_repeat, /sq_repeat/
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	968 (intargfunc)string_item, /sq_item/
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	969 (intintargfunc)string_slice, /sq_slice/
259 6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	970 0, /sq_ass_item/
6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	971 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	972 (objobjproc)string_contains /sq_contains/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	973 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	974
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	975 static PyBufferProcs string_as_buffer = {
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	976 (getreadbufferproc)string_buffer_getreadbuf,
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	977 (getwritebufferproc)string_buffer_getwritebuf,
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	978 (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	979 (getcharbufferproc)string_buffer_getcharbuf,
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	980 };
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	981
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	982
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	983
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	984 #define LEFTSTRIP 0
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	985 #define RIGHTSTRIP 1
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	986 #define BOTHSTRIP 2
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	987
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	988
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	989 static PyObject *
13460 e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	990 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	991 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	992 int i, j, err;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	993 PyObject* item;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	994 PyObject *list = PyList_New(0);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	995
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	996 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	997 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	998
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	999 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	1000 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	1001 i++;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1002 j = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1003 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	1004 i++;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1005 if (j < i) {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1006 if (maxsplit-- <= 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1007 break;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1008 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	1009 if (item == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1010 goto finally;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1011 err = PyList_Append(list, item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1012 Py_DECREF(item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1013 if (err < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1014 goto finally;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1015 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	1016 i++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1017 j = i;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1018 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1019 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1020 if (j < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1021 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	1022 if (item == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1023 goto finally;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1024 err = PyList_Append(list, item);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1025 Py_DECREF(item);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1026 if (err < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1027 goto finally;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1028 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1029 return list;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1030 finally:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1031 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1032 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1033 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1034
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1035
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1036 static char split__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1037 "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	1038 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1039 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	1040 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	1041 splits are done. If sep is not specified, any whitespace string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1042 is a separator.";
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1043
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1044 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1045 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	1046 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1047 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	1048 int maxsplit = -1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1049 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	1050 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	1051
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1052 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	1053 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1054 if (maxsplit < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1055 maxsplit = INT_MAX;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1056 if (subobj == Py_None)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1057 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	1058 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1059 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1060 n = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1061 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1062 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1063 else if (PyUnicode_Check(subobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1064 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	1065 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1066 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	1067 return NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1068 if (n == 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1069 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	1070 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1071 }
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 list = PyList_New(0);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1074 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1075 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1076
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1077 i = j = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1078 while (i+n <= len) {
12966 447efb64c72d Fredrik Lundh <effbot@telia.com>: Fred Drake <fdrake@acm.org> parents: 12924 diff changeset	1079 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	1080 if (maxsplit-- <= 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1081 break;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1082 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	1083 if (item == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1084 goto fail;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1085 err = PyList_Append(list, item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1086 Py_DECREF(item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1087 if (err < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1088 goto fail;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1089 i = j = i + n;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1090 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1091 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1092 i++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1093 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1094 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	1095 if (item == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1096 goto fail;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1097 err = PyList_Append(list, item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1098 Py_DECREF(item);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1099 if (err < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1100 goto fail;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1101
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1102 return list;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1103
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1104 fail:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1105 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1106 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1107 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1108
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1109
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1110 static char join__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1111 "S.join(sequence) -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1112 \n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1113 Return a string which is the concatenation of the strings in the\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1114 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	1115
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1116 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	1117 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	1118 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1119 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	1120 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	1121 PyObject *res = NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1122 char *p;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1123 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	1124 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	1125 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	1126 PyObject seq, item;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1127
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1128 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	1129 if (seq == NULL) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1130 if (PyErr_ExceptionMatches(PyExc_TypeError))
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1131 PyErr_Format(PyExc_TypeError,
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1132 "sequence expected, %.80s found",
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1133 orig->ob_type->tp_name);
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1134 return NULL;
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1135 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1136
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13561 diff changeset	1137 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	1138 if (seqlen == 0) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1139 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1140 return PyString_FromString("");
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1141 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1142 if (seqlen == 1) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1143 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	1144 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	1145 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	1146 "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	1147 " %.80s found",
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1148 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	1149 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1150 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1151 }
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1152 Py_INCREF(item);
13528 e848d6ed3eb9 string_join(): Some cleaning up of reference counting. In the Barry Warsaw <barry@python.org> parents: 13526 diff changeset	1153 Py_DECREF(seq);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1154 return item;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1155 }
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1156
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1157 /* 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	1158 * 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	1159 * 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	1160 */
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1161 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	1162 const size_t old_sz = sz;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1163 item = PySequence_Fast_GET_ITEM(seq, i);
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1164 if (!PyString_Check(item)){
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1165 #ifdef Py_USING_UNICODE
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1166 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	1167 /* 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	1168 * 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	1169 * 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	1170 * 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	1171 */
9e093bf8f6a9 Make unicode.join() work nice with iterators. This also required a change Tim Peters <tim.peters@gmail.com> parents: 17655 diff changeset	1172 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	1173 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	1174 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	1175 return result;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1176 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1177 #endif
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1178 PyErr_Format(PyExc_TypeError,
13544 3cf4f5aee00e small updates to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13528 diff changeset	1179 "sequence item %i: expected string,"
3cf4f5aee00e small updates to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13528 diff changeset	1180 " %.80s found",
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1181 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	1182 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1183 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1184 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1185 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	1186 if (i != 0)
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1187 sz += seplen;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1188 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	1189 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	1190 "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	1191 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1192 return NULL;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1193 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1194 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1195
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1196 /* Allocate result space. */
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1197 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	1198 if (res == NULL) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1199 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1200 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1201 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1202
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1203 /* Catenate everything. */
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1204 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	1205 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	1206 size_t n;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1207 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	1208 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	1209 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	1210 p += n;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1211 if (i < seqlen - 1) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1212 memcpy(p, sep, seplen);
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1213 p += seplen;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1214 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1215 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1216
13526 3686d12362b8 fix two refcount bugs in new string_join implementation: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13524 diff changeset	1217 Py_DECREF(seq);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1218 return res;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1219 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1220
18130 8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1221 PyObject *
8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1222 _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	1223 {
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1224 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	1225 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	1226 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	1227 }
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1228
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1229 static long
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1230 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	1231 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1232 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	1233 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	1234 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	1235 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1236
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1237 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	1238 &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	1239 return -2;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1240 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1241 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1242 n = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1243 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1244 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1245 else if (PyUnicode_Check(subobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1246 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	1247 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1248 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	1249 return -2;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1250
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1251 if (last > len)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1252 last = len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1253 if (last < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1254 last += len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1255 if (last < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1256 last = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1257 if (i < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1258 i += len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1259 if (i < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1260 i = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1261
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1262 if (dir > 0) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1263 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	1264 return (long)i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1265 last -= n;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1266 for (; i <= last; ++i)
12966 447efb64c72d Fredrik Lundh <effbot@telia.com>: Fred Drake <fdrake@acm.org> parents: 12924 diff changeset	1267 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	1268 return (long)i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1269 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1270 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1271 int j;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1272
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1273 if (n == 0 && i <= last)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1274 return (long)last;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1275 for (j = last-n; j >= i; --j)
12966 447efb64c72d Fredrik Lundh <effbot@telia.com>: Fred Drake <fdrake@acm.org> parents: 12924 diff changeset	1276 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	1277 return (long)j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1278 }
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1279
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1280 return -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1281 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1282
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1283
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1284 static char find__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1285 "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	1286 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1287 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	1288 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	1289 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	1290 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1291 Return -1 on failure.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1292
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1293 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1294 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	1295 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1296 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	1297 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1298 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1299 return PyInt_FromLong(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1300 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1301
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1302
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1303 static char index__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1304 "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	1305 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1306 Like S.find() but raise ValueError when the substring is not found.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1307
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1308 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1309 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	1310 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1311 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	1312 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1313 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1314 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1315 PyErr_SetString(PyExc_ValueError,
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1316 "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	1317 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1318 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1319 return PyInt_FromLong(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1320 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1321
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1322
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1323 static char rfind__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1324 "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	1325 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1326 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	1327 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	1328 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	1329 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1330 Return -1 on failure.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1331
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1332 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1333 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	1334 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1335 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	1336 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1337 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1338 return PyInt_FromLong(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1339 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1340
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1341
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1342 static char rindex__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1343 "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	1344 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1345 Like S.rfind() but raise ValueError when the substring is not found.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1346
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1347 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1348 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	1349 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1350 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	1351 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1352 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1353 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1354 PyErr_SetString(PyExc_ValueError,
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1355 "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	1356 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1357 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1358 return PyInt_FromLong(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1359 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1360
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1361
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1362 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	1363 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	1364 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1365 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	1366 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	1367
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1368 i = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1369 if (striptype != RIGHTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1370 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	1371 i++;
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 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1374
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1375 j = len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1376 if (striptype != LEFTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1377 do {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1378 j--;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1379 } 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	1380 j++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1381 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1382
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1383 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	1384 Py_INCREF(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1385 return (PyObject*)self;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1386 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1387 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1388 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	1389 }
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 static char strip__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1393 "S.strip() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1394 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1395 Return a copy of the string S with leading and trailing\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1396 whitespace removed.";
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 *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1399 string_strip(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1400 {
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1401 return do_strip(self, BOTHSTRIP);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1402 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1403
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1404
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1405 static char lstrip__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1406 "S.lstrip() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1407 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1408 Return a copy of the string S with leading whitespace removed.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1409
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1410 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	1411 string_lstrip(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1412 {
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1413 return do_strip(self, LEFTSTRIP);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1414 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1415
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1416
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1417 static char rstrip__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1418 "S.rstrip() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1419 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1420 Return a copy of the string S with trailing whitespace removed.";
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 *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1423 string_rstrip(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1424 {
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1425 return do_strip(self, RIGHTSTRIP);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1426 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1427
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1428
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1429 static char lower__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1430 "S.lower() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1431 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1432 Return a copy of the string S converted to lowercase.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1433
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1434 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	1435 string_lower(PyStringObject *self)
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 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	1438 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	1439 PyObject *new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1440
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1441 new = PyString_FromStringAndSize(NULL, n);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1442 if (new == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1443 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1444 s_new = PyString_AsString(new);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1445 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	1446 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1447 if (isupper(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1448 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1449 } else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1450 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1451 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1452 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1453 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1454 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1455
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1456
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1457 static char upper__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1458 "S.upper() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1459 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1460 Return a copy of the string S converted to uppercase.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1461
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1462 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	1463 string_upper(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1464 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1465 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	1466 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	1467 PyObject *new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1468
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1469 new = PyString_FromStringAndSize(NULL, n);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1470 if (new == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1471 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1472 s_new = PyString_AsString(new);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1473 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	1474 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1475 if (islower(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1476 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1477 } else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1478 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1479 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1480 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1481 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1482 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1483
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1484
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1485 static char title__doc__[] =
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1486 "S.title() -> string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1487 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1488 Return a titlecased version of S, i.e. words start with uppercase\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1489 characters, all remaining cased characters have lowercase.";
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1490
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1491 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	1492 string_title(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1493 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1494 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	1495 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	1496 int previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1497 PyObject *new;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1498
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1499 new = PyString_FromStringAndSize(NULL, n);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1500 if (new == NULL)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1501 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1502 s_new = PyString_AsString(new);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1503 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	1504 int c = Py_CHARMASK(*s++);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1505 if (islower(c)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1506 if (!previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1507 c = toupper(c);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1508 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1509 } else if (isupper(c)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1510 if (previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1511 c = tolower(c);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1512 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1513 } else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1514 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1515 *s_new++ = c;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1516 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1517 return new;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1518 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1519
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1520 static char capitalize__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1521 "S.capitalize() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1522 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1523 Return a copy of the string S with only its first character\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1524 capitalized.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1525
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1526 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	1527 string_capitalize(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1528 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1529 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	1530 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	1531 PyObject *new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1532
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1533 new = PyString_FromStringAndSize(NULL, n);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1534 if (new == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1535 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1536 s_new = PyString_AsString(new);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1537 if (0 < n) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1538 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1539 if (islower(c))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1540 *s_new = toupper(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1541 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1542 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1543 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1544 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1545 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	1546 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1547 if (isupper(c))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1548 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1549 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1550 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1551 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1552 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1553 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1554 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1555
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1556
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1557 static char count__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1558 "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	1559 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1560 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	1561 S[start:end]. Optional arguments start and end are\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1562 interpreted as in slice notation.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1563
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1564 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1565 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	1566 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1567 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	1568 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	1569 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	1570 int m, r;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1571 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1572
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	1573 if (!PyArg_ParseTuple(args, "O\|O&O&:count", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	1574 _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	1575 return NULL;
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	1576
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1577 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1578 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1579 n = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1580 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1581 #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	1582 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	1583 int count;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1584 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	1585 if (count == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1586 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1587 else
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	1588 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	1589 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1590 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1591 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	1592 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1593
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1594 if (last > len)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1595 last = len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1596 if (last < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1597 last += len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1598 if (last < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1599 last = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1600 if (i < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1601 i += len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1602 if (i < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1603 i = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1604 m = last + 1 - n;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1605 if (n == 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1606 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	1607
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1608 r = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1609 while (i < m) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1610 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	1611 r++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1612 i += n;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1613 } else {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1614 i++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1615 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1616 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1617 return PyInt_FromLong((long) r);
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
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1620
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1621 static char swapcase__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1622 "S.swapcase() -> string\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1623 \n\
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1624 Return a copy of the string S with uppercase characters\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1625 converted to lowercase and vice versa.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1626
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1627 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	1628 string_swapcase(PyStringObject *self)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1629 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1630 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	1631 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	1632 PyObject *new;
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 new = PyString_FromStringAndSize(NULL, n);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1635 if (new == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1636 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1637 s_new = PyString_AsString(new);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1638 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	1639 int c = Py_CHARMASK(*s++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1640 if (islower(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1641 *s_new = toupper(c);
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 else if (isupper(c)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1644 *s_new = tolower(c);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1645 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1646 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1647 *s_new = c;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1648 s_new++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1649 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1650 return new;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1651 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1652
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1653
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1654 static char translate__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1655 "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	1656 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1657 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	1658 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	1659 remaining characters have been mapped through the given\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1660 translation table, which must be a string of length 256.";
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 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1663 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	1664 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1665 register char input, output;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1666 register const char *table;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1667 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	1668 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	1669 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	1670 int inlen, tablen, dellen = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1671 PyObject *result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1672 int trans_table[256];
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1673 PyObject tableobj, delobj = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1674
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1675 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	1676 &tableobj, &delobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1677 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1678
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1679 if (PyString_Check(tableobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1680 table1 = PyString_AS_STRING(tableobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1681 tablen = PyString_GET_SIZE(tableobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1682 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1683 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1684 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	1685 /* 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	1686 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	1687 to be deleted. */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1688 if (delobj != NULL) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1689 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1690 "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	1691 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1692 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1693 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	1694 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1695 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1696 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	1697 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1698
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1699 if (delobj != NULL) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1700 if (PyString_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1701 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	1702 dellen = PyString_GET_SIZE(delobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1703 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1704 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1705 else if (PyUnicode_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1706 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1707 "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	1708 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1709 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1710 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1711 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	1712 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1713
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1714 if (tablen != 256) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1715 PyErr_SetString(PyExc_ValueError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1716 "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	1717 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1718 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1719 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1720 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1721 del_table = NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1722 dellen = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1723 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1724
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1725 table = table1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1726 inlen = PyString_Size(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1727 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	1728 if (result == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1729 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1730 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	1731 input = PyString_AsString(input_obj);
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 if (dellen == 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1734 /* 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	1735 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1736 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1737 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	1738 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1739 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1740 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	1741 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1742 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1743 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1744 return input_obj;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1745 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1746
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1747 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	1748 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	1749
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1750 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	1751 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	1752
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1753 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1754 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1755 if (trans_table[c] != -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1756 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	1757 continue;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1758 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1759 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1760 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	1761 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1762 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1763 return input_obj;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1764 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1765 /* Fix the size of the resulting string */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1766 if (inlen > 0 &&_PyString_Resize(&result, output-output_start))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1767 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1768 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1769 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1770
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1771
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1772 /* 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	1773
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1774 /*
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1775 mymemfind
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1776
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1777 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	1778
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11998 diff changeset	1779 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	1780 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	1781 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	1782 MEM, the function returns -1.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1783 */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1784 static int
13460 e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	1785 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	1786 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1787 register int ii;
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 /* 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	1790 len -= pat_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1791
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1792 for (ii = 0; ii <= len; ii++) {
12966 447efb64c72d Fredrik Lundh <effbot@telia.com>: Fred Drake <fdrake@acm.org> parents: 12924 diff changeset	1793 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	1794 return ii;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1795 }
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 return -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1798 }
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 /*
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1801 mymemcnt
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1802
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1803 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	1804 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	1805 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	1806 */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	1807 static int
13460 e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	1808 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	1809 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1810 register int offset = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1811 int nfound = 0;
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 while (len >= 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1814 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	1815 if (offset == -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1816 break;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1817 mem += offset + pat_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1818 len -= offset + pat_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1819 nfound++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1820 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1821 return nfound;
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
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1824 /*
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1825 mymemreplace
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1826
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	1827 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	1828 replaced with SUB.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1829
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	1830 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	1831 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	1832 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	1833
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1834 on return, out_len is:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1835 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	1836 -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	1837 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	1838
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1839 return value is:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1840 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	1841 NULL if an error occurred.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1842 */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1843 static char *
13460 e6d17f15ae6a Somebody started playing with const, so of course the outcome Tim Peters <tim.peters@gmail.com> parents: 13459 diff changeset	1844 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	1845 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	1846 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	1847 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	1848 int *out_len)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1849 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1850 char *out_s;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1851 char *new_s;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1852 int nfound, offset, new_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1853
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1854 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	1855 goto return_same;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1856
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1857 /* find length of output string */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1858 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	1859 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	1860 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	1861 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	1862 nfound = count;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1863 if (nfound == 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1864 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	1865
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1866 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	1867 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	1868 /* 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	1869 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	1870 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	1871 return NULL;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1872 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	1873 }
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1874 else {
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1875 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	1876 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	1877 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	1878 return NULL;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1879 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	1880
17751 c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	1881 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	1882 /* 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	1883 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	1884 if (offset == -1)
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1885 break;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1886
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1887 /* 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	1888 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	1889 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	1890 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	1891
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1892 /* 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	1893 new_s += offset;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1894 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	1895 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	1896 }
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1897 /* 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	1898 if (len > 0)
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	1899 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	1900 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1901 *out_len = new_len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1902 return out_s;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1903
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1904 return_same:
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1905 *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	1906 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	1907 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1908
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1909
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1910 static char replace__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1911 "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	1912 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1913 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	1914 old replaced by new. If the optional argument maxsplit is\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1915 given, only the first maxsplit occurrences are replaced.";
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 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1918 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	1919 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1920 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	1921 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	1922 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	1923 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	1924 int count = -1;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1925 PyObject *new;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1926 PyObject subobj, replobj;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1927
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1928 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	1929 &subobj, &replobj, &count))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1930 return NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1931
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1932 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1933 sub = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1934 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	1935 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1936 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1937 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	1938 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	1939 subobj, replobj, count);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1940 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1941 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	1942 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1943
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1944 if (PyString_Check(replobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1945 repl = PyString_AS_STRING(replobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1946 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	1947 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1948 #ifdef Py_USING_UNICODE
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1949 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	1950 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	1951 subobj, replobj, count);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	1952 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1953 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	1954 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1955
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	1956 if (sub_len <= 0) {
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11998 diff changeset	1957 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	1958 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1959 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1960 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	1961 if (new_s == NULL) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1962 PyErr_NoMemory();
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1963 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1964 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1965 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	1966 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	1967 /* 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	1968 new = (PyObject*)self;
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1969 Py_INCREF(new);
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1970 }
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1971 else {
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1972 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	1973 if (new == NULL)
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1974 return NULL;
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1975 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1976 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1977 else {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1978 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	1979 PyMem_FREE(new_s);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1980 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1981 return new;
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
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1984
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1985 static char startswith__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1986 "S.startswith(prefix[, start[, end]]) -> int\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1987 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1988 Return 1 if S starts with the specified prefix, otherwise return 0. With\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1989 optional start, test S beginning at that position. With optional end, stop\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1990 comparing S at that position.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1991
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1992 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1993 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	1994 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1995 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	1996 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	1997 const char* prefix;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1998 int plen;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1999 int start = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2000 int end = -1;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2001 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2002
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2003 if (!PyArg_ParseTuple(args, "O\|O&O&:startswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2004 _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	2005 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2006 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2007 prefix = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2008 plen = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2009 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2010 #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	2011 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	2012 int rc;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2013 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	2014 subobj, start, end, -1);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2015 if (rc == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2016 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2017 else
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2018 return PyInt_FromLong((long) rc);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2019 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2020 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2021 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	2022 return NULL;
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 /* adopt Java semantics for index out of range. it is legal for
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2025 * offset to be == plen, but this only returns true if prefix is
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2026 * the empty string.
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2027 */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2028 if (start < 0 \|\| start+plen > len)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2029 return PyInt_FromLong(0);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2030
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2031 if (!memcmp(str+start, prefix, plen)) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2032 /* did the match end after the specified end? */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2033 if (end < 0)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2034 return PyInt_FromLong(1);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2035 else if (end - start < plen)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2036 return PyInt_FromLong(0);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2037 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2038 return PyInt_FromLong(1);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2039 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2040 else return PyInt_FromLong(0);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2041 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2042
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2043
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2044 static char endswith__doc__[] =
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2045 "S.endswith(suffix[, start[, end]]) -> int\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2046 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2047 Return 1 if S ends with the specified suffix, otherwise return 0. With\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2048 optional start, test S beginning at that position. With optional end, stop\n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2049 comparing S at that position.";
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2050
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2051 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2052 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	2053 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2054 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	2055 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	2056 const char* suffix;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2057 int slen;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2058 int start = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2059 int end = -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2060 int lower, upper;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2061 PyObject *subobj;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2062
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2063 if (!PyArg_ParseTuple(args, "O\|O&O&:endswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2064 _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	2065 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2066 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2067 suffix = PyString_AS_STRING(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2068 slen = PyString_GET_SIZE(subobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2069 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2070 #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	2071 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	2072 int rc;
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2073 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	2074 subobj, start, end, +1);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2075 if (rc == -1)
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2076 return NULL;
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2077 else
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2078 return PyInt_FromLong((long) rc);
f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2079 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	2080 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2081 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	2082 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2083
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2084 if (start < 0 \|\| start > len \|\| slen > len)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2085 return PyInt_FromLong(0);
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 upper = (end >= 0 && end <= len) ? end : len;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2088 lower = (upper - slen) > start ? (upper - slen) : start;
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 if (upper-lower >= slen && !memcmp(str+lower, suffix, slen))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2091 return PyInt_FromLong(1);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2092 else return PyInt_FromLong(0);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2093 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2094
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2095
13377 2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2096 static char 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	2097 "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	2098 \n\
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2099 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	2100 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	2101 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2102 a ValueError. Other possible values are 'ignore' and 'replace'.";
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2103
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2104 static PyObject *
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2105 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	2106 {
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2107 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	2108 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	2109 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	2110 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	2111 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	2112 }
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2113
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2114
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2115 static char decode__doc__[] =
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2116 "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	2117 \n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2118 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	2119 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	2120 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2121 a ValueError. Other possible values are 'ignore' and 'replace'.";
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2122
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2123 static PyObject *
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2124 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	2125 {
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2126 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	2127 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	2128 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	2129 return NULL;
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2130 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	2131 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2132
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2133
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2134 static char expandtabs__doc__[] =
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2135 "S.expandtabs([tabsize]) -> string\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2136 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2137 Return a copy of S where all tab characters are expanded using spaces.\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2138 If tabsize is not given, a tab size of 8 characters is assumed.";
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2139
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2140 static PyObject*
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2141 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	2142 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2143 const char e, p;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2144 char *q;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2145 int i, j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2146 PyObject *u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2147 int tabsize = 8;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2148
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2149 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	2150 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2151
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	2152 /* 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	2153 i = j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2154 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	2155 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	2156 if (*p == '\t') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2157 if (tabsize > 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2158 j += tabsize - (j % tabsize);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2159 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2160 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2161 j++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2162 if (p == '\n' \|\| p == '\r') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2163 i += j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2164 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2165 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2166 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2167
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2168 /* 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	2169 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	2170 if (!u)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2171 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2172
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2173 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2174 q = PyString_AS_STRING(u);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2175
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2176 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	2177 if (*p == '\t') {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2178 if (tabsize > 0) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2179 i = tabsize - (j % tabsize);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2180 j += i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2181 while (i--)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2182 *q++ = ' ';
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2183 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2184 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2185 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2186 j++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2187 q++ = p;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2188 if (p == '\n' \|\| p == '\r')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2189 j = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2190 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2191
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2192 return u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2193 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2194
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2195 static PyObject *
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2196 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	2197 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2198 PyObject *u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2199
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2200 if (left < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2201 left = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2202 if (right < 0)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2203 right = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2204
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2205 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	2206 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2207 return (PyObject *)self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2208 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2209
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2210 u = PyString_FromStringAndSize(NULL,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2211 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	2212 if (u) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2213 if (left)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2214 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	2215 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	2216 PyString_AS_STRING(self),
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2217 PyString_GET_SIZE(self));
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2218 if (right)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2219 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	2220 fill, right);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2221 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2222
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2223 return u;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2224 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2225
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2226 static char ljust__doc__[] =
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2227 "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	2228 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2229 "Return S left justified in a string of length width. Padding is\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2230 "done using spaces.";
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2231
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2232 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2233 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	2234 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2235 int width;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2236 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	2237 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2238
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2239 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	2240 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2241 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2242 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2243
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2244 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	2245 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2246
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2247
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2248 static char rjust__doc__[] =
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2249 "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	2250 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2251 "Return S right justified in a string of length width. Padding is\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2252 "done using spaces.";
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2253
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2254 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2255 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	2256 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2257 int width;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2258 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	2259 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2260
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2261 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	2262 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2263 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2264 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2265
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2266 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	2267 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2268
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2269
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2270 static char center__doc__[] =
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2271 "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	2272 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2273 "Return S centered in a string of length width. Padding is done\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2274 "using spaces.";
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2275
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2276 static PyObject *
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2277 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	2278 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2279 int marg, left;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2280 int width;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2281
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2282 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	2283 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2284
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2285 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	2286 Py_INCREF(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2287 return (PyObject*) self;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2288 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2289
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2290 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	2291 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	2292
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2293 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	2294 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2295
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2296 static char isspace__doc__[] =
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2297 "S.isspace() -> int\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2298 "\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2299 "Return 1 if there are only whitespace characters in S,\n"
df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	2300 "0 otherwise.";
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2301
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2302 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	2303 string_isspace(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2304 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2305 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2306 = (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	2307 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	2308
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2309 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2310 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	2311 isspace(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2312 return PyInt_FromLong(1);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2313
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2314 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2315 if (PyString_GET_SIZE(self) == 0)
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2316 return PyInt_FromLong(0);
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2317
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2318 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	2319 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2320 if (!isspace(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2321 return PyInt_FromLong(0);
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 return PyInt_FromLong(1);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2324 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2325
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2326
13354 99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2327 static char isalpha__doc__[] =
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2328 "S.isalpha() -> int\n\
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2329 \n\
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2330 Return 1 if all characters in S are alphabetic\n\
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2331 and there is at least one character in S, 0 otherwise.";
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2332
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2333 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	2334 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	2335 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2336 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2337 = (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	2338 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	2339
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2340 /* 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	2341 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	2342 isalpha(*p))
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2343 return PyInt_FromLong(1);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2344
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2345 /* 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	2346 if (PyString_GET_SIZE(self) == 0)
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2347 return PyInt_FromLong(0);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2348
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2349 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	2350 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	2351 if (!isalpha(*p))
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2352 return PyInt_FromLong(0);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2353 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2354 return PyInt_FromLong(1);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2355 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2356
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2357
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2358 static char isalnum__doc__[] =
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2359 "S.isalnum() -> int\n\
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2360 \n\
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2361 Return 1 if all characters in S are alphanumeric\n\
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2362 and there is at least one character in S, 0 otherwise.";
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2363
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2364 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	2365 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	2366 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2367 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2368 = (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	2369 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	2370
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2371 /* 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	2372 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	2373 isalnum(*p))
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2374 return PyInt_FromLong(1);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2375
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2376 /* 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	2377 if (PyString_GET_SIZE(self) == 0)
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2378 return PyInt_FromLong(0);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2379
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2380 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	2381 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	2382 if (!isalnum(*p))
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2383 return PyInt_FromLong(0);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2384 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2385 return PyInt_FromLong(1);
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2386 }
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2387
99f341a97fde Added new .isalpha() and .isalnum() methods to match the same Marc-André Lemburg <mal@egenix.com> parents: 13256 diff changeset	2388
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2389 static char isdigit__doc__[] =
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2390 "S.isdigit() -> int\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2391 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2392 Return 1 if there are only digit characters in S,\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2393 0 otherwise.";
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*
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2396 string_isdigit(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2397 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2398 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2399 = (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	2400 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	2401
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2402 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2403 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	2404 isdigit(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2405 return PyInt_FromLong(1);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2406
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2407 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2408 if (PyString_GET_SIZE(self) == 0)
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2409 return PyInt_FromLong(0);
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2410
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2411 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	2412 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2413 if (!isdigit(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2414 return PyInt_FromLong(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2415 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2416 return PyInt_FromLong(1);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2417 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2418
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 static char islower__doc__[] =
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2421 "S.islower() -> int\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2422 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2423 Return 1 if all cased characters in S are lowercase and there is\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2424 at least one cased character in S, 0 otherwise.";
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2425
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2426 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	2427 string_islower(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2428 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2429 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2430 = (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	2431 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	2432 int cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2433
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2434 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2435 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	2436 return PyInt_FromLong(islower(*p) != 0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2437
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2438 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2439 if (PyString_GET_SIZE(self) == 0)
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2440 return PyInt_FromLong(0);
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2441
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2442 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	2443 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2444 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2445 if (isupper(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2446 return PyInt_FromLong(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2447 else if (!cased && islower(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2448 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2449 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2450 return PyInt_FromLong(cased);
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
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2454 static char isupper__doc__[] =
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2455 "S.isupper() -> int\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2456 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2457 Return 1 if all cased characters in S are uppercase and there is\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2458 at least one cased character in S, 0 otherwise.";
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2459
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2460 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	2461 string_isupper(PyStringObject *self)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2462 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2463 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2464 = (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	2465 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	2466 int cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2467
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2468 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2469 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	2470 return PyInt_FromLong(isupper(*p) != 0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2471
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2472 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2473 if (PyString_GET_SIZE(self) == 0)
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2474 return PyInt_FromLong(0);
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2475
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2476 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	2477 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2478 for (; p < e; p++) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2479 if (islower(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2480 return PyInt_FromLong(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2481 else if (!cased && isupper(*p))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2482 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2483 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2484 return PyInt_FromLong(cased);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2485 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2486
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2487
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2488 static char istitle__doc__[] =
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2489 "S.istitle() -> int\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2490 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2491 Return 1 if S is a titlecased string, i.e. uppercase characters\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2492 may only follow uncased characters and lowercase characters only cased\n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2493 ones. Return 0 otherwise.";
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2494
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2495 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	2496 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	2497 {
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2498 register const unsigned char *p
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2499 = (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	2500 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	2501 int cased, previous_is_cased;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2502
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2503 /* Shortcut for single character strings */
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2504 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	2505 return PyInt_FromLong(isupper(*p) != 0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2506
12924 2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2507 /* Special case for empty strings */
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2508 if (PyString_GET_SIZE(self) == 0)
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2509 return PyInt_FromLong(0);
2d0b99778edf Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12902 diff changeset	2510
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2511 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	2512 cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2513 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2514 for (; p < e; p++) {
12588 54274beb244d The methods islower(), isupper(), isspace(), isdigit() and istitle() Guido van Rossum <guido@python.org> parents: 12576 diff changeset	2515 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	2516
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2517 if (isupper(ch)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2518 if (previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2519 return PyInt_FromLong(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2520 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2521 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2522 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2523 else if (islower(ch)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2524 if (!previous_is_cased)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2525 return PyInt_FromLong(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2526 previous_is_cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2527 cased = 1;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2528 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2529 else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2530 previous_is_cased = 0;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2531 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2532 return PyInt_FromLong(cased);
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
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2536 static char splitlines__doc__[] =
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2537 "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	2538 \n\
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2539 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	2540 Line breaks are not included in the resulting list unless keepends\n\
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2541 is given and true.";
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2542
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2543 #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	2544 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	2545 if (!str) \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2546 goto onError; \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2547 if (PyList_Append(list, str)) { \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2548 Py_DECREF(str); \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2549 goto onError; \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2550 } \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2551 else \
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2552 Py_DECREF(str);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2553
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2554 static PyObject*
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2555 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	2556 {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2557 register int i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2558 register int j;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2559 int len;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2560 int keepends = 0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2561 PyObject *list;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2562 PyObject *str;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2563 char *data;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2564
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2565 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	2566 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2567
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2568 data = PyString_AS_STRING(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2569 len = PyString_GET_SIZE(self);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2570
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2571 list = PyList_New(0);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2572 if (!list)
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2573 goto onError;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2574
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2575 for (i = j = 0; i < len; ) {
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2576 int eol;
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2577
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2578 /* 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	2579 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	2580 i++;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2581
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2582 /* 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	2583 eol = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2584 if (i < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2585 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	2586 data[i+1] == '\n')
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2587 i += 2;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2588 else
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2589 i++;
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2590 if (keepends)
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2591 eol = i;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2592 }
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	2593 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	2594 j = i;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2595 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2596 if (j < len) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2597 SPLIT_APPEND(data, j, len);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2598 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2599
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2600 return list;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2601
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2602 onError:
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2603 Py_DECREF(list);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2604 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2605 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2606
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2607 #undef SPLIT_APPEND
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2608
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2609
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2610 static PyMethodDef
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2611 string_methods[] = {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2612 /* 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	2613 string.maketrans(). */
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2614 {"join", (PyCFunction)string_join, METH_O, join__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2615 {"split", (PyCFunction)string_split, METH_VARARGS, split__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2616 {"lower", (PyCFunction)string_lower, METH_NOARGS, lower__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2617 {"upper", (PyCFunction)string_upper, METH_NOARGS, upper__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2618 {"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	2619 {"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	2620 {"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	2621 {"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	2622 {"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	2623 {"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	2624 {"isalnum", (PyCFunction)string_isalnum, METH_NOARGS, isalnum__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2625 {"capitalize", (PyCFunction)string_capitalize, METH_NOARGS, capitalize__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2626 {"count", (PyCFunction)string_count, METH_VARARGS, count__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2627 {"endswith", (PyCFunction)string_endswith, METH_VARARGS, endswith__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2628 {"find", (PyCFunction)string_find, METH_VARARGS, find__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2629 {"index", (PyCFunction)string_index, METH_VARARGS, index__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2630 {"lstrip", (PyCFunction)string_lstrip, METH_NOARGS, lstrip__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2631 {"replace", (PyCFunction)string_replace, METH_VARARGS, replace__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2632 {"rfind", (PyCFunction)string_rfind, METH_VARARGS, rfind__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2633 {"rindex", (PyCFunction)string_rindex, METH_VARARGS, rindex__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2634 {"rstrip", (PyCFunction)string_rstrip, METH_NOARGS, rstrip__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2635 {"startswith", (PyCFunction)string_startswith, METH_VARARGS, startswith__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2636 {"strip", (PyCFunction)string_strip, METH_NOARGS, strip__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2637 {"swapcase", (PyCFunction)string_swapcase, METH_NOARGS, swapcase__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2638 {"translate", (PyCFunction)string_translate, METH_VARARGS, translate__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2639 {"title", (PyCFunction)string_title, METH_NOARGS, title__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2640 {"ljust", (PyCFunction)string_ljust, METH_VARARGS, ljust__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2641 {"rjust", (PyCFunction)string_rjust, METH_VARARGS, rjust__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2642 {"center", (PyCFunction)string_center, METH_VARARGS, center__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2643 {"encode", (PyCFunction)string_encode, METH_VARARGS, encode__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2644 {"decode", (PyCFunction)string_decode, METH_VARARGS, decode__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2645 {"expandtabs", (PyCFunction)string_expandtabs, METH_VARARGS, expandtabs__doc__},
b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2646 {"splitlines", (PyCFunction)string_splitlines, METH_VARARGS, splitlines__doc__},
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2647 #if 0
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2648 {"zfill", (PyCFunction)string_zfill, METH_VARARGS, zfill__doc__},
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2649 #endif
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2650 {NULL, NULL} /* sentinel */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2651 };
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2652
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2653 staticforward PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2654 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	2655
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2656 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2657 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	2658 {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2659 PyObject *x = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2660 static char *kwlist[] = {"object", 0};
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2661
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2662 if (type != &PyString_Type)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2663 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	2664 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	2665 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2666 if (x == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2667 return PyString_FromString("");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2668 return PyObject_Str(x);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2669 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2670
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2671 static PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2672 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	2673 {
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2674 PyObject tmp, pnew;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2675 int n;
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2676
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2677 assert(PyType_IsSubtype(type, &PyString_Type));
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2678 tmp = string_new(&PyString_Type, args, kwds);
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2679 if (tmp == NULL)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2680 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	2681 assert(PyString_CheckExact(tmp));
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2682 n = PyString_GET_SIZE(tmp);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2683 pnew = type->tp_alloc(type, n);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2684 if (pnew != NULL) {
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2685 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	2686 #ifdef CACHE_HASH
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2687 ((PyStringObject *)pnew)->ob_shash =
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2688 ((PyStringObject *)tmp)->ob_shash;
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2689 #endif
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2690 #ifdef INTERN_STRINGS
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2691 ((PyStringObject *)pnew)->ob_sinterned =
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2692 ((PyStringObject *)tmp)->ob_sinterned;
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2693 #endif
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2694 }
19632 20fb7591f885 Fix a memory leak in str_subtype_new(). (All the other Guido van Rossum <guido@python.org> parents: 19592 diff changeset	2695 Py_DECREF(tmp);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	2696 return pnew;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2697 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2698
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2699 static char string_doc[] =
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2700 "str(object) -> string\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2701 \n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2702 Return a nice string representation of the object.\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2703 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	2704
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2705 PyTypeObject PyString_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2706 PyObject_HEAD_INIT(&PyType_Type)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2707 0,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2708 "str",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2709 sizeof(PyStringObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2710 sizeof(char),
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2711 (destructor)string_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2712 (printfunc)string_print, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2713 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2714 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2715 0, /* tp_compare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2716 (reprfunc)string_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2717 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2718 &string_as_sequence, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2719 0, /* tp_as_mapping */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2720 (hashfunc)string_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2721 0, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2722 (reprfunc)string_str, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2723 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2724 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2725 &string_as_buffer, /* tp_as_buffer */
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2726 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	2727 string_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2728 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2729 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2730 (richcmpfunc)string_richcompare, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2731 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2732 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2733 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2734 string_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2735 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2736 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2737 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2738 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2739 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2740 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2741 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2742 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2743 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2744 string_new, /* tp_new */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2745 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2746
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2747 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2748 PyString_Concat(register PyObject *pv, register PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2749 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2750 register PyObject *v;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	2751 if (*pv == NULL)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2752 return;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2753 if (w == NULL \|\| !PyString_Check(*pv)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2754 Py_DECREF(*pv);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	2755 *pv = NULL;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	2756 return;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	2757 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2758 v = string_concat((PyStringObject ) pv, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2759 Py_DECREF(*pv);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2760 *pv = v;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2761 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2762
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	2763 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2764 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	2765 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2766 PyString_Concat(pv, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2767 Py_XDECREF(w);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	2768 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	2769
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	2770
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2771 /* The following function breaks the notion that strings are immutable:
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2772 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	2773 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	2774 as creating a new string object and destroying the old one, only
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2775 more efficiently. In any case, don't use this if the string may
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2776 already be known to some other part of the code... */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2777
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2778 int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2779 _PyString_Resize(PyObject **pv, int newsize)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2780 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2781 register PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2782 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	2783 v = *pv;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2784 if (!PyString_Check(v) \|\| v->ob_refcnt != 1) {
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2785 *pv = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2786 Py_DECREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2787 PyErr_BadInternalCall();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	2788 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2789 }
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	2790 /* XXX UNREF/NEWREF interface should be more symmetrical */
3586 36cc3ee54f28 new debugger symbol names Guido van Rossum <guido@python.org> parents: 3571 diff changeset	2791 #ifdef Py_REF_DEBUG
2612 ca6b60d4ea90 fix dusty debugging macros Guido van Rossum <guido@python.org> parents: 2504 diff changeset	2792 --_Py_RefTotal;
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	2793 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2794 _Py_ForgetReference(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2795 pv = (PyObject )
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	2796 PyObject_REALLOC((char *)v,
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2797 sizeof(PyStringObject) + newsize * sizeof(char));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2798 if (*pv == NULL) {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	2799 PyObject_DEL(v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2800 PyErr_NoMemory();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	2801 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2802 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2803 _Py_NewReference(*pv);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2804 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	2805 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	2806 sv->ob_sval[newsize] = '\0';
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2807 return 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2808 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2809
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2810 /* Helpers for formatstring */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2811
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2812 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2813 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	2814 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2815 int argidx = *p_argidx;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2816 if (argidx < arglen) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2817 (*p_argidx)++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2818 if (arglen < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2819 return args;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2820 else
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2821 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	2822 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2823 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2824 "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	2825 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2826 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2827
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	2828 /* 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	2829 * 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	2830 * 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	2831 * 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	2832 * 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	2833 * 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	2834 */
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2835 #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	2836 #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	2837 #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	2838 #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	2839 #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	2840
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	2841 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2842 formatfloat(char *buf, size_t buflen, int flags,
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2843 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	2844 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	2845 /* fmt = '%#.' + `prec` + `type`
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	2846 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	2847 char fmt[20];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2848 double x;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2849 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	2850 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2851 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2852 prec = 6;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2853 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	2854 type = 'g';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2855 sprintf(fmt, "%%%s.%d%c", (flags&F_ALT) ? "#" : "", prec, type);
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	2856 /* 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	2857 fmt = %#.<prec>g
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	2858 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	2859 for any double rep.)
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	2860 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	2861 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	2862 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	2863 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	2864 PyErr_SetString(PyExc_OverflowError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15082 diff changeset	2865 "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	2866 return -1;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	2867 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2868 sprintf(buf, fmt, x);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	2869 return strlen(buf);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2870 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2871
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	2872 /* _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	2873 * 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	2874 * 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	2875 * 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	2876 * . *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	2877 * *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	2878 * 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	2879 * 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	2880 * "-"? ("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	2881 * "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	2882 * 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	2883 * 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	2884 * 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	2885 * 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	2886 * 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	2887 * 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	2888 * 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	2889 *
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2890 * 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	2891 * 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	2892 */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2893 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	2894 _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	2895 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	2896 {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2897 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	2898 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	2899 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	2900 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	2901 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	2902 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	2903 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	2904
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2905 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	2906 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	2907 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	2908 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	2909 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	2910 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	2911 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	2912 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	2913 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	2914 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	2915 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	2916 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	2917 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	2918 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	2919 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	2920 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2921 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	2922 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	2923
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2924 /* 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	2925 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	2926 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	2927 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	2928 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2929 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	2930 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	2931 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	2932 --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	2933 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	2934 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2935 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	2936 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	2937 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	2938 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	2939
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	2940 /* 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	2941 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	2942 /* 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	2943 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	2944 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	2945 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	2946 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	2947 /* 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	2948 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	2949 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	2950 --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	2951 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2952 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	2953 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	2954 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	2955 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	2956 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	2957 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	2958 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	2959 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	2960 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2961 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	2962 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	2963 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	2964 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	2965 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	2966 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2967 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	2968 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	2969 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2970
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2971 /* 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	2972 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	2973 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	2974 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	2975 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	2976 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	2977 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	2978 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	2979 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2980 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	2981 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	2982 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	2983 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	2984 *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	2985 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	2986 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	2987 *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	2988 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	2989 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	2990 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	2991 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	2992 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2993
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	2994 /* 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	2995 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	2996 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	2997 /* 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	2998 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	2999 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	3000 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	3001 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	3002 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	3003 /* 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	3004 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	3005 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	3006 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	3007 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3008 *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	3009 *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	3010 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	3011 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3012
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3013 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3014 formatint(char *buf, size_t buflen, int flags,
0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3015 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	3016 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3017 /* 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	3018 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	3019 + 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	3020 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	3021 long x;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3022 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	3023 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3024 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3025 prec = 1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3026 sprintf(fmt, "%%%s.%dl%c", (flags&F_ALT) ? "#" : "", prec, 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	3027 /* buf = '+'/'-'/'0'/'0x' + '[0-9]'*max(prec, len(x in octal))
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3028 worst case buf = '0x' + [0-9]prec, where prec >= 11 /
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	3029 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	3030 PyErr_SetString(PyExc_OverflowError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15082 diff changeset	3031 "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	3032 return -1;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3033 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3034 sprintf(buf, fmt, x);
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3035 /* When converting 0 under %#x or %#X, C leaves off the base marker,
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3036 * but we want it (for consistency with other %#x conversions, and
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3037 * for consistency with Python's hex() function).
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3038 * BUG 28-Apr-2001 tim: At least two platform Cs (Metrowerks &
9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3039 * Compaq Tru64) violate the std by converting 0 w/ leading 0x anyway.
9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3040 * So add it only if the platform didn't already.
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3041 */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3042 if (x == 0 &&
9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3043 (flags & F_ALT) &&
9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3044 (type == 'x' \|\| type == 'X') &&
9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3045 buf[1] != (char)type) /* this last always true under std C */
9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3046 {
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3047 memmove(buf+2, buf, strlen(buf) + 1);
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3048 buf[0] = '0';
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3049 buf[1] = (char)type;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3050 }
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3051 return strlen(buf);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3052 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3053
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3054 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3055 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	3056 {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3057 /* 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	3058 if (PyString_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3059 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	3060 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3061 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3062 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3063 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	3064 return -1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3065 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3066 buf[1] = '\0';
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3067 return 1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3068 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3069
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3070
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3071 /* 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	3072
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3073 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	3074 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	3075 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	3076 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	3077 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	3078 */
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3079 #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	3080
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3081 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3082 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	3083 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3084 char fmt, res;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3085 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	3086 int args_owned = 0;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3087 PyObject result, orig_args;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3088 #ifdef Py_USING_UNICODE
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3089 PyObject v, w;
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3090 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3091 PyObject *dict = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3092 if (format == NULL \|\| !PyString_Check(format) \|\| args == NULL) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3093 PyErr_BadInternalCall();
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3094 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3095 }
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3096 orig_args = args;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3097 fmt = PyString_AsString(format);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3098 fmtcnt = PyString_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	3099 reslen = rescnt = fmtcnt + 100;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3100 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	3101 if (result == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3102 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3103 res = PyString_AsString(result);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3104 if (PyTuple_Check(args)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3105 arglen = PyTuple_Size(args);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3106 argidx = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3107 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3108 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3109 arglen = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3110 argidx = -2;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3111 }
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3112 if (args->ob_type->tp_as_mapping)
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3113 dict = args;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3114 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3115 if (*fmt != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3116 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	3117 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	3118 reslen += rescnt;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3119 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	3120 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3121 res = PyString_AsString(result)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3122 + reslen - rescnt;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3123 --rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3124 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3125 res++ = fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3126 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3127 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3128 /* Got a format specifier */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3129 int flags = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3130 int width = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3131 int prec = -1;
1408 18df674539da Three micro fixes to formatstring Guido van Rossum <guido@python.org> parents: 1380 diff changeset	3132 int c = '\0';
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3133 int fill;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3134 PyObject *v = NULL;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3135 PyObject *temp = NULL;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3136 char *pbuf;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3137 int sign;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3138 int len;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3139 char formatbuf[FORMATBUFLEN]; /* For format{float,int,char}() */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3140 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3141 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	3142 int argidx_start = argidx;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3143 #endif
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3144
4588 4dc67fdd9e0b Make gcc -Wall happy Guido van Rossum <guido@python.org> parents: 4503 diff changeset	3145 fmt++;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3146 if (*fmt == '(') {
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3147 char *keystart;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3148 int keylen;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3149 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	3150 int pcount = 1;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3151
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3152 if (dict == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3153 PyErr_SetString(PyExc_TypeError,
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3154 "format requires a mapping");
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3155 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3156 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3157 ++fmt;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3158 --fmtcnt;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3159 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	3160 /* 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	3161 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	3162 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	3163 --pcount;
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	3164 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	3165 ++pcount;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3166 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	3167 }
82cd2baa4136 Patch submitted by Brad Howes (with one bug fixed by me): allow Guido van Rossum <guido@python.org> parents: 5935 diff changeset	3168 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	3169 if (fmtcnt < 0 \|\| pcount > 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3170 PyErr_SetString(PyExc_ValueError,
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3171 "incomplete format key");
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3172 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3173 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3174 key = PyString_FromStringAndSize(keystart,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3175 keylen);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3176 if (key == NULL)
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3177 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	3178 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3179 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	3180 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	3181 }
977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	3182 args = PyObject_GetItem(dict, key);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3183 Py_DECREF(key);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3184 if (args == NULL) {
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3185 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3186 }
3570 977ff1ace070 Fix obscure bug in string%mapping where the mapping creates its items Guido van Rossum <guido@python.org> parents: 2612 diff changeset	3187 args_owned = 1;
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3188 arglen = -1;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3189 argidx = -2;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3190 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3191 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3192 switch (c = *fmt++) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3193 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	3194 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	3195 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	3196 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	3197 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	3198 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3199 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3200 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3201 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3202 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	3203 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3204 goto error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3205 if (!PyInt_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3206 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3207 "* wants int");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3208 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3209 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3210 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	3211 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	3212 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	3213 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	3214 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3215 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3216 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3217 }
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	3218 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	3219 width = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3220 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	3221 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	3222 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3223 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3224 if ((width*10) / 10 != width) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3225 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3226 PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3227 "width too big");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3228 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3229 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3230 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	3231 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3232 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3233 if (c == '.') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3234 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3235 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3236 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3237 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3238 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	3239 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3240 goto error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3241 if (!PyInt_Check(v)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3242 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3243 PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3244 "* wants int");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3245 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3246 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3247 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	3248 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3249 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3250 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3251 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3252 }
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	3253 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	3254 prec = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3255 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	3256 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	3257 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3258 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3259 if ((prec*10) / 10 != prec) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3260 PyErr_SetString(
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3261 PyExc_ValueError,
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3262 "prec too big");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3263 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3264 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3265 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	3266 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3267 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3268 } /* prec */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3269 if (fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3270 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	3271 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3272 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3273 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3274 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3275 if (fmtcnt < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3276 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3277 "incomplete format");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3278 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3279 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3280 if (c != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3281 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	3282 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3283 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3284 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3285 sign = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3286 fill = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3287 switch (c) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3288 case '%':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3289 pbuf = "%";
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3290 len = 1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3291 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3292 case 's':
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3293 case 'r':
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3294 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3295 if (PyUnicode_Check(v)) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3296 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	3297 argidx = argidx_start;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3298 goto unicode;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3299 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3300 #endif
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3301 if (c == 's')
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3302 temp = PyObject_Str(v);
12371 429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3303 else
429a37ff9db5 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12328 diff changeset	3304 temp = PyObject_Repr(v);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3305 if (temp == NULL)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3306 goto error;
8468 c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3307 if (!PyString_Check(temp)) {
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3308 PyErr_SetString(PyExc_TypeError,
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3309 "%s argument has non-string str()");
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3310 goto error;
c27cd5fc46b5 Should check that PyObject_Str() really returned a string! Guido van Rossum <guido@python.org> parents: 7981 diff changeset	3311 }
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3312 pbuf = PyString_AsString(temp);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3313 len = PyString_Size(temp);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3314 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	3315 len = prec;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3316 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3317 case 'i':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3318 case 'd':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3319 case 'u':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3320 case 'o':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3321 case 'x':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3322 case 'X':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3323 if (c == 'i')
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3324 c = 'd';
15455 d0146d128897 Fox for SF bug #123859: %[duxXo] long formats inconsistent. Tim Peters <tim.peters@gmail.com> parents: 15435 diff changeset	3325 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	3326 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	3327 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	3328 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	3329 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	3330 /* 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	3331 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	3332 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	3333 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3334 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	3335 pbuf = formatbuf;
58b832b8745e Derived from Martin's 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 len = formatint(pbuf, sizeof(formatbuf),
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3337 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	3338 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	3339 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	3340 /* 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	3341 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	3342 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3343 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	3344 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3345 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3346 case 'e':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3347 case 'E':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3348 case 'f':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3349 case 'g':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3350 case 'G':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3351 pbuf = formatbuf;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3352 len = formatfloat(pbuf, sizeof(formatbuf), flags, prec, c, v);
5022 62645787fbc8 Don't use static buffers internally for formatstring(). Guido van Rossum <guido@python.org> parents: 5005 diff changeset	3353 if (len < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3354 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3355 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	3356 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	3357 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3358 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3359 case 'c':
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3360 pbuf = formatbuf;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3361 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	3362 if (len < 0)
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3363 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3364 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3365 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	3366 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	3367 "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	3368 "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	3369 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	3370 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3371 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3372 if (sign) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3373 if (pbuf == '-' \|\| pbuf == '+') {
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3374 sign = *pbuf++;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3375 len--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3376 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3377 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	3378 sign = '+';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3379 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	3380 sign = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3381 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	3382 sign = 0;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3383 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3384 if (width < len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3385 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	3386 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	3387 reslen -= rescnt;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	3388 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	3389 reslen += rescnt;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3390 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	3391 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3392 res = PyString_AsString(result)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3393 + reslen - rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3394 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3395 if (sign) {
1409 f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	3396 if (fill != ' ')
f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	3397 *res++ = sign;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3398 rescnt--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3399 if (width > len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3400 width--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3401 }
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	3402 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	3403 assert(pbuf[0] == '0');
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3404 assert(pbuf[1] == c);
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3405 if (fill != ' ') {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3406 res++ = pbuf++;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3407 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	3408 }
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3409 rescnt -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3410 width -= 2;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3411 if (width < 0)
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3412 width = 0;
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3413 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	3414 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3415 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	3416 do {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3417 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3418 *res++ = fill;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3419 } while (--width > len);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3420 }
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	3421 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	3422 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	3423 *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	3424 if ((flags & F_ALT) &&
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3425 (c == 'x' \|\| c == 'X')) {
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3426 assert(pbuf[0] == '0');
f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3427 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	3428 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	3429 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	3430 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3431 }
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	3432 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	3433 res += len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3434 rescnt -= len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3435 while (--width >= len) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3436 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3437 *res++ = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3438 }
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	3439 if (dict && (argidx < arglen) && c != '%') {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3440 PyErr_SetString(PyExc_TypeError,
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3441 "not all arguments converted");
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3442 goto error;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3443 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3444 Py_XDECREF(temp);
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3445 } /* '%' */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3446 } /* 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	3447 if (argidx < arglen && !dict) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3448 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3449 "not all arguments converted");
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3450 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3451 }
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	3452 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3453 Py_DECREF(args);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	3454 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3455 _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	3456 return result;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3457
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3458 #ifdef Py_USING_UNICODE
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3459 unicode:
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3460 if (args_owned) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3461 Py_DECREF(args);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3462 args_owned = 0;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3463 }
17655 0470babdae49 Fix for bug #417030: "print '%s' fails for unicode string" Marc-André Lemburg <mal@egenix.com>* parents: 17645 diff changeset	3464 /* Fiddle args right (remove the first argidx arguments) */
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3465 if (PyTuple_Check(orig_args) && argidx > 0) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3466 PyObject *v;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3467 int n = PyTuple_GET_SIZE(orig_args) - argidx;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3468 v = PyTuple_New(n);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3469 if (v == NULL)
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3470 goto error;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3471 while (--n >= 0) {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3472 PyObject *w = PyTuple_GET_ITEM(orig_args, n + argidx);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3473 Py_INCREF(w);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3474 PyTuple_SET_ITEM(v, n, w);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3475 }
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3476 args = v;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3477 } else {
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3478 Py_INCREF(orig_args);
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3479 args = orig_args;
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3480 }
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	3481 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	3482 /* 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	3483 function format the rest of the input. */
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3484 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	3485 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	3486 goto error;
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3487 fmtcnt = PyString_GET_SIZE(format) - \
4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3488 (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	3489 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	3490 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	3491 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	3492 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	3493 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	3494 if (v == NULL)
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3495 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	3496 /* 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	3497 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	3498 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	3499 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	3500 Py_DECREF(v);
12328 4f5671a31347 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	3501 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	3502 return w;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19301 diff changeset	3503 #endif /* Py_USING_UNICODE */
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	3504
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3505 error:
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3506 Py_DECREF(result);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	3507 if (args_owned) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3508 Py_DECREF(args);
7981 09963a2a24db Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 6286 diff changeset	3509 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3510 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3511 }
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3512
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3513
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3514 #ifdef INTERN_STRINGS
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3515
14018 0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3516 /* 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	3517 * 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	3518 * 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	3519 * says:
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3520 *
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3521 * 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	3522 * 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	3523 * 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	3524 * 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	3525 * 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	3526 * in the interned table.
0d805e239d8f Insure properly identifies the `interned' dictionary as leaking at Barry Warsaw <barry@python.org> parents: 13761 diff changeset	3527 */
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3528 static PyObject *interned;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3529
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3530 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3531 PyString_InternInPlace(PyObject **p)
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3532 {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3533 register PyStringObject s = (PyStringObject )(*p);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3534 PyObject *t;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3535 if (s == NULL \|\| !PyString_Check(s))
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3536 Py_FatalError("PyString_InternInPlace: strings only please!");
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3537 if ((t = s->ob_sinterned) != NULL) {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3538 if (t == (PyObject *)s)
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3539 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3540 Py_INCREF(t);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3541 *p = t;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3542 Py_DECREF(s);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3543 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3544 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3545 if (interned == NULL) {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3546 interned = PyDict_New();
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3547 if (interned == NULL)
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3548 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3549 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3550 if ((t = PyDict_GetItem(interned, (PyObject *)s)) != NULL) {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3551 Py_INCREF(t);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3552 *p = s->ob_sinterned = t;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3553 Py_DECREF(s);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3554 return;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3555 }
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	3556 /* 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	3557 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	3558 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	3559 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	3560 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	3561 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	3562 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	3563 }
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3564 }
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3565 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	3566 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	3567 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	3568 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	3569 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	3570 *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	3571 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	3572 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	3573 }
b28fc8c36e3d If interning an instance of a string subclass, intern a real string object Tim Peters <tim.peters@gmail.com> parents: 19886 diff changeset	3574 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	3575 }
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3576 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3577 PyErr_Clear();
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3578 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3579
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3580
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3581 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3582 PyString_InternFromString(const char *cp)
5005 f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3583 {
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3584 PyObject *s = PyString_FromString(cp);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3585 if (s == NULL)
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3586 return NULL;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3587 PyString_InternInPlace(&s);
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3588 return s;
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3589 }
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3590
f17bace48dd6 String interning. Guido van Rossum <guido@python.org> parents: 4654 diff changeset	3591 #endif
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3592
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3593 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3594 PyString_Fini(void)
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3595 {
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3596 int i;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3597 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	3598 Py_XDECREF(characters[i]);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3599 characters[i] = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3600 }
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3601 #ifndef DONT_SHARE_SHORT_STRINGS
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3602 Py_XDECREF(nullstring);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3603 nullstring = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3604 #endif
5935 d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3605 #ifdef INTERN_STRINGS
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3606 if (interned) {
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3607 int pos, changed;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3608 PyObject key, value;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3609 do {
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3610 changed = 0;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3611 pos = 0;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3612 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	3613 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	3614 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	3615 changed = 1;
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3616 }
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3617 }
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3618 } while (changed);
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3619 }
d77d3b8e86b2 Change the Fini function to only remove otherwise unreferenced strings Guido van Rossum <guido@python.org> parents: 5920 diff changeset	3620 #endif
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3621 }
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3622
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3623 #ifdef INTERN_STRINGS
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3624 void _Py_ReleaseInternedStrings(void)
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3625 {
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3626 if (interned) {
17597 32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17450 diff changeset	3627 fprintf(stderr, "releasing interned strings\n");
32e7d0898eab Iterators phase 1. This comprises: Guido van Rossum <guido@python.org> parents: 17450 diff changeset	3628 PyDict_Clear(interned);
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3629 Py_DECREF(interned);
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3630 interned = NULL;
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3631 }
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3632 }
ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3633 #endif /* INTERN_STRINGS */

Mercurial > cpython-lru_cache-weakref

annotate Objects/stringobject.c @ 19975:4e445a3e07c6 legacy-trunk