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

annotate Objects/stringobject.c @ 46909:ef4ec968fdb6

Merged revisions 63078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk When forward porting this, I added _PyUnicode_InsertThousandsGrouping. ........ r63078 | eric.smith | 2008-05-11 15:52:48 -0400 (Sun, 11 May 2008) | 14 lines Addresses issue 2802: 'n' formatting for integers. Adds 'n' as a format specifier for integers, to mirror the same specifier which is already available for floats. 'n' is the same as 'd', but inserts the current locale-specific thousands grouping. I added this as a stringlib function, but it's only used by str type, not unicode. This is because of an implementation detail in unicode.format(), which does its own str->unicode conversion. But the unicode version will be needed in 3.0, and it may be needed by other code eventually in 2.6 (maybe decimal?), so I left it as a stringlib implementation. As long as the unicode version isn't instantiated, there's no overhead for this. ........

author	Eric Smith <eric@trueblade.com>
date	Sun, 11 May 2008 21:00:57 +0000
parents	47d9bbe10897
children	960ade856078

rev	line source
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1 /* String object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3 /* XXX This is now called 'bytes' as far as the user is concerned.
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	4 Many docstrings and error messages need to be cleaned up. */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	5
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	6 #define PY_SSIZE_T_CLEAN
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	7
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	8 #include "Python.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	9
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	10 #include "bytes_methods.h"
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	11
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	12 static Py_ssize_t
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	13 _getbuffer(PyObject obj, Py_buffer view)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	14 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	15 PyBufferProcs *buffer = Py_TYPE(obj)->tp_as_buffer;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	16
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	17 if (buffer == NULL \|\| buffer->bf_getbuffer == NULL)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	18 {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	19 PyErr_Format(PyExc_TypeError,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	20 "Type %.100s doesn't support the buffer API",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	21 Py_TYPE(obj)->tp_name);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	22 return -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	23 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	24
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	25 if (buffer->bf_getbuffer(obj, view, PyBUF_SIMPLE) < 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	26 return -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	27 return view->len;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	28 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	29
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	30 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	31 int null_strings, one_strings;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	32 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	33
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	34 static PyStringObject *characters[UCHAR_MAX + 1];
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	35 static PyStringObject *nullstring;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	36
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	37 /*
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	38 For both PyString_FromString() and PyString_FromStringAndSize(), the
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	39 parameter `size' denotes number of characters to allocate, not counting any
21737 30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	40 null terminating character.
30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	41
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	42 For PyString_FromString(), the parameter `str' points to a null-terminated
21737 30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	43 string containing exactly `size' bytes.
30a817038af0 Updated patch #487906: Revise inline docs. Martin v. Löwis <martin@v.loewis.de> parents: 21327 diff changeset	44
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	45 For PyString_FromStringAndSize(), the parameter the parameter `str' is
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	46 either NULL or else points to a string containing at least `size' bytes.
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	47 For PyString_FromStringAndSize(), the string in the `str' parameter does
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	48 not have to be null-terminated. (Therefore it is safe to construct a
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	49 substring by calling `PyString_FromStringAndSize(origstring, substrlen)'.)
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	50 If `str' is NULL then PyString_FromStringAndSize() will allocate `size+1'
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	51 bytes (setting the last byte to the null terminating character) and you can
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	52 fill in the data yourself. If `str' is non-NULL then the resulting
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	53 PyString object must be treated as immutable and you must not fill in nor
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	54 alter the data yourself, since the strings may be shared.
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	55
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	56 The PyObject member `op->ob_size', which denotes the number of "extra
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	57 items" in a variable-size object, will contain the number of bytes
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	58 allocated for string data, not counting the null terminating character. It
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	59 is therefore equal to the equal to the `size' parameter (for
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	60 PyString_FromStringAndSize()) or the length of the string in the `str'
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	61 parameter (for PyString_FromString()).
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	62 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	63 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	64 PyString_FromStringAndSize(const char *str, Py_ssize_t size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	65 {
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	66 register PyStringObject *op;
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45052 diff changeset	67 if (size < 0) {
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45052 diff changeset	68 PyErr_SetString(PyExc_SystemError,
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45052 diff changeset	69 "Negative size passed to PyString_FromStringAndSize");
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45052 diff changeset	70 return NULL;
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45052 diff changeset	71 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	72 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	73 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	74 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	75 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	76 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	77 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	78 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	79 if (size == 1 && str != NULL &&
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	80 (op = characters[*str & UCHAR_MAX]) != NULL)
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	81 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	82 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	83 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	84 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	85 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	86 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	87 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	88
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 24872 diff changeset	89 /* Inline PyObject_NewVar */
32423 64534fb3afcd sizeof(char) is 1, by definition, so get rid of that expression in Tim Peters <tim.peters@gmail.com> parents: 32305 diff changeset	90 op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	91 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	92 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	93 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	94 op->ob_shash = -1;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	95 if (str != NULL)
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	96 Py_MEMCPY(op->ob_sval, str, size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	97 op->ob_sval[size] = '\0';
22689 614167df2096 Eliminate DONT_SHARE_SHORT_STRINGS. Tim Peters <tim.peters@gmail.com> parents: 22651 diff changeset	98 /* share short strings */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	99 if (size == 0) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	100 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	101 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	102 } else if (size == 1 && str != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	103 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	104 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	105 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	106 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	107 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	108
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	109 PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	110 PyString_FromString(const char *str)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	111 {
21263 2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	112 register size_t size;
17720 ede29ad6440a Mark Favas reported that gcc caught me using casts as lvalues. Dodge it. Tim Peters <tim.peters@gmail.com> parents: 17712 diff changeset	113 register PyStringObject *op;
21263 2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	114
2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	115 assert(str != NULL);
2f2abeeefd87 PyString_FromString: this requires its argument be non-NULL, but doesn't Tim Peters <tim.peters@gmail.com> parents: 21254 diff changeset	116 size = strlen(str);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	117 if (size > PY_SSIZE_T_MAX) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	118 PyErr_SetString(PyExc_OverflowError,
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	119 "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	120 return NULL;
18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	121 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	122 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	123 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	124 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	125 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	126 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	127 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	128 }
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	129 if (size == 1 && (op = characters[*str & UCHAR_MAX]) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	130 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	131 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	132 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	133 Py_INCREF(op);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	134 return (PyObject *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	135 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	136
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 24872 diff changeset	137 /* Inline PyObject_NewVar */
32423 64534fb3afcd sizeof(char) is 1, by definition, so get rid of that expression in Tim Peters <tim.peters@gmail.com> parents: 32305 diff changeset	138 op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	139 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	140 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	141 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	142 op->ob_shash = -1;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	143 Py_MEMCPY(op->ob_sval, str, size+1);
22689 614167df2096 Eliminate DONT_SHARE_SHORT_STRINGS. Tim Peters <tim.peters@gmail.com> parents: 22651 diff changeset	144 /* share short strings */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	145 if (size == 0) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	146 nullstring = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	147 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	148 } else if (size == 1) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	149 characters[*str & UCHAR_MAX] = op;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	150 Py_INCREF(op);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	151 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	152 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	153 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	154
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	155 PyObject *
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	156 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	157 {
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	158 va_list count;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	159 Py_ssize_t n = 0;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	160 const char* f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	161 char *s;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	162 PyObject* string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	163
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	164 #ifdef VA_LIST_IS_ARRAY
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	165 Py_MEMCPY(count, vargs, sizeof(va_list));
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	166 #else
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	167 #ifdef __va_copy
81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	168 __va_copy(count, vargs);
81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	169 #else
20221 abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	170 count = vargs;
abaf9ea2e560 SF bug [#467265] Compile errors on SuSe Linux on IBM/s390. Tim Peters <tim.peters@gmail.com> parents: 20140 diff changeset	171 #endif
24400 81ca6ca5c307 Patch #554716: Use __va_copy where available. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	172 #endif
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	173 /* 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	174 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	175 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	176 const char* p = f;
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	177 while (++f && f != '%' && !ISALPHA(*f))
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	178 ;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	179
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	180 /* skip the 'l' or 'z' in {%ld, %zd, %lu, %zu} since
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	181 * they don't affect the amount of space we reserve.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	182 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	183 if ((f == 'l' \|\| f == 'z') &&
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	184 (f[1] == 'd' \|\| f[1] == 'u'))
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	185 ++f;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	186
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	187 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	188 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	189 (void)va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	190 /* fall through... */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	191 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	192 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	193 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	194 case 'd': case 'u': case 'i': case 'x':
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	195 (void) va_arg(count, int);
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	196 /* 20 bytes is enough to hold a 64-bit
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	197 integer. Decimal takes the most space.
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	198 This isn't enough for octal. */
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	199 n += 20;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	200 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	201 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	202 s = va_arg(count, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	203 n += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	204 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	205 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	206 (void) va_arg(count, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	207 /* maximum 64-bit pointer representation:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	208 * 0xffffffffffffffff
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	209 * so 19 characters is enough.
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	210 * XXX I count 18 -- what's the extra for?
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	211 */
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	212 n += 19;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	213 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	214 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	215 /* if we stumble upon an unknown
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	216 formatting code, copy the rest of
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	217 the format string to the output
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	218 string. (we cannot just skip the
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	219 code, since there's no way to know
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	220 what's in the argument list) */
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	221 n += strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	222 goto expand;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	223 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	224 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	225 n++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	226 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	227 expand:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	228 /* step 2: fill the buffer */
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	229 /* Since we've analyzed how much space we need for the worst case,
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	230 use sprintf directly instead of the slower PyOS_snprintf. */
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	231 string = PyString_FromStringAndSize(NULL, n);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	232 if (!string)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	233 return NULL;
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	234
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	235 s = PyString_AsString(string);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	236
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	237 for (f = format; *f; f++) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	238 if (*f == '%') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	239 const char* p = f++;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	240 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	241 int longflag = 0;
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	242 int size_tflag = 0;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	243 /* 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	244 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	245 n = 0;
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	246 while (ISDIGIT(*f))
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	247 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	248 if (*f == '.') {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	249 f++;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	250 n = 0;
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	251 while (ISDIGIT(*f))
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	252 n = (n10) + f++ - '0';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	253 }
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	254 while (f && f != '%' && !ISALPHA(*f))
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	255 f++;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	256 /* handle the long flag, but only for %ld and %lu.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	257 others can be added when necessary. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	258 if (*f == 'l' && (f[1] == 'd' \|\| f[1] == 'u')) {
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	259 longflag = 1;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	260 ++f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	261 }
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	262 /* handle the size_t flag. */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	263 if (*f == 'z' && (f[1] == 'd' \|\| f[1] == 'u')) {
36510 0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	264 size_tflag = 1;
0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	265 ++f;
0f3894bb2ada Support %zd in PyErr_Format and PyString_FromFormat. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	266 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	267
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	268 switch (*f) {
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	269 case 'c':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	270 *s++ = va_arg(vargs, int);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	271 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	272 case 'd':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	273 if (longflag)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	274 sprintf(s, "%ld", va_arg(vargs, long));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	275 else if (size_tflag)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	276 sprintf(s, "%" PY_FORMAT_SIZE_T "d",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	277 va_arg(vargs, Py_ssize_t));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	278 else
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	279 sprintf(s, "%d", va_arg(vargs, int));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	280 s += strlen(s);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	281 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	282 case 'u':
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	283 if (longflag)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	284 sprintf(s, "%lu",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	285 va_arg(vargs, unsigned long));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	286 else if (size_tflag)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	287 sprintf(s, "%" PY_FORMAT_SIZE_T "u",
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	288 va_arg(vargs, size_t));
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	289 else
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	290 sprintf(s, "%u",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	291 va_arg(vargs, unsigned int));
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	292 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	293 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	294 case 'i':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	295 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	296 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	297 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	298 case 'x':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	299 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	300 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	301 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	302 case 's':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	303 p = va_arg(vargs, char*);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	304 i = strlen(p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	305 if (n > 0 && i > n)
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	306 i = n;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	307 Py_MEMCPY(s, p, i);
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	308 s += i;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	309 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	310 case 'p':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	311 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	312 /* %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	313 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	314 s[1] = 'x';
5c859d2cb37b PyString_FromFormatV: Massage platform %p output to match what gcc does, Tim Peters <tim.peters@gmail.com> parents: 19475 diff changeset	315 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	316 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	317 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	318 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	319 }
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	320 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	321 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	322 case '%':
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	323 *s++ = '%';
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	324 break;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	325 default:
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	326 strcpy(s, p);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	327 s += strlen(s);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	328 goto end;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	329 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	330 } else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	331 s++ = f;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	332 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	333
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	334 end:
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	335 _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	336 return string;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	337 }
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	338
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	339 PyObject *
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	340 PyString_FromFormat(const char *format, ...)
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	341 {
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	342 PyObject* ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	343 va_list vargs;
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	344
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	345 #ifdef HAVE_STDARG_PROTOTYPES
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	346 va_start(vargs, format);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	347 #else
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	348 va_start(vargs);
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	349 #endif
19489 3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	350 ret = PyString_FromFormatV(format, vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	351 va_end(vargs);
3e74318a1b76 Two improvements suggested by Greg Stein: Barry Warsaw <barry@python.org> parents: 19486 diff changeset	352 return ret;
19475 bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	353 }
bc63afc701ef PyString_FromFormat() and PyString_FromFormatV(): Largely ripped from Barry Warsaw <barry@python.org> parents: 19343 diff changeset	354
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1282 diff changeset	355 static void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	356 string_dealloc(PyObject *op)
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	357 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	358 Py_TYPE(op)->tp_free(op);
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	359 }
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	360
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	361 /* Unescape a backslash-escaped string. If unicode is non-zero,
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	362 the string is a u-literal. If recode_encoding is non-zero,
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	363 the string is UTF-8 encoded and should be re-encoded in the
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	364 specified encoding. */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	365
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	366 PyObject PyString_DecodeEscape(const char s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	367 Py_ssize_t len,
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	368 const char *errors,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	369 Py_ssize_t unicode,
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	370 const char *recode_encoding)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	371 {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	372 int c;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	373 char p, buf;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	374 const char *end;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	375 PyObject *v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	376 Py_ssize_t newlen = recode_encoding ? 4*len:len;
25100 bc590beadf0b Check whether a string resize is necessary at the end Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	377 v = PyString_FromStringAndSize((char *)NULL, newlen);
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	378 if (v == NULL)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	379 return NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	380 p = buf = PyString_AsString(v);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	381 end = s + len;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	382 while (s < end) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	383 if (*s != '\\') {
25173 f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	384 non_esc:
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	385 if (recode_encoding && (*s & 0x80)) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	386 PyObject u, w;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	387 char *r;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	388 const char* t;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	389 Py_ssize_t rn;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	390 t = s;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	391 /* Decode non-ASCII bytes as UTF-8. */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	392 while (t < end && (*t & 0x80)) t++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	393 u = PyUnicode_DecodeUTF8(s, t - s, errors);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	394 if(!u) goto failed;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	395
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	396 /* Recode them in target encoding. */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	397 w = PyUnicode_AsEncodedString(
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	398 u, recode_encoding, errors);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	399 Py_DECREF(u);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	400 if (!w) goto failed;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	401
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	402 /* Append bytes to output buffer. */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	403 assert(PyString_Check(w));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	404 r = PyString_AS_STRING(w);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	405 rn = PyString_GET_SIZE(w);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	406 Py_MEMCPY(p, r, rn);
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	407 p += rn;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	408 Py_DECREF(w);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	409 s = t;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	410 } else {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	411 p++ = s++;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	412 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	413 continue;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	414 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	415 s++;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	416 if (s==end) {
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	417 PyErr_SetString(PyExc_ValueError,
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	418 "Trailing \\ in string");
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	419 goto failed;
c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	420 }
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	421 switch (*s++) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	422 /* XXX This assumes ASCII! */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	423 case '\n': break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	424 case '\\': *p++ = '\\'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	425 case '\'': *p++ = '\''; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	426 case '\"': *p++ = '\"'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	427 case 'b': *p++ = '\b'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	428 case 'f': p++ = '\014'; break; / FF */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	429 case 't': *p++ = '\t'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	430 case 'n': *p++ = '\n'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	431 case 'r': *p++ = '\r'; break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	432 case 'v': p++ = '\013'; break; / VT */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	433 case 'a': p++ = '\007'; break; / BEL, not classic C */
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	434 case '0': case '1': case '2': case '3':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	435 case '4': case '5': case '6': case '7':
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	436 c = s[-1] - '0';
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43693 diff changeset	437 if (s < end && '0' <= s && s <= '7') {
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	438 c = (c<<3) + *s++ - '0';
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43693 diff changeset	439 if (s < end && '0' <= s && s <= '7')
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	440 c = (c<<3) + *s++ - '0';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	441 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	442 *p++ = c;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	443 break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	444 case 'x':
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43693 diff changeset	445 if (s+1 < end && ISXDIGIT(s[0]) && ISXDIGIT(s[1])) {
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	446 unsigned int x = 0;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	447 c = Py_CHARMASK(*s);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	448 s++;
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	449 if (ISDIGIT(c))
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	450 x = c - '0';
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	451 else if (ISLOWER(c))
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	452 x = 10 + c - 'a';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	453 else
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	454 x = 10 + c - 'A';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	455 x = x << 4;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	456 c = Py_CHARMASK(*s);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	457 s++;
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	458 if (ISDIGIT(c))
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	459 x += c - '0';
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	460 else if (ISLOWER(c))
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	461 x += 10 + c - 'a';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	462 else
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	463 x += 10 + c - 'A';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	464 *p++ = x;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	465 break;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	466 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	467 if (!errors \|\| strcmp(errors, "strict") == 0) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	468 PyErr_SetString(PyExc_ValueError,
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	469 "invalid \\x escape");
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	470 goto failed;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	471 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	472 if (strcmp(errors, "replace") == 0) {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	473 *p++ = '?';
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	474 } else if (strcmp(errors, "ignore") == 0)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	475 /* do nothing */;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	476 else {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	477 PyErr_Format(PyExc_ValueError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	478 "decoding error; unknown "
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	479 "error handling code: %.400s",
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	480 errors);
24809 c75cdc471b22 Check for trailing backslash. Fixes #593656. Martin v. Löwis <martin@v.loewis.de> parents: 24808 diff changeset	481 goto failed;
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	482 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	483 default:
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	484 *p++ = '\\';
25173 f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	485 s--;
f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	486 goto non_esc; /* an arbitry number of unescaped
f4e9f09df4f2 Fix escaping of non-ASCII characters. Martin v. Löwis <martin@v.loewis.de> parents: 25100 diff changeset	487 UTF-8 bytes may follow. */
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	488 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	489 }
25100 bc590beadf0b Check whether a string resize is necessary at the end Walter Dörwald <walter@livinglogic.de> parents: 25091 diff changeset	490 if (p-buf < newlen)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	491 _PyString_Resize(&v, p - buf);
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	492 return v;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	493 failed:
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	494 Py_DECREF(v);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	495 return NULL;
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	496 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	497
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	498 /* -------------------------------------------------------------------- */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	499 /* object api */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	500
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	501 Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	502 PyString_Size(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	503 {
44548 05bcb790ef63 Clean up PyString_Size(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44351 diff changeset	504 if (!PyString_Check(op)) {
05bcb790ef63 Clean up PyString_Size(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44351 diff changeset	505 PyErr_Format(PyExc_TypeError,
05bcb790ef63 Clean up PyString_Size(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44351 diff changeset	506 "expected bytes, %.200s found", Py_TYPE(op)->tp_name);
05bcb790ef63 Clean up PyString_Size(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44351 diff changeset	507 return -1;
05bcb790ef63 Clean up PyString_Size(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44351 diff changeset	508 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	509 return Py_SIZE(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	510 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	511
44548 05bcb790ef63 Clean up PyString_Size(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44351 diff changeset	512 char *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	513 PyString_AsString(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	514 {
43976 8744e41daf54 Just inline a function, and discover that it can only raise an exception. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43966 diff changeset	515 if (!PyString_Check(op)) {
8744e41daf54 Just inline a function, and discover that it can only raise an exception. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43966 diff changeset	516 PyErr_Format(PyExc_TypeError,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	517 "expected bytes, %.200s found", Py_TYPE(op)->tp_name);
43976 8744e41daf54 Just inline a function, and discover that it can only raise an exception. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43966 diff changeset	518 return NULL;
8744e41daf54 Just inline a function, and discover that it can only raise an exception. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43966 diff changeset	519 }
44548 05bcb790ef63 Clean up PyString_Size(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44351 diff changeset	520 return ((PyStringObject *)op)->ob_sval;
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	521 }
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 int
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	524 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	525 register char **s,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	526 register Py_ssize_t *len)
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	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 (s == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	529 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	530 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	531 }
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	532
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	533 if (!PyString_Check(obj)) {
43966 d23829a9db21 Removed blocks from several functions in unicodeobject and stringobject where a PyString function was still checking for PyUnicode or the other way around. Christian Heimes <christian@cheimes.de> parents: 43962 diff changeset	534 PyErr_Format(PyExc_TypeError,
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	535 "expected bytes, %.200s found", Py_TYPE(obj)->tp_name);
43966 d23829a9db21 Removed blocks from several functions in unicodeobject and stringobject where a PyString function was still checking for PyUnicode or the other way around. Christian Heimes <christian@cheimes.de> parents: 43962 diff changeset	536 return -1;
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	537 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	538
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	539 *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	540 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	541 *len = PyString_GET_SIZE(obj);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	542 else if (strlen(*s) != (size_t)PyString_GET_SIZE(obj)) {
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	543 PyErr_SetString(PyExc_TypeError,
43976 8744e41daf54 Just inline a function, and discover that it can only raise an exception. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43966 diff changeset	544 "expected bytes with no null");
14696 85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	545 return -1;
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	546 }
85038a024b19 This patch adds a new Python C API called PyString_AsStringAndSize() Marc-André Lemburg <mal@egenix.com> parents: 14492 diff changeset	547 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	548 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	549
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	550 /* -------------------------------------------------------------------- */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	551 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	552
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	553 #define STRINGLIB_CHAR char
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	554
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	555 #define STRINGLIB_CMP memcmp
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	556 #define STRINGLIB_LEN PyString_GET_SIZE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	557 #define STRINGLIB_NEW PyString_FromStringAndSize
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	558 #define STRINGLIB_STR PyString_AS_STRING
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	559 /* #define STRINGLIB_WANT_CONTAINS_OBJ 1 */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	560
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	561 #define STRINGLIB_EMPTY nullstring
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	562 #define STRINGLIB_CHECK_EXACT PyString_CheckExact
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	563 #define STRINGLIB_MUTABLE 0
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	564
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	565 #include "stringlib/fastsearch.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	566
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	567 #include "stringlib/count.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	568 #include "stringlib/find.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	569 #include "stringlib/partition.h"
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	570 #include "stringlib/ctype.h"
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	571 #include "stringlib/transmogrify.h"
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	572
46909 ef4ec968fdb6 Merged revisions 63078 via svnmerge from Eric Smith <eric@trueblade.com> parents: 46430 diff changeset	573 #define _Py_InsertThousandsGrouping _PyString_InsertThousandsGrouping
ef4ec968fdb6 Merged revisions 63078 via svnmerge from Eric Smith <eric@trueblade.com> parents: 46430 diff changeset	574 #include "stringlib/localeutil.h"
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	575
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	576 PyObject *
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	577 PyString_Repr(PyObject *obj, int smartquotes)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	578 {
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	579 static const char *hexdigits = "0123456789abcdef";
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	580 register PyStringObject* op = (PyStringObject*) obj;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	581 Py_ssize_t length = Py_SIZE(op);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	582 size_t newsize = 3 + 4 * length;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	583 PyObject *v;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	584 if (newsize > PY_SSIZE_T_MAX \|\| (newsize-3) / 4 != length) {
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	585 PyErr_SetString(PyExc_OverflowError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	586 "bytes object is too large to make repr");
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	587 return NULL;
13196 18920eaa1226 Marc-Andre Lemburg <mal@lemburg.com>: Marc-André Lemburg <mal@egenix.com> parents: 12966 diff changeset	588 }
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	589 v = PyUnicode_FromUnicode(NULL, newsize);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	590 if (v == NULL) {
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	591 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	592 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	593 else {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	594 register Py_ssize_t i;
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	595 register Py_UNICODE c;
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	596 register Py_UNICODE *p = PyUnicode_AS_UNICODE(v);
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	597 int quote;
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	598
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	599 /* 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	600 quote = '\'';
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	601 if (smartquotes) {
42143 0dc62647aff0 Fix a subtle bug in PyString_Repr(). Guido van Rossum <guido@python.org> parents: 42095 diff changeset	602 char test, start;
0dc62647aff0 Fix a subtle bug in PyString_Repr(). Guido van Rossum <guido@python.org> parents: 42095 diff changeset	603 start = PyString_AS_STRING(op);
0dc62647aff0 Fix a subtle bug in PyString_Repr(). Guido van Rossum <guido@python.org> parents: 42095 diff changeset	604 for (test = start; test < start+length; ++test) {
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	605 if (*test == '"') {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	606 quote = '\''; /* back to single */
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	607 goto decided;
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	608 }
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	609 else if (*test == '\'')
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	610 quote = '"';
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	611 }
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	612 decided:
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	613 ;
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	614 }
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	615
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	616 p++ = 'b', p++ = quote;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	617 for (i = 0; i < length; i++) {
21147 90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	618 /* There's at least enough room for a hex escape
90a0d80033b4 PyString_FromFormatV, string_repr: document why these use sprintf Tim Peters <tim.peters@gmail.com> parents: 21138 diff changeset	619 and a closing quote. */
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	620 assert(newsize - (p - PyUnicode_AS_UNICODE(v)) >= 5);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	621 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	622 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	623 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	624 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	625 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	626 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	627 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	628 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	629 p++ = '\\', p++ = 'r';
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	630 else if (c < ' ' \|\| c >= 0x7f) {
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	631 *p++ = '\\';
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	632 *p++ = 'x';
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	633 *p++ = hexdigits[(c & 0xf0) >> 4];
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	634 *p++ = hexdigits[c & 0xf];
25721 8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	635 }
8b20b26f1186 Back out #479898. Martin v. Löwis <martin@v.loewis.de> parents: 25719 diff changeset	636 else
25643 5c6fac95a94b Patch #479898: Use multibyte C library for printing strings if available. Martin v. Löwis <martin@v.loewis.de> parents: 25233 diff changeset	637 *p++ = c;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	638 }
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	639 assert(newsize - (p - PyUnicode_AS_UNICODE(v)) >= 1);
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	640 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	641 *p = '\0';
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	642 if (PyUnicode_Resize(&v, (p - PyUnicode_AS_UNICODE(v)))) {
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	643 Py_DECREF(v);
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	644 return NULL;
b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41749 diff changeset	645 }
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	646 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	647 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	648 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	649
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	650 static PyObject *
24808 ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	651 string_repr(PyObject *op)
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	652 {
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	653 return PyString_Repr(op, 1);
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	654 }
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	655
ab63af3ec349 Patch #505705: Remove eval in pickle and cPickle. Martin v. Löwis <martin@v.loewis.de> parents: 24736 diff changeset	656 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	657 string_str(PyObject *op)
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	658 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	659 if (Py_BytesWarningFlag) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	660 if (PyErr_WarnEx(PyExc_BytesWarning,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	661 "str() on a bytes instance", 1))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	662 return NULL;
20464 98df0115ecf9 SF bug [#468061] __str__ ignored in str subclass. Tim Peters <tim.peters@gmail.com> parents: 20415 diff changeset	663 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	664 return string_repr(op);
17645 b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	665 }
b5f583eecb20 Add a proper implementation for the tp_str slot (returning self, of Guido van Rossum <guido@python.org> parents: 17640 diff changeset	666
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	667 static Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	668 string_length(PyStringObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	669 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	670 return Py_SIZE(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	671 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	672
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	673 /* This is also used by PyString_Concat() */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	674 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	675 string_concat(PyObject a, PyObject b)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	676 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	677 Py_ssize_t size;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	678 Py_buffer va, vb;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	679 PyObject *result = NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	680
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	681 va.len = -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	682 vb.len = -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	683 if (_getbuffer(a, &va) < 0 \|\|
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	684 _getbuffer(b, &vb) < 0) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	685 PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	686 Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	687 goto done;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	688 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	689
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	690 /* Optimize end cases */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	691 if (va.len == 0 && PyString_CheckExact(b)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	692 result = b;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	693 Py_INCREF(result);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	694 goto done;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	695 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	696 if (vb.len == 0 && PyString_CheckExact(a)) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	697 result = a;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	698 Py_INCREF(result);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	699 goto done;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	700 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	701
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	702 size = va.len + vb.len;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	703 if (size < 0) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	704 PyErr_NoMemory();
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	705 goto done;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	706 }
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	707
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	708 result = PyString_FromStringAndSize(NULL, size);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	709 if (result != NULL) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	710 memcpy(PyString_AS_STRING(result), va.buf, va.len);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	711 memcpy(PyString_AS_STRING(result) + va.len, vb.buf, vb.len);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	712 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	713
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	714 done:
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	715 if (va.len != -1)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	716 PyObject_ReleaseBuffer(a, &va);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	717 if (vb.len != -1)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	718 PyObject_ReleaseBuffer(b, &vb);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	719 return result;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	720 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	721
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	722 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	723 string_repeat(register PyStringObject *a, register Py_ssize_t n)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	724 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	725 register Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	726 register Py_ssize_t j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	727 register Py_ssize_t size;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	728 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	729 size_t nbytes;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	730 if (n < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	731 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	732 /* 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	733 * 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	734 */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	735 size = Py_SIZE(a) * n;
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	736 if (n && size / n != Py_SIZE(a)) {
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	737 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	738 "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	739 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	740 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	741 if (size == Py_SIZE(a) && PyString_CheckExact(a)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	742 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	743 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	744 }
32423 64534fb3afcd sizeof(char) is 1, by definition, so get rid of that expression in Tim Peters <tim.peters@gmail.com> parents: 32305 diff changeset	745 nbytes = (size_t)size;
64534fb3afcd sizeof(char) is 1, by definition, so get rid of that expression in Tim Peters <tim.peters@gmail.com> parents: 32305 diff changeset	746 if (nbytes + sizeof(PyStringObject) <= nbytes) {
14492 7728b0ea9344 Fix for bug 113934. stringn and unicoden did no overflow checking at Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	747 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	748 "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	749 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	750 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	751 op = (PyStringObject *)
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	752 PyObject_MALLOC(sizeof(PyStringObject) + nbytes);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	753 if (op == NULL)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	754 return PyErr_NoMemory();
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12371 diff changeset	755 PyObject_INIT_VAR(op, &PyString_Type, size);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	756 op->ob_shash = -1;
27123 1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	757 op->ob_sval[size] = '\0';
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	758 if (Py_SIZE(a) == 1 && n > 0) {
27123 1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	759 memset(op->ob_sval, a->ob_sval[0] , n);
1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	760 return (PyObject *) op;
1b881d5e4a90 GvR's idea to use memset() for the most common special case of repeating Raymond Hettinger <python@rcn.com> parents: 27101 diff changeset	761 }
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	762 i = 0;
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	763 if (i < size) {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	764 Py_MEMCPY(op->ob_sval, a->ob_sval, Py_SIZE(a));
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	765 i = Py_SIZE(a);
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	766 }
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	767 while (i < size) {
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	768 j = (i <= size-i) ? i : size-i;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	769 Py_MEMCPY(op->ob_sval+i, op->ob_sval, j);
27101 6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	770 i += j;
6d7daa5329c6 Optimize string_repeat. Raymond Hettinger <python@rcn.com> parents: 26825 diff changeset	771 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	772 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	773 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	774
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 static int
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	776 string_contains(PyObject self, PyObject arg)
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	777 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	778 Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	779 if (ival == -1 && PyErr_Occurred()) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	780 Py_buffer varg;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	781 int pos;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	782 PyErr_Clear();
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	783 if (_getbuffer(arg, &varg) < 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	784 return -1;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	785 pos = stringlib_find(PyString_AS_STRING(self), Py_SIZE(self),
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	786 varg.buf, varg.len, 0);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	787 PyObject_ReleaseBuffer(arg, &varg);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	788 return pos >= 0;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	789 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	790 if (ival < 0 \|\| ival >= 256) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	791 PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)");
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	792 return -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	793 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	794
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	795 return memchr(PyString_AS_STRING(self), ival, Py_SIZE(self)) != NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	796 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	797
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	798 static PyObject *
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	799 string_item(PyStringObject *a, register Py_ssize_t i)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	800 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	801 if (i < 0 \|\| i >= Py_SIZE(a)) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	802 PyErr_SetString(PyExc_IndexError, "string index out of range");
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	803 return NULL;
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	804 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	805 return PyLong_FromLong((unsigned char)a->ob_sval[i]);
11942 421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	806 }
421b1620f582 Patch by Moshe Zadka: move the string special case from abstract.c Guido van Rossum <guido@python.org> parents: 11919 diff changeset	807
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	808 static PyObject*
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	809 string_richcompare(PyStringObject a, PyStringObject b, int op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	810 {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	811 int c;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	812 Py_ssize_t len_a, len_b;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	813 Py_ssize_t min_len;
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	814 PyObject *result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	815
20140 225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20057 diff changeset	816 /* Make sure both arguments are strings. */
225f17ec8932 Merge branch changes (coercion, rich comparisons) into trunk. Guido van Rossum <guido@python.org> parents: 20057 diff changeset	817 if (!(PyString_Check(a) && PyString_Check(b))) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	818 if (Py_BytesWarningFlag && (op == Py_EQ) &&
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	819 (PyObject_IsInstance((PyObject*)a,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	820 (PyObject*)&PyUnicode_Type) \|\|
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	821 PyObject_IsInstance((PyObject*)b,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	822 (PyObject*)&PyUnicode_Type))) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	823 if (PyErr_WarnEx(PyExc_BytesWarning,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	824 "Comparsion between bytes and string", 1))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	825 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	826 }
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	827 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	828 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	829 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	830 if (a == b) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	831 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	832 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	833 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	834 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	835 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	836 result = Py_False;
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 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	839 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	840 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	841 /* 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	842 much time, since Py_NE is rarely used. */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	843 if (Py_SIZE(a) == Py_SIZE(b)
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	844 && (a->ob_sval[0] == b->ob_sval[0]
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	845 && memcmp(a->ob_sval, b->ob_sval, Py_SIZE(a)) == 0)) {
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	846 result = Py_True;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	847 } else {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	848 result = Py_False;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	849 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	850 goto out;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	851 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	852 len_a = Py_SIZE(a); len_b = Py_SIZE(b);
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	853 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	854 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	855 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	856 if (c==0)
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	857 c = memcmp(a->ob_sval, b->ob_sval, min_len);
40909 f2f0b41f270d Merged revisions 53875-53911 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	858 } else
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	859 c = 0;
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 = (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	862 switch (op) {
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	863 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	864 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	865 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	866 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	867 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	868 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	869 default:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	870 result = Py_NotImplemented;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	871 goto out;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	872 }
17964 5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	873 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	874 out:
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	875 Py_INCREF(result);
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	876 return result;
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	877 }
5e1141157d53 Patch #424335: Implement string_richcompare, remove string_compare. Martin v. Löwis <martin@v.loewis.de> parents: 17835 diff changeset	878
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	879 static long
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	880 string_hash(PyStringObject *a)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	881 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	882 register Py_ssize_t len;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	883 register unsigned char *p;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	884 register long x;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	885
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	886 if (a->ob_shash != -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	887 return a->ob_shash;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	888 len = Py_SIZE(a);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	889 p = (unsigned char *) a->ob_sval;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	890 x = *p << 7;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	891 while (--len >= 0)
4283 839f72610ae1 Multiply by 1000003 instead of 3 in string hach Guido van Rossum <guido@python.org> parents: 3586 diff changeset	892 x = (1000003x) ^ p++;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	893 x ^= Py_SIZE(a);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	894 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	895 x = -2;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	896 a->ob_shash = x;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	897 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	898 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	899
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	900 static PyObject*
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	901 string_subscript(PyStringObject* self, PyObject* item)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	902 {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39544 diff changeset	903 if (PyIndex_Check(item)) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39544 diff changeset	904 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	905 if (i == -1 && PyErr_Occurred())
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	906 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	907 if (i < 0)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	908 i += PyString_GET_SIZE(self);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	909 if (i < 0 \|\| i >= PyString_GET_SIZE(self)) {
43604 b18f6092f6e0 Patch 1280, by Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43577 diff changeset	910 PyErr_SetString(PyExc_IndexError,
b18f6092f6e0 Patch 1280, by Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43577 diff changeset	911 "string index out of range");
b18f6092f6e0 Patch 1280, by Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43577 diff changeset	912 return NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	913 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	914 return PyLong_FromLong((unsigned char)self->ob_sval[i]);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	915 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	916 else if (PySlice_Check(item)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	917 Py_ssize_t start, stop, step, slicelength, cur, i;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	918 char* source_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	919 char* result_buf;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	920 PyObject* result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	921
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	922 if (PySlice_GetIndicesEx((PySliceObject*)item,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	923 PyString_GET_SIZE(self),
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	924 &start, &stop, &step, &slicelength) < 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	925 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	926 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	927
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	928 if (slicelength <= 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	929 return PyString_FromStringAndSize("", 0);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	930 }
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	931 else if (start == 0 && step == 1 &&
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	932 slicelength == PyString_GET_SIZE(self) &&
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	933 PyString_CheckExact(self)) {
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	934 Py_INCREF(self);
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	935 return (PyObject *)self;
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	936 }
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	937 else if (step == 1) {
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	938 return PyString_FromStringAndSize(
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	939 PyString_AS_STRING(self) + start,
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	940 slicelength);
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42665 diff changeset	941 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	942 else {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	943 source_buf = PyString_AsString((PyObject*)self);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	944 result_buf = (char *)PyMem_Malloc(slicelength);
35730 8bec120dbb16 SF bug #1331563 ] string_subscript doesn't check for failed PyMem_Malloc. Will backport Neal Norwitz <nnorwitz@gmail.com> parents: 35665 diff changeset	945 if (result_buf == NULL)
8bec120dbb16 SF bug #1331563 ] string_subscript doesn't check for failed PyMem_Malloc. Will backport Neal Norwitz <nnorwitz@gmail.com> parents: 35665 diff changeset	946 return PyErr_NoMemory();
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	947
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	948 for (cur = start, i = 0; i < slicelength;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	949 cur += step, i++) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	950 result_buf[i] = source_buf[cur];
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	951 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	952
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	953 result = PyString_FromStringAndSize(result_buf,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	954 slicelength);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	955 PyMem_Free(result_buf);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	956 return result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	957 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	958 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	959 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	960 PyErr_Format(PyExc_TypeError,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	961 "string indices must be integers, not %.200s",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	962 Py_TYPE(item)->tp_name);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	963 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	964 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	965 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	966
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42594 diff changeset	967 static int
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43100 diff changeset	968 string_buffer_getbuffer(PyStringObject self, Py_buffer view, int flags)
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	969 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	970 return PyBuffer_FillInfo(view, (void *)self->ob_sval, Py_SIZE(self),
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	971 0, flags);
9305 083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	972 }
083efa076366 Greg Stein: Implement the new bf_getcharbuffer function, indicating Guido van Rossum <guido@python.org> parents: 9191 diff changeset	973
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	974 static PySequenceMethods string_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	975 (lenfunc)string_length, /sq_length/
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	976 (binaryfunc)string_concat, /sq_concat/
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	977 (ssizeargfunc)string_repeat, /sq_repeat/
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	978 (ssizeargfunc)string_item, /sq_item/
43100 4e6b4ba60c3b Remove the simple slicing API. All slicing is now done with slice objects. Thomas Wouters <thomas@python.org> parents: 42954 diff changeset	979 0, /sq_slice/
259 6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	980 0, /sq_ass_item/
6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	981 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	982 (objobjproc)string_contains /sq_contains/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	983 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	984
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	985 static PyMappingMethods string_as_mapping = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	986 (lenfunc)string_length,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	987 (binaryfunc)string_subscript,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	988 0,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	989 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	990
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	991 static PyBufferProcs string_as_buffer = {
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42594 diff changeset	992 (getbufferproc)string_buffer_getbuffer,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	993 NULL,
5410 3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	994 };
3b2fda31bf1b Checkin of Jack's buffer mods. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	995
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	996
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	997 #define LEFTSTRIP 0
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	998 #define RIGHTSTRIP 1
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	999 #define BOTHSTRIP 2
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1000
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1001 /* Arrays indexed by above */
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1002 static const char *stripformat[] = {"\|O:lstrip", "\|O:rstrip", "\|O:strip"};
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1003
e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1004 #define STRIPNAME(i) (stripformat[i]+3)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1005
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1006
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1007 /* Don't call if length < 2 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1008 #define Py_STRING_MATCH(target, offset, pattern, length) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1009 (target[offset] == pattern[0] && \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1010 target[offset+length-1] == pattern[length-1] && \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1011 !memcmp(target+offset+1, pattern+1, length-2) )
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1012
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1013
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1014 /* Overallocate the initial list to reduce the number of reallocs for small
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1015 split sizes. Eg, "A A A A A A A A A A".split() (10 elements) has three
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1016 resizes, to sizes 4, 8, then 16. Most observed string splits are for human
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1017 text (roughly 11 words per line) and field delimited data (usually 1-10
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1018 fields). For large strings the split algorithms are bandwidth limited
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1019 so increasing the preallocation likely will not improve things.*/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1020
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1021 #define MAX_PREALLOC 12
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1022
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1023 /* 5 splits gives 6 elements */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1024 #define PREALLOC_SIZE(maxsplit) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1025 (maxsplit >= MAX_PREALLOC ? MAX_PREALLOC : maxsplit+1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1026
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1027 #define SPLIT_ADD(data, left, right) { \
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1028 str = PyString_FromStringAndSize((data) + (left), \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1029 (right) - (left)); \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1030 if (str == NULL) \
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1031 goto onError; \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1032 if (count < MAX_PREALLOC) { \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1033 PyList_SET_ITEM(list, count, str); \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1034 } else { \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1035 if (PyList_Append(list, str)) { \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1036 Py_DECREF(str); \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1037 goto onError; \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1038 } \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1039 else \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1040 Py_DECREF(str); \
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1041 } \
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1042 count++; }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1043
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1044 /* Always force the list to the expected size. */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1045 #define FIX_PREALLOC_SIZE(list) Py_SIZE(list) = count
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1046
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1047 #define SKIP_SPACE(s, i, len) { while (i<len && ISSPACE(s[i])) i++; }
98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1048 #define SKIP_NONSPACE(s, i, len) { while (i<len && !ISSPACE(s[i])) i++; }
98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1049 #define RSKIP_SPACE(s, i) { while (i>=0 && ISSPACE(s[i])) i--; }
98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1050 #define RSKIP_NONSPACE(s, i) { while (i>=0 && !ISSPACE(s[i])) i--; }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1051
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1052 Py_LOCAL_INLINE(PyObject *)
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1053 split_whitespace(PyStringObject *self, Py_ssize_t len, Py_ssize_t maxsplit)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1054 {
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1055 const char *s = PyString_AS_STRING(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1056 Py_ssize_t i, j, count=0;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1057 PyObject *str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1058 PyObject *list = PyList_New(PREALLOC_SIZE(maxsplit));
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1059
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1060 if (list == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1061 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1062
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1063 i = j = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1064
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1065 while (maxsplit-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1066 SKIP_SPACE(s, i, len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1067 if (i==len) break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1068 j = i; i++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1069 SKIP_NONSPACE(s, i, len);
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1070 if (j == 0 && i == len && PyString_CheckExact(self)) {
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1071 /* No whitespace in self, so just use it as list[0] */
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1072 Py_INCREF(self);
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1073 PyList_SET_ITEM(list, 0, (PyObject *)self);
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1074 count++;
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1075 break;
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1076 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1077 SPLIT_ADD(s, j, i);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1078 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1079
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1080 if (i < len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1081 /* Only occurs when maxsplit was reached */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1082 /* Skip any remaining whitespace and copy to end of string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1083 SKIP_SPACE(s, i, len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1084 if (i != len)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1085 SPLIT_ADD(s, i, len);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1086 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1087 FIX_PREALLOC_SIZE(list);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1088 return list;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1089 onError:
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1090 Py_DECREF(list);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1091 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1092 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1093
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1094 Py_LOCAL_INLINE(PyObject *)
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1095 split_char(PyStringObject *self, Py_ssize_t len, char ch, Py_ssize_t maxcount)
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1096 {
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1097 const char *s = PyString_AS_STRING(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1098 register Py_ssize_t i, j, count=0;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1099 PyObject *str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1100 PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1101
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1102 if (list == NULL)
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1103 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1104
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1105 i = j = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1106 while ((j < len) && (maxcount-- > 0)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1107 for(; j<len; j++) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1108 /* I found that using memchr makes no difference */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1109 if (s[j] == ch) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1110 SPLIT_ADD(s, i, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1111 i = j = j + 1;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1112 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1113 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1114 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1115 }
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1116 if (i == 0 && count == 0 && PyString_CheckExact(self)) {
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1117 /* ch not in self, so just use self as list[0] */
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1118 Py_INCREF(self);
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1119 PyList_SET_ITEM(list, 0, (PyObject *)self);
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1120 count++;
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1121 }
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1122 else if (i <= len) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1123 SPLIT_ADD(s, i, len);
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1124 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1125 FIX_PREALLOC_SIZE(list);
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1126 return list;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1127
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1128 onError:
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1129 Py_DECREF(list);
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1130 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1131 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1132
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1133 PyDoc_STRVAR(split__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1134 "B.split([sep[, maxsplit]]) -> list of bytes\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1135 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1136 Return a list of the sections in B, using sep as the delimiter.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1137 If sep is not given, B is split on ASCII whitespace characters\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1138 (space, tab, return, newline, formfeed, vertical tab).\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1139 If maxsplit is given, at most maxsplit splits are done.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1140
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1141 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1142 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	1143 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1144 Py_ssize_t len = PyString_GET_SIZE(self), n, i, j;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1145 Py_ssize_t maxsplit = -1, count=0;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1146 const char s = PyString_AS_STRING(self), sub;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1147 Py_buffer vsub;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1148 PyObject list, str, *subobj = Py_None;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1149 #ifdef USE_FAST
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1150 Py_ssize_t pos;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1151 #endif
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1152
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1153 if (!PyArg_ParseTuple(args, "\|On:split", &subobj, &maxsplit))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1154 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1155 if (maxsplit < 0)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1156 maxsplit = PY_SSIZE_T_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1157 if (subobj == Py_None)
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1158 return split_whitespace(self, len, maxsplit);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1159 if (_getbuffer(subobj, &vsub) < 0)
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1160 return NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1161 sub = vsub.buf;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1162 n = vsub.len;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1163
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1164 if (n == 0) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1165 PyErr_SetString(PyExc_ValueError, "empty separator");
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1166 PyObject_ReleaseBuffer(subobj, &vsub);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1167 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1168 }
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1169 else if (n == 1)
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1170 return split_char(self, len, sub[0], maxsplit);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1171
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1172 list = PyList_New(PREALLOC_SIZE(maxsplit));
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1173 if (list == NULL) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1174 PyObject_ReleaseBuffer(subobj, &vsub);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1175 return NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1176 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1177
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1178 #ifdef USE_FAST
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1179 i = j = 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1180 while (maxsplit-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1181 pos = fastsearch(s+i, len-i, sub, n, FAST_SEARCH);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1182 if (pos < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1183 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1184 j = i+pos;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1185 SPLIT_ADD(s, i, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1186 i = j + n;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1187 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1188 #else
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1189 i = j = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1190 while ((j+n <= len) && (maxsplit-- > 0)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1191 for (; j+n <= len; j++) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1192 if (Py_STRING_MATCH(s, j, sub, n)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1193 SPLIT_ADD(s, i, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1194 i = j = j + n;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1195 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1196 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1197 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1198 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1199 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1200 SPLIT_ADD(s, i, len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1201 FIX_PREALLOC_SIZE(list);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1202 PyObject_ReleaseBuffer(subobj, &vsub);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1203 return list;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1204
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1205 onError:
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1206 Py_DECREF(list);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1207 PyObject_ReleaseBuffer(subobj, &vsub);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1208 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1209 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1210
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1211 PyDoc_STRVAR(partition__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1212 "B.partition(sep) -> (head, sep, tail)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1213 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1214 Searches for the separator sep in B, and returns the part before it,\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1215 the separator itself, and the part after it. If the separator is not\n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1216 found, returns B and two empty bytes objects.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1217
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1218 static PyObject *
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1219 string_partition(PyStringObject self, PyObject sep_obj)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1220 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1221 const char *sep;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1222 Py_ssize_t sep_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1223
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1224 if (PyString_Check(sep_obj)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1225 sep = PyString_AS_STRING(sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1226 sep_len = PyString_GET_SIZE(sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1227 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1228 else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1229 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1230
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1231 return stringlib_partition(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1232 (PyObject*) self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1233 PyString_AS_STRING(self), PyString_GET_SIZE(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1234 sep_obj, sep, sep_len
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1235 );
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1236 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1237
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1238 PyDoc_STRVAR(rpartition__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1239 "B.rpartition(sep) -> (tail, sep, head)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1240 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1241 Searches for the separator sep in B, starting at the end of B,\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1242 and returns the part before it, the separator itself, and the\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1243 part after it. If the separator is not found, returns two empty\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1244 bytes objects and B.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1245
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1246 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1247 string_rpartition(PyStringObject self, PyObject sep_obj)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1248 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1249 const char *sep;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1250 Py_ssize_t sep_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1251
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1252 if (PyString_Check(sep_obj)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1253 sep = PyString_AS_STRING(sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1254 sep_len = PyString_GET_SIZE(sep_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1255 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1256 else if (PyObject_AsCharBuffer(sep_obj, &sep, &sep_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1257 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1258
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1259 return stringlib_rpartition(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1260 (PyObject*) self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1261 PyString_AS_STRING(self), PyString_GET_SIZE(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1262 sep_obj, sep, sep_len
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1263 );
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1264 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1265
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1266 Py_LOCAL_INLINE(PyObject *)
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1267 rsplit_whitespace(PyStringObject *self, Py_ssize_t len, Py_ssize_t maxsplit)
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1268 {
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1269 const char *s = PyString_AS_STRING(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1270 Py_ssize_t i, j, count=0;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1271 PyObject *str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1272 PyObject *list = PyList_New(PREALLOC_SIZE(maxsplit));
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1273
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1274 if (list == NULL)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1275 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1276
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1277 i = j = len-1;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1278
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1279 while (maxsplit-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1280 RSKIP_SPACE(s, i);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1281 if (i<0) break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1282 j = i; i--;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1283 RSKIP_NONSPACE(s, i);
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1284 if (j == len-1 && i < 0 && PyString_CheckExact(self)) {
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1285 /* No whitespace in self, so just use it as list[0] */
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1286 Py_INCREF(self);
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1287 PyList_SET_ITEM(list, 0, (PyObject *)self);
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1288 count++;
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1289 break;
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1290 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1291 SPLIT_ADD(s, i + 1, j + 1);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1292 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1293 if (i >= 0) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1294 /* Only occurs when maxsplit was reached. Skip any remaining
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1295 whitespace and copy to beginning of string. */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1296 RSKIP_SPACE(s, i);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1297 if (i >= 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1298 SPLIT_ADD(s, 0, i + 1);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1299
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1300 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1301 FIX_PREALLOC_SIZE(list);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1302 if (PyList_Reverse(list) < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1303 goto onError;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1304 return list;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1305 onError:
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1306 Py_DECREF(list);
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1307 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1308 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1309
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1310 Py_LOCAL_INLINE(PyObject *)
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1311 rsplit_char(PyStringObject *self, Py_ssize_t len, char ch, Py_ssize_t maxcount)
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1312 {
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1313 const char *s = PyString_AS_STRING(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1314 register Py_ssize_t i, j, count=0;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1315 PyObject *str;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1316 PyObject *list = PyList_New(PREALLOC_SIZE(maxcount));
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1317
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1318 if (list == NULL)
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1319 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1320
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1321 i = j = len - 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1322 while ((i >= 0) && (maxcount-- > 0)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1323 for (; i >= 0; i--) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1324 if (s[i] == ch) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1325 SPLIT_ADD(s, i + 1, j + 1);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1326 j = i = i - 1;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1327 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1328 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1329 }
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1330 }
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1331 if (i < 0 && count == 0 && PyString_CheckExact(self)) {
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1332 /* ch not in self, so just use self as list[0] */
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1333 Py_INCREF(self);
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1334 PyList_SET_ITEM(list, 0, (PyObject *)self);
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1335 count++;
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1336 }
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1337 else if (j >= -1) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1338 SPLIT_ADD(s, 0, j + 1);
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1339 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1340 FIX_PREALLOC_SIZE(list);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1341 if (PyList_Reverse(list) < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1342 goto onError;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1343 return list;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1344
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1345 onError:
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1346 Py_DECREF(list);
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1347 return NULL;
eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1348 }
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1349
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1350 PyDoc_STRVAR(rsplit__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1351 "B.rsplit([sep[, maxsplit]]) -> list of strings\n\
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1352 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1353 Return a list of the sections in B, using sep as the delimiter,\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1354 starting at the end of B and working to the front.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1355 If sep is not given, B is split on ASCII whitespace characters\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1356 (space, tab, return, newline, formfeed, vertical tab).\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1357 If maxsplit is given, at most maxsplit splits are done.");
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1358
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1359
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1360 static PyObject *
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1361 string_rsplit(PyStringObject self, PyObject args)
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1362 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1363 Py_ssize_t len = PyString_GET_SIZE(self), n, i, j;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1364 Py_ssize_t maxsplit = -1, count=0;
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1365 const char s, sub;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1366 Py_buffer vsub;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1367 PyObject list, str, *subobj = Py_None;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1368
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1369 if (!PyArg_ParseTuple(args, "\|On:rsplit", &subobj, &maxsplit))
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1370 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1371 if (maxsplit < 0)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1372 maxsplit = PY_SSIZE_T_MAX;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1373 if (subobj == Py_None)
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1374 return rsplit_whitespace(self, len, maxsplit);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1375 if (_getbuffer(subobj, &vsub) < 0)
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1376 return NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1377 sub = vsub.buf;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1378 n = vsub.len;
31350 eaa1a4b74328 [SF #866875] Add a specialized routine for one character Hye-Shik Chang <hyeshik@gmail.com> parents: 31250 diff changeset	1379
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1380 if (n == 0) {
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1381 PyErr_SetString(PyExc_ValueError, "empty separator");
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1382 PyObject_ReleaseBuffer(subobj, &vsub);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1383 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1384 }
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1385 else if (n == 1)
6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1386 return rsplit_char(self, len, sub[0], maxsplit);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1387
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1388 list = PyList_New(PREALLOC_SIZE(maxsplit));
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1389 if (list == NULL) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1390 PyObject_ReleaseBuffer(subobj, &vsub);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1391 return NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1392 }
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1393
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1394 j = len;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1395 i = j - n;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1396
44230 6b517ac10e8e Merged revisions 59407-59422 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	1397 s = PyString_AS_STRING(self);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1398 while ( (i >= 0) && (maxsplit-- > 0) ) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1399 for (; i>=0; i--) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1400 if (Py_STRING_MATCH(s, i, sub, n)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1401 SPLIT_ADD(s, i + n, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1402 j = i;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1403 i -= n;
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1404 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1405 }
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1406 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1407 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1408 SPLIT_ADD(s, 0, j);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1409 FIX_PREALLOC_SIZE(list);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1410 if (PyList_Reverse(list) < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1411 goto onError;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1412 PyObject_ReleaseBuffer(subobj, &vsub);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1413 return list;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1414
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1415 onError:
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1416 Py_DECREF(list);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1417 PyObject_ReleaseBuffer(subobj, &vsub);
31199 504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1418 return NULL;
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1419 }
504943c89193 Add rsplit method for str and unicode builtin types. Hye-Shik Chang <hyeshik@gmail.com> parents: 31042 diff changeset	1420
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	1421 #undef SPLIT_ADD
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	1422 #undef MAX_PREALLOC
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	1423 #undef PREALLOC_SIZE
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	1424
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1425
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1426 PyDoc_STRVAR(join__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1427 "B.join(iterable_of_bytes) -> bytes\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1428 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1429 Concatenates any number of bytes objects, with B in between each pair.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1430 Example: b'.'.join([b'ab', b'pq', b'rs']) -> b'ab.pq.rs'.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1431
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1432 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1433 string_join(PyObject self, PyObject orig)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1434 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1435 char *sep = PyString_AS_STRING(self);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1436 const Py_ssize_t seplen = PyString_GET_SIZE(self);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1437 PyObject *res = NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1438 char *p;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1439 Py_ssize_t seqlen = 0;
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1440 size_t sz = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1441 Py_ssize_t i;
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1442 PyObject seq, item;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1443
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1444 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	1445 if (seq == NULL) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1446 return NULL;
16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1447 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1448
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13561 diff changeset	1449 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	1450 if (seqlen == 0) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1451 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1452 return PyString_FromString("");
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1453 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1454 if (seqlen == 1) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1455 item = PySequence_Fast_GET_ITEM(seq, 0);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1456 if (PyString_CheckExact(item)) {
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1457 Py_INCREF(item);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1458 Py_DECREF(seq);
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1459 return item;
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1460 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1461 }
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1462
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1463 /* There are at least two things to join, or else we have a subclass
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1464 * of the builtin types in the sequence.
33246 03440272028c SF Patch #1007087: Return new string for single subclass joins (Bug #1001011) Raymond Hettinger <python@rcn.com> parents: 33030 diff changeset	1465 * Do a pre-pass to figure out the total amount of space we'll
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1466 * need (sz), and see whether all argument are bytes.
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1467 */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1468 /* XXX Shouldn't we use _getbuffer() on these items instead? */
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1469 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	1470 const size_t old_sz = sz;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1471 item = PySequence_Fast_GET_ITEM(seq, i);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1472 if (!PyString_Check(item) && !PyBytes_Check(item)) {
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1473 PyErr_Format(PyExc_TypeError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1474 "sequence item %zd: expected bytes,"
13544 3cf4f5aee00e small updates to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13528 diff changeset	1475 " %.80s found",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1476 i, Py_TYPE(item)->tp_name);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1477 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1478 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1479 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1480 sz += Py_SIZE(item);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1481 if (i != 0)
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1482 sz += seplen;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1483 if (sz < old_sz \|\| sz > PY_SSIZE_T_MAX) {
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1484 PyErr_SetString(PyExc_OverflowError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1485 "join() result is too long for a Python string");
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1486 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1487 return NULL;
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1488 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1489 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1490
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1491 /* Allocate result space. */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1492 res = PyString_FromStringAndSize((char*)NULL, sz);
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1493 if (res == NULL) {
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1494 Py_DECREF(seq);
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1495 return NULL;
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1496 }
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1497
754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1498 /* Catenate everything. */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1499 /* I'm not worried about a PyBytes item growing because there's
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1500 nowhere in this function where we release the GIL. */
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1501 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	1502 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	1503 size_t n;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1504 char *q;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1505 if (i) {
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1506 Py_MEMCPY(p, sep, seplen);
13524 16e490462e6b two changes to string_join: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13460 diff changeset	1507 p += seplen;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1508 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1509 item = PySequence_Fast_GET_ITEM(seq, i);
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	1510 n = Py_SIZE(item);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1511 if (PyString_Check(item))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1512 q = PyString_AS_STRING(item);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1513 else
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1514 q = PyBytes_AS_STRING(item);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1515 Py_MEMCPY(p, q, n);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1516 p += n;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1517 }
16014 754ecd21fbef Derivative of patch #102549, "simpler, faster(!) implementation of string.join". Tim Peters <tim.peters@gmail.com> parents: 15910 diff changeset	1518
13526 3686d12362b8 fix two refcount bugs in new string_join implementation: Jeremy Hylton <jeremy@alum.mit.edu> parents: 13524 diff changeset	1519 Py_DECREF(seq);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1520 return res;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1521 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1522
18130 8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1523 PyObject *
8eea2efb34cd Reformat decl of new _PyString_Join. Add NEWS blurb about repr() speedup. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	1524 _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	1525 {
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1526 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	1527 assert(x != NULL);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1528 return string_join(sep, x);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1529 }
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 18086 diff changeset	1530
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1531 Py_LOCAL_INLINE(void)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1532 string_adjust_indices(Py_ssize_t start, Py_ssize_t end, Py_ssize_t len)
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1533 {
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1534 if (*end > len)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1535 *end = len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1536 else if (*end < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1537 *end += len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1538 if (*end < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1539 *end = 0;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1540 if (*start < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1541 *start += len;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1542 if (*start < 0)
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1543 *start = 0;
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1544 }
854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	1545
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1546 Py_LOCAL_INLINE(Py_ssize_t)
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1547 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	1548 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1549 PyObject *subobj;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1550 const char *sub;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1551 Py_ssize_t sub_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1552 Py_ssize_t start=0, end=PY_SSIZE_T_MAX;
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1553 PyObject obj_start=Py_None, obj_end=Py_None;
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1554
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1555 if (!PyArg_ParseTuple(args, "O\|OO:find/rfind/index/rindex", &subobj,
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1556 &obj_start, &obj_end))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1557 return -2;
43897 41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1558 /* To support None in "start" and "end" arguments, meaning
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1559 the same as if they were not passed.
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1560 */
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1561 if (obj_start != Py_None)
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1562 if (!_PyEval_SliceIndex(obj_start, &start))
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1563 return -2;
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1564 if (obj_end != Py_None)
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1565 if (!_PyEval_SliceIndex(obj_end, &end))
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1566 return -2;
41f7c13ef161 Merged revisions 59005-59040 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	1567
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1568 if (PyString_Check(subobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1569 sub = PyString_AS_STRING(subobj);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1570 sub_len = PyString_GET_SIZE(subobj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1571 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1572 else if (PyObject_AsCharBuffer(subobj, &sub, &sub_len))
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1573 /* XXX - the "expected a character buffer object" is pretty
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1574 confusing for a non-expert. remap to something else ? */
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1575 return -2;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1576
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1577 if (dir > 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1578 return stringlib_find_slice(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1579 PyString_AS_STRING(self), PyString_GET_SIZE(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1580 sub, sub_len, start, end);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1581 else
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1582 return stringlib_rfind_slice(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1583 PyString_AS_STRING(self), PyString_GET_SIZE(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1584 sub, sub_len, start, end);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1585 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1586
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1587
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1588 PyDoc_STRVAR(find__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1589 "B.find(sub [,start [,end]]) -> int\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1590 \n\
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1591 Return the lowest index in S where substring sub is found,\n\
42466 3fc3cedc49ca Merged revisions 56753-56781 via svnmerge from Guido van Rossum <guido@python.org> parents: 42335 diff changeset	1592 such that sub is contained within s[start:end]. Optional\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1593 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	1594 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1595 Return -1 on failure.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1596
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1597 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1598 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	1599 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1600 Py_ssize_t result = string_find_internal(self, args, +1);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1601 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1602 return NULL;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	1603 return PyLong_FromSsize_t(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1604 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1605
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1606
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1607 PyDoc_STRVAR(index__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1608 "B.index(sub [,start [,end]]) -> int\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1609 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1610 Like B.find() but raise ValueError when the substring is not found.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1611
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1612 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1613 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	1614 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1615 Py_ssize_t result = string_find_internal(self, args, +1);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1616 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1617 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1618 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1619 PyErr_SetString(PyExc_ValueError,
27248 c4150f7f6a69 SF patch #664192 bug #661913: inconsistent error messages between string Raymond Hettinger <python@rcn.com> parents: 27123 diff changeset	1620 "substring not found");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1621 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1622 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	1623 return PyLong_FromSsize_t(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1624 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1625
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1626
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1627 PyDoc_STRVAR(rfind__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1628 "B.rfind(sub [,start [,end]]) -> int\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1629 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1630 Return the highest index in B where substring sub is found,\n\
42466 3fc3cedc49ca Merged revisions 56753-56781 via svnmerge from Guido van Rossum <guido@python.org> parents: 42335 diff changeset	1631 such that sub is contained within s[start:end]. Optional\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1632 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	1633 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1634 Return -1 on failure.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1635
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1636 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1637 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	1638 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1639 Py_ssize_t result = string_find_internal(self, args, -1);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1640 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1641 return NULL;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	1642 return PyLong_FromSsize_t(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1643 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1644
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1645
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1646 PyDoc_STRVAR(rindex__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1647 "B.rindex(sub [,start [,end]]) -> int\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1648 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1649 Like B.rfind() but raise ValueError when the substring is not found.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1650
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1651 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1652 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	1653 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1654 Py_ssize_t result = string_find_internal(self, args, -1);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1655 if (result == -2)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1656 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1657 if (result == -1) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1658 PyErr_SetString(PyExc_ValueError,
27248 c4150f7f6a69 SF patch #664192 bug #661913: inconsistent error messages between string Raymond Hettinger <python@rcn.com> parents: 27123 diff changeset	1659 "substring not found");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1660 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1661 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	1662 return PyLong_FromSsize_t(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1663 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1664
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1665
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1666 Py_LOCAL_INLINE(PyObject *)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1667 do_xstrip(PyStringObject self, int striptype, PyObject sepobj)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1668 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1669 Py_buffer vsep;
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1670 char *s = PyString_AS_STRING(self);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1671 Py_ssize_t len = PyString_GET_SIZE(self);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1672 char *sep;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1673 Py_ssize_t seplen;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1674 Py_ssize_t i, j;
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1675
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1676 if (_getbuffer(sepobj, &vsep) < 0)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1677 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1678 sep = vsep.buf;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1679 seplen = vsep.len;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1680
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1681 i = 0;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1682 if (striptype != RIGHTSTRIP) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1683 while (i < len && memchr(sep, Py_CHARMASK(s[i]), seplen)) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1684 i++;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1685 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1686 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1687
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1688 j = len;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1689 if (striptype != LEFTSTRIP) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1690 do {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1691 j--;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1692 } while (j >= i && memchr(sep, Py_CHARMASK(s[j]), seplen));
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1693 j++;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1694 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1695
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1696 PyObject_ReleaseBuffer(sepobj, &vsep);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1697
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1698 if (i == 0 && j == len && PyString_CheckExact(self)) {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1699 Py_INCREF(self);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1700 return (PyObject*)self;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1701 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1702 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1703 return PyString_FromStringAndSize(s+i, j-i);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1704 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1705
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1706
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1707 Py_LOCAL_INLINE(PyObject *)
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	1708 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	1709 {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1710 char *s = PyString_AS_STRING(self);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1711 Py_ssize_t len = PyString_GET_SIZE(self), i, j;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1712
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1713 i = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1714 if (striptype != RIGHTSTRIP) {
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1715 while (i < len && ISSPACE(s[i])) {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1716 i++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1717 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1718 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1719
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1720 j = len;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1721 if (striptype != LEFTSTRIP) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1722 do {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1723 j--;
43503 98f6180b9b33 Replace all (locale-dependent) uses of isupper(), tolower(), etc., by Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1724 } while (j >= i && ISSPACE(s[j]));
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1725 j++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1726 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1727
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1728 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	1729 Py_INCREF(self);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1730 return (PyObject*)self;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1731 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1732 else
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1733 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	1734 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1735
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1736
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1737 Py_LOCAL_INLINE(PyObject *)
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1738 do_argstrip(PyStringObject self, int striptype, PyObject args)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1739 {
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1740 PyObject *sep = NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1741
23225 e639e34ef901 Apply patch diff.txt from SF feature request Walter Dörwald <walter@livinglogic.de> parents: 23051 diff changeset	1742 if (!PyArg_ParseTuple(args, (char *)stripformat[striptype], &sep))
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1743 return NULL;
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1744
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1745 if (sep != NULL && sep != Py_None) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1746 return do_xstrip(self, striptype, sep);
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1747 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1748 return do_strip(self, striptype);
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1749 }
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1750
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1751
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1752 PyDoc_STRVAR(strip__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1753 "B.strip([bytes]) -> bytes\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1754 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1755 Strip leading and trailing bytes contained in the argument.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1756 If the argument is omitted, strip trailing ASCII whitespace.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1757 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1758 string_strip(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1759 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1760 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1761 return do_strip(self, BOTHSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1762 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1763 return do_argstrip(self, BOTHSTRIP, args);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1764 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1765
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1766
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1767 PyDoc_STRVAR(lstrip__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1768 "B.lstrip([bytes]) -> bytes\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1769 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1770 Strip leading bytes contained in the argument.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1771 If the argument is omitted, strip leading ASCII whitespace.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1772 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1773 string_lstrip(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1774 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1775 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1776 return do_strip(self, LEFTSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1777 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1778 return do_argstrip(self, LEFTSTRIP, args);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1779 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1780
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1781
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1782 PyDoc_STRVAR(rstrip__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1783 "B.rstrip([bytes]) -> bytes\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1784 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1785 Strip trailing bytes contained in the argument.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1786 If the argument is omitted, strip trailing ASCII whitespace.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1787 static PyObject *
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1788 string_rstrip(PyStringObject self, PyObject args)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1789 {
23015 202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1790 if (PyTuple_GET_SIZE(args) == 0)
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1791 return do_strip(self, RIGHTSTRIP); /* Common case */
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1792 else
202ae5b75cca Partially implement SF feature request 444708. Guido van Rossum <guido@python.org> parents: 22977 diff changeset	1793 return do_argstrip(self, RIGHTSTRIP, args);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1794 }
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
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1797 PyDoc_STRVAR(count__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1798 "B.count(sub [,start [,end]]) -> int\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1799 \n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1800 Return the number of non-overlapping occurrences of substring sub in\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1801 string S[start:end]. Optional arguments start and end are interpreted\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1802 as in slice notation.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1803
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1804 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1805 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	1806 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1807 PyObject *sub_obj;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1808 const char str = PyString_AS_STRING(self), sub;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1809 Py_ssize_t sub_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1810 Py_ssize_t start = 0, end = PY_SSIZE_T_MAX;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1811
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1812 if (!PyArg_ParseTuple(args, "O\|O&O&:count", &sub_obj,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1813 _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1814 return NULL;
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	1815
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1816 if (PyString_Check(sub_obj)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1817 sub = PyString_AS_STRING(sub_obj);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1818 sub_len = PyString_GET_SIZE(sub_obj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1819 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1820 else if (PyObject_AsCharBuffer(sub_obj, &sub, &sub_len))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1821 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1822
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1823 string_adjust_indices(&start, &end, PyString_GET_SIZE(self));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1824
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	1825 return PyLong_FromSsize_t(
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1826 stringlib_count(str + start, end - start, sub, sub_len)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1827 );
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1828 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1829
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1830
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	1831 PyDoc_STRVAR(translate__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1832 "B.translate(table[, deletechars]) -> bytes\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1833 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1834 Return a copy of B, where all characters occurring in the\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1835 optional argument deletechars are removed, and the remaining\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1836 characters have been mapped through the given translation\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	1837 table, which must be a bytes object of length 256.");
11383 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 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	1840 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	1841 {
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1842 register char input, output;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1843 const char *table;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1844 register Py_ssize_t i, c, changed = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1845 PyObject input_obj = (PyObject)self;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1846 const char output_start, del_table=NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	1847 Py_ssize_t inlen, tablen, dellen = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1848 PyObject *result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1849 int trans_table[256];
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1850 PyObject tableobj, delobj = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1851
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26625 diff changeset	1852 if (!PyArg_UnpackTuple(args, "translate", 1, 2,
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1853 &tableobj, &delobj))
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1854 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1855
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1856 if (PyString_Check(tableobj)) {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1857 table = PyString_AS_STRING(tableobj);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1858 tablen = PyString_GET_SIZE(tableobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1859 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1860 else if (tableobj == Py_None) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1861 table = NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1862 tablen = 256;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1863 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1864 else if (PyObject_AsCharBuffer(tableobj, &table, &tablen))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1865 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1866
26625 ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	1867 if (tablen != 256) {
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	1868 PyErr_SetString(PyExc_ValueError,
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	1869 "translation table must be 256 characters long");
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	1870 return NULL;
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	1871 }
ba1578be5706 Patch #650653: Raise always value error if the table is not 256 bytes long. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	1872
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1873 if (delobj != NULL) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1874 if (PyString_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1875 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	1876 dellen = PyString_GET_SIZE(delobj);
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1877 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1878 else if (PyUnicode_Check(delobj)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1879 PyErr_SetString(PyExc_TypeError,
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1880 "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	1881 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1882 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1883 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	1884 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1885 }
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1886 else {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1887 del_table = NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	1888 dellen = 0;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1889 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1890
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1891 inlen = PyString_GET_SIZE(input_obj);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1892 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	1893 if (result == NULL)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1894 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1895 output_start = output = PyString_AsString(result);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1896 input = PyString_AS_STRING(input_obj);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1897
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1898 if (dellen == 0 && table != NULL) {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1899 /* 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	1900 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1901 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1902 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	1903 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1904 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1905 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	1906 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1907 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1908 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1909 return input_obj;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1910 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1911
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1912 if (table == NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1913 for (i = 0; i < 256; i++)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1914 trans_table[i] = Py_CHARMASK(i);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1915 } else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1916 for (i = 0; i < 256; i++)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1917 trans_table[i] = Py_CHARMASK(table[i]);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41450 diff changeset	1918 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1919
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1920 for (i = 0; i < dellen; i++)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1921 trans_table[(int) Py_CHARMASK(del_table[i])] = -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1922
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1923 for (i = inlen; --i >= 0; ) {
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1924 c = Py_CHARMASK(*input++);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1925 if (trans_table[c] != -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1926 if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1927 continue;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1928 changed = 1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1929 }
19884 df66b4dd0b0d More bug 460020: lots of string optimizations inhibited for string Tim Peters <tim.peters@gmail.com> parents: 19846 diff changeset	1930 if (!changed && PyString_CheckExact(input_obj)) {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1931 Py_DECREF(result);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1932 Py_INCREF(input_obj);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1933 return input_obj;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1934 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1935 /* Fix the size of the resulting string */
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	1936 if (inlen > 0)
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	1937 _PyString_Resize(&result, output - output_start);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1938 return result;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1939 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1940
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1941
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1942 #define FORWARD 1
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1943 #define REVERSE -1
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1944
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1945 /* find and count characters and substrings */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1946
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1947 #define findchar(target, target_len, c) \
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1948 ((char )memchr((const void )(target), c, target_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1949
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1950 /* String ops must return a string. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1951 /* If the object is subclass of string, create a copy */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1952 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1953 return_self(PyStringObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1954 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1955 if (PyString_CheckExact(self)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1956 Py_INCREF(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1957 return self;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1958 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1959 return (PyStringObject *)PyString_FromStringAndSize(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1960 PyString_AS_STRING(self),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1961 PyString_GET_SIZE(self));
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1962 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1963
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1964 Py_LOCAL_INLINE(Py_ssize_t)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1965 countchar(const char *target, int target_len, char c, Py_ssize_t maxcount)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	1966 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1967 Py_ssize_t count=0;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1968 const char *start=target;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1969 const char *end=target+target_len;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1970
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1971 while ( (start=findchar(start, end-start, c)) != NULL ) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1972 count++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1973 if (count >= maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1974 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1975 start += 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1976 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1977 return count;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1978 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1979
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1980 Py_LOCAL(Py_ssize_t)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1981 findstring(const char *target, Py_ssize_t target_len,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	1982 const char *pattern, Py_ssize_t pattern_len,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1983 Py_ssize_t start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1984 Py_ssize_t end,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1985 int direction)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1986 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1987 if (start < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1988 start += target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1989 if (start < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1990 start = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1991 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1992 if (end > target_len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1993 end = target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1994 } else if (end < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1995 end += target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1996 if (end < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1997 end = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1998 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	1999
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2000 /* zero-length substrings always match at the first attempt */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2001 if (pattern_len == 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2002 return (direction > 0) ? start : end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2003
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2004 end -= pattern_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2005
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2006 if (direction < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2007 for (; end >= start; end--)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2008 if (Py_STRING_MATCH(target, end, pattern, pattern_len))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2009 return end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2010 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2011 for (; start <= end; start++)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2012 if (Py_STRING_MATCH(target, start,pattern,pattern_len))
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2013 return start;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2014 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2015 return -1;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2016 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2017
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2018 Py_LOCAL_INLINE(Py_ssize_t)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2019 countstring(const char *target, Py_ssize_t target_len,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2020 const char *pattern, Py_ssize_t pattern_len,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2021 Py_ssize_t start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2022 Py_ssize_t end,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2023 int direction, Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2024 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2025 Py_ssize_t count=0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2026
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2027 if (start < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2028 start += target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2029 if (start < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2030 start = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2031 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2032 if (end > target_len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2033 end = target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2034 } else if (end < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2035 end += target_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2036 if (end < 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2037 end = 0;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2038 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2039
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2040 /* zero-length substrings match everywhere */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2041 if (pattern_len == 0 \|\| maxcount == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2042 if (target_len+1 < maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2043 return target_len+1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2044 return maxcount;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2045 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2046
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2047 end -= pattern_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2048 if (direction < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2049 for (; (end >= start); end--)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2050 if (Py_STRING_MATCH(target, end,pattern,pattern_len)) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2051 count++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2052 if (--maxcount <= 0) break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2053 end -= pattern_len-1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2054 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2055 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2056 for (; (start <= end); start++)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2057 if (Py_STRING_MATCH(target, start,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2058 pattern, pattern_len)) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2059 count++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2060 if (--maxcount <= 0)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2061 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2062 start += pattern_len-1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2063 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2064 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2065 return count;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2066 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2067
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2068
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2069 /* Algorithms for different cases of string replacement */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2070
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2071 /* len(self)>=1, from="", len(to)>=1, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2072 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2073 replace_interleave(PyStringObject *self,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2074 const char *to_s, Py_ssize_t to_len,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2075 Py_ssize_t maxcount)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2076 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2077 char self_s, result_s;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2078 Py_ssize_t self_len, result_len;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2079 Py_ssize_t count, i, product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2080 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2081
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2082 self_len = PyString_GET_SIZE(self);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2083
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2084 /* 1 at the end plus 1 after every character */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2085 count = self_len+1;
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2086 if (maxcount < count)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2087 count = maxcount;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2088
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2089 /* Check for overflow */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2090 /* result_len = count * to_len + self_len; */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2091 product = count * to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2092 if (product / to_len != count) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2093 PyErr_SetString(PyExc_OverflowError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2094 "replace string is too long");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2095 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2096 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2097 result_len = product + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2098 if (result_len < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2099 PyErr_SetString(PyExc_OverflowError,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2100 "replace string is too long");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2101 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2102 }
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2103
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2104 if (! (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2105 PyString_FromStringAndSize(NULL, result_len)) )
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2106 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2107
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2108 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2109 result_s = PyString_AS_STRING(result);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2110
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2111 /* TODO: special case single character, which doesn't need memcpy */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2112
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2113 /* Lay the first one down (guaranteed this will occur) */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2114 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2115 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2116 count -= 1;
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2117
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2118 for (i=0; i<count; i++) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2119 result_s++ = self_s++;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2120 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2121 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2122 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2123
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2124 /* Copy the rest of the original string */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2125 Py_MEMCPY(result_s, self_s, self_len-i);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2126
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2127 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2128 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2129
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2130 /* Special case for deleting a single character */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2131 /* len(self)>=1, len(from)==1, to="", maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2132 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2133 replace_delete_single_character(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2134 char from_c, Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2135 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2136 char self_s, result_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2137 char start, next, *end;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2138 Py_ssize_t self_len, result_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2139 Py_ssize_t count;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2140 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2141
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2142 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2143 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2144
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2145 count = countchar(self_s, self_len, from_c, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2146 if (count == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2147 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2148 }
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2149
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2150 result_len = self_len - count; /* from_len == 1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2151 assert(result_len>=0);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2152
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2153 if ( (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2154 PyString_FromStringAndSize(NULL, result_len)) == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2155 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2156 result_s = PyString_AS_STRING(result);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2157
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2158 start = self_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2159 end = self_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2160 while (count-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2161 next = findchar(start, end-start, from_c);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2162 if (next == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2163 break;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2164 Py_MEMCPY(result_s, start, next-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2165 result_s += (next-start);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2166 start = next+1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2167 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2168 Py_MEMCPY(result_s, start, end-start);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2169
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2170 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2171 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2172
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2173 /* len(self)>=1, len(from)>=2, to="", maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2174
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2175 Py_LOCAL(PyStringObject *)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2176 replace_delete_substring(PyStringObject *self,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2177 const char *from_s, Py_ssize_t from_len,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2178 Py_ssize_t maxcount) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2179 char self_s, result_s;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2180 char start, next, *end;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2181 Py_ssize_t self_len, result_len;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2182 Py_ssize_t count, offset;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2183 PyStringObject *result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2184
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2185 self_len = PyString_GET_SIZE(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2186 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2187
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2188 count = countstring(self_s, self_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2189 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2190 0, self_len, 1,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2191 maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2192
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2193 if (count == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2194 /* no matches */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2195 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2196 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2197
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2198 result_len = self_len - (count * from_len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2199 assert (result_len>=0);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2200
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2201 if ( (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2202 PyString_FromStringAndSize(NULL, result_len)) == NULL )
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2203 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2204
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2205 result_s = PyString_AS_STRING(result);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2206
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2207 start = self_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2208 end = self_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2209 while (count-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2210 offset = findstring(start, end-start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2211 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2212 0, end-start, FORWARD);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2213 if (offset == -1)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2214 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2215 next = start + offset;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2216
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2217 Py_MEMCPY(result_s, start, next-start);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2218
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2219 result_s += (next-start);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2220 start = next+from_len;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2221 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2222 Py_MEMCPY(result_s, start, end-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2223 return result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2224 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2225
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2226 /* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2227 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2228 replace_single_character_in_place(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2229 char from_c, char to_c,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2230 Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2231 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2232 char self_s, result_s, start, end, *next;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2233 Py_ssize_t self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2234 PyStringObject *result;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2235
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2236 /* The result string will be the same size */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2237 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2238 self_len = PyString_GET_SIZE(self);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2239
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2240 next = findchar(self_s, self_len, from_c);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2241
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2242 if (next == NULL) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2243 /* No matches; return the original string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2244 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2245 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2246
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2247 /* Need to make a new string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2248 result = (PyStringObject *) PyString_FromStringAndSize(NULL, self_len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2249 if (result == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2250 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2251 result_s = PyString_AS_STRING(result);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2252 Py_MEMCPY(result_s, self_s, self_len);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2253
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2254 /* change everything in-place, starting with this one */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2255 start = result_s + (next-self_s);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2256 *start = to_c;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2257 start++;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2258 end = result_s + self_len;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2259
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2260 while (--maxcount > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2261 next = findchar(start, end-start, from_c);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2262 if (next == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2263 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2264 *next = to_c;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2265 start = next+1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2266 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2267
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2268 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2269 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2270
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2271 /* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2272 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2273 replace_substring_in_place(PyStringObject *self,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2274 const char *from_s, Py_ssize_t from_len,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2275 const char *to_s, Py_ssize_t to_len,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2276 Py_ssize_t maxcount)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2277 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2278 char result_s, start, *end;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2279 char *self_s;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2280 Py_ssize_t self_len, offset;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2281 PyStringObject *result;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2282
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2283 /* The result string will be the same size */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2284
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2285 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2286 self_len = PyString_GET_SIZE(self);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2287
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2288 offset = findstring(self_s, self_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2289 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2290 0, self_len, FORWARD);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2291 if (offset == -1) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2292 /* No matches; return the original string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2293 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2294 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2295
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2296 /* Need to make a new string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2297 result = (PyStringObject *) PyString_FromStringAndSize(NULL, self_len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2298 if (result == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2299 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2300 result_s = PyString_AS_STRING(result);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2301 Py_MEMCPY(result_s, self_s, self_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2302
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2303 /* change everything in-place, starting with this one */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2304 start = result_s + offset;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2305 Py_MEMCPY(start, to_s, from_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2306 start += from_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2307 end = result_s + self_len;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2308
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2309 while ( --maxcount > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2310 offset = findstring(start, end-start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2311 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2312 0, end-start, FORWARD);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2313 if (offset==-1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2314 break;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2315 Py_MEMCPY(start+offset, to_s, from_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2316 start += offset+from_len;
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2317 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2318
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2319 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2320 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2321
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2322 /* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2323 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2324 replace_single_character(PyStringObject *self,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2325 char from_c,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2326 const char *to_s, Py_ssize_t to_len,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2327 Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2328 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2329 char self_s, result_s;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2330 char start, next, *end;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2331 Py_ssize_t self_len, result_len;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2332 Py_ssize_t count, product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2333 PyStringObject *result;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2334
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2335 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2336 self_len = PyString_GET_SIZE(self);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2337
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2338 count = countchar(self_s, self_len, from_c, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2339 if (count == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2340 /* no matches, return unchanged */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2341 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2342 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2343
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2344 /* use the difference between current and new, hence the "-1" */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2345 /* result_len = self_len + count * (to_len-1) */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2346 product = count * (to_len-1);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2347 if (product / (to_len-1) != count) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2348 PyErr_SetString(PyExc_OverflowError,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2349 "replace string is too long");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2350 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2351 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2352 result_len = self_len + product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2353 if (result_len < 0) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2354 PyErr_SetString(PyExc_OverflowError,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2355 "replace string is too long");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2356 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2357 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2358
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2359 if ( (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2360 PyString_FromStringAndSize(NULL, result_len)) == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2361 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2362 result_s = PyString_AS_STRING(result);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2363
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2364 start = self_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2365 end = self_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2366 while (count-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2367 next = findchar(start, end-start, from_c);
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2368 if (next == NULL)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2369 break;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2370
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2371 if (next == start) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2372 /* replace with the 'to' */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2373 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2374 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2375 start += 1;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2376 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2377 /* copy the unchanged old then the 'to' */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2378 Py_MEMCPY(result_s, start, next-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2379 result_s += (next-start);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2380 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2381 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2382 start = next+1;
25004 762dd09edb83 Code by Inyeol Lee, submitted to SF bug 595350, to implement Guido van Rossum <guido@python.org> parents: 24918 diff changeset	2383 }
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17741 diff changeset	2384 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2385 /* Copy the remainder of the remaining string */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2386 Py_MEMCPY(result_s, start, end-start);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2387
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2388 return result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2389 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2390
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2391 /* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2392 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2393 replace_substring(PyStringObject *self,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2394 const char *from_s, Py_ssize_t from_len,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2395 const char *to_s, Py_ssize_t to_len,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2396 Py_ssize_t maxcount) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2397 char self_s, result_s;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2398 char start, next, *end;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2399 Py_ssize_t self_len, result_len;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2400 Py_ssize_t count, offset, product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2401 PyStringObject *result;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2402
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2403 self_s = PyString_AS_STRING(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2404 self_len = PyString_GET_SIZE(self);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2405
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2406 count = countstring(self_s, self_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2407 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2408 0, self_len, FORWARD, maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2409 if (count == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2410 /* no matches, return unchanged */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2411 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2412 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2413
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2414 /* Check for overflow */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2415 /* result_len = self_len + count * (to_len-from_len) */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2416 product = count * (to_len-from_len);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2417 if (product / (to_len-from_len) != count) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2418 PyErr_SetString(PyExc_OverflowError,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2419 "replace string is too long");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2420 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2421 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2422 result_len = self_len + product;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2423 if (result_len < 0) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2424 PyErr_SetString(PyExc_OverflowError,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2425 "replace string is too long");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2426 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2427 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2428
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2429 if ( (result = (PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2430 PyString_FromStringAndSize(NULL, result_len)) == NULL)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2431 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2432 result_s = PyString_AS_STRING(result);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2433
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2434 start = self_s;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2435 end = self_s + self_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2436 while (count-- > 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2437 offset = findstring(start, end-start,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2438 from_s, from_len,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2439 0, end-start, FORWARD);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2440 if (offset == -1)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2441 break;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2442 next = start+offset;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2443 if (next == start) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2444 /* replace with the 'to' */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2445 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2446 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2447 start += from_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2448 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2449 /* copy the unchanged old then the 'to' */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2450 Py_MEMCPY(result_s, start, next-start);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2451 result_s += (next-start);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2452 Py_MEMCPY(result_s, to_s, to_len);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2453 result_s += to_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2454 start = next+from_len;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2455 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2456 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2457 /* Copy the remainder of the remaining string */
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2458 Py_MEMCPY(result_s, start, end-start);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2459
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2460 return result;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2461 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2462
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2463
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2464 Py_LOCAL(PyStringObject *)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2465 replace(PyStringObject *self,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2466 const char *from_s, Py_ssize_t from_len,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2467 const char *to_s, Py_ssize_t to_len,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2468 Py_ssize_t maxcount)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2469 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2470 if (maxcount < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2471 maxcount = PY_SSIZE_T_MAX;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2472 } else if (maxcount == 0 \|\| PyString_GET_SIZE(self) == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2473 /* nothing to do; return the original string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2474 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2475 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2476
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2477 if (maxcount == 0 \|\|
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2478 (from_len == 0 && to_len == 0)) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2479 /* nothing to do; return the original string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2480 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2481 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2482
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2483 /* Handle zero-length special cases */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2484
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2485 if (from_len == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2486 /* insert the 'to' string everywhere. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2487 /* >>> "Python".replace("", ".") */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2488 /* '.P.y.t.h.o.n.' */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2489 return replace_interleave(self, to_s, to_len, maxcount);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2490 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2491
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2492 /* Except for "".replace("", "A") == "A" there is no way beyond this */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2493 /* point for an empty self string to generate a non-empty string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2494 /* Special case so the remaining code always gets a non-empty string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2495 if (PyString_GET_SIZE(self) == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2496 return return_self(self);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2497 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2498
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2499 if (to_len == 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2500 /* delete all occurances of 'from' string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2501 if (from_len == 1) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2502 return replace_delete_single_character(
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2503 self, from_s[0], maxcount);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2504 } else {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2505 return replace_delete_substring(self, from_s,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2506 from_len, maxcount);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2507 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2508 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2509
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2510 /* Handle special case where both strings have the same length */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2511
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2512 if (from_len == to_len) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2513 if (from_len == 1) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2514 return replace_single_character_in_place(
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2515 self,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2516 from_s[0],
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2517 to_s[0],
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2518 maxcount);
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2519 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2520 return replace_substring_in_place(
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2521 self, from_s, from_len, to_s, to_len,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2522 maxcount);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2523 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2524 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2525
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2526 /* Otherwise use the more generic algorithms */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2527 if (from_len == 1) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2528 return replace_single_character(self, from_s[0],
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2529 to_s, to_len, maxcount);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2530 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2531 /* len('from')>=2, len('to')>=1 */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2532 return replace_substring(self, from_s, from_len, to_s, to_len,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2533 maxcount);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2534 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2535 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2536
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2537 PyDoc_STRVAR(replace__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2538 "B.replace(old, new[, count]) -> bytes\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2539 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2540 Return a copy of B with all occurrences of subsection\n\
30751 6fdde96a7222 Avoid confusing name for the 3rd argument to str.replace(). Fred Drake <fdrake@acm.org> parents: 30706 diff changeset	2541 old replaced by new. If the optional argument count is\n\
6fdde96a7222 Avoid confusing name for the 3rd argument to str.replace(). Fred Drake <fdrake@acm.org> parents: 30706 diff changeset	2542 given, only the first count occurrences are replaced.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2543
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2544 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2545 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	2546 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2547 Py_ssize_t count = -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2548 PyObject from, to;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2549 const char from_s, to_s;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2550 Py_ssize_t from_len, to_len;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2551
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2552 if (!PyArg_ParseTuple(args, "OO\|n:replace", &from, &to, &count))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2553 return NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2554
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2555 if (PyString_Check(from)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2556 from_s = PyString_AS_STRING(from);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2557 from_len = PyString_GET_SIZE(from);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2558 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2559 else if (PyObject_AsCharBuffer(from, &from_s, &from_len))
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2560 return NULL;
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2561
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2562 if (PyString_Check(to)) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2563 to_s = PyString_AS_STRING(to);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2564 to_len = PyString_GET_SIZE(to);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2565 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2566 else if (PyObject_AsCharBuffer(to, &to_s, &to_len))
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2567 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2568
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2569 return (PyObject )replace((PyStringObject ) self,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2570 from_s, from_len,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2571 to_s, to_len, count);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2572 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2573
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2574 / End DALKE /
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2575
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2576 /* Matches the end (direction >= 0) or start (direction < 0) of self
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2577 * against substr, using the start and end arguments. Returns
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2578 * -1 on error, 0 if not found and 1 if found.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2579 */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2580 Py_LOCAL(int)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2581 _string_tailmatch(PyStringObject self, PyObject substr, Py_ssize_t start,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2582 Py_ssize_t end, int direction)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2583 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2584 Py_ssize_t len = PyString_GET_SIZE(self);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2585 Py_ssize_t slen;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2586 const char* sub;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2587 const char* str;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2588
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2589 if (PyString_Check(substr)) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2590 sub = PyString_AS_STRING(substr);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2591 slen = PyString_GET_SIZE(substr);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2592 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2593 else if (PyObject_AsCharBuffer(substr, &sub, &slen))
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2594 return -1;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2595 str = PyString_AS_STRING(self);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2596
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2597 string_adjust_indices(&start, &end, len);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2598
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2599 if (direction < 0) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2600 /* startswith */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2601 if (start+slen > len)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2602 return 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2603 } else {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2604 /* endswith */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2605 if (end-start < slen \|\| start > len)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2606 return 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2607
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2608 if (end-slen > start)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2609 start = end - slen;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2610 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2611 if (end-start >= slen)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2612 return ! memcmp(str+start, sub, slen);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2613 return 0;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2614 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2615
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2616
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2617 PyDoc_STRVAR(startswith__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2618 "B.startswith(prefix [,start [,end]]) -> bool\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2619 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2620 Return True if B starts with the specified prefix, False otherwise.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2621 With optional start, test B beginning at that position.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2622 With optional end, stop comparing B at that position.\n\
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2623 prefix can also be a tuple of strings to try.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2624
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2625 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2626 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	2627 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2628 Py_ssize_t start = 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2629 Py_ssize_t end = PY_SSIZE_T_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2630 PyObject *subobj;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2631 int result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2632
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2633 if (!PyArg_ParseTuple(args, "O\|O&O&:startswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2634 _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	2635 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2636 if (PyTuple_Check(subobj)) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2637 Py_ssize_t i;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2638 for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2639 result = _string_tailmatch(self,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2640 PyTuple_GET_ITEM(subobj, i),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2641 start, end, -1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2642 if (result == -1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2643 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2644 else if (result) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2645 Py_RETURN_TRUE;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2646 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2647 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2648 Py_RETURN_FALSE;
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2649 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2650 result = _string_tailmatch(self, subobj, start, end, -1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2651 if (result == -1)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2652 return NULL;
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2653 else
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2654 return PyBool_FromLong(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2655 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2656
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2657
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2658 PyDoc_STRVAR(endswith__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2659 "B.endswith(suffix [,start [,end]]) -> bool\n\
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2660 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2661 Return True if B ends with the specified suffix, False otherwise.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2662 With optional start, test B beginning at that position.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2663 With optional end, stop comparing B at that position.\n\
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2664 suffix can also be a tuple of strings to try.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2665
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2666 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	2667 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	2668 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	2669 Py_ssize_t start = 0;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	2670 Py_ssize_t end = PY_SSIZE_T_MAX;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11942 diff changeset	2671 PyObject *subobj;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2672 int result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2673
12615 67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2674 if (!PyArg_ParseTuple(args, "O\|O&O&:endswith", &subobj,
67233df13037 Trent Mick: Guido van Rossum <guido@python.org> parents: 12588 diff changeset	2675 _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	2676 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2677 if (PyTuple_Check(subobj)) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2678 Py_ssize_t i;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2679 for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2680 result = _string_tailmatch(self,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2681 PyTuple_GET_ITEM(subobj, i),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2682 start, end, +1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2683 if (result == -1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2684 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2685 else if (result) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2686 Py_RETURN_TRUE;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2687 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2688 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2689 Py_RETURN_FALSE;
15910 f7f3be3d00b9 Added checks to prevent PyUnicode_Count() from dumping core Marc-André Lemburg <mal@egenix.com> parents: 15579 diff changeset	2690 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2691 result = _string_tailmatch(self, subobj, start, end, +1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2692 if (result == -1)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2693 return NULL;
23850 854583cd63c7 SF bug # 493951 string.{starts,ends}with vs slices Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	2694 else
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	2695 return PyBool_FromLong(result);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2696 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2697
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2698
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	2699 PyDoc_STRVAR(decode__doc__,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2700 "B.decode([encoding[, errors]]) -> object\n\
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2701 \n\
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2702 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	2703 to the default encoding. errors may be given to set a different error\n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2704 handling scheme. Default is 'strict' meaning that encoding errors raise\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2705 a UnicodeDecodeError. Other possible values are 'ignore' and 'replace'\n\
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25017 diff changeset	2706 as well as any other name registerd with codecs.register_error that is\n\
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 25017 diff changeset	2707 able to handle UnicodeDecodeErrors.");
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2708
9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2709 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2710 string_decode(PyObject self, PyObject args)
17835 9ea87c0a7c04 This patch changes the way the string .encode() method works slightly Marc-André Lemburg <mal@egenix.com> parents: 17751 diff changeset	2711 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2712 const char *encoding = NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2713 const char *errors = NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2714
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2715 if (!PyArg_ParseTuple(args, "\|ss:decode", &encoding, &errors))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2716 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2717 if (encoding == NULL)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2718 encoding = PyUnicode_GetDefaultEncoding();
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2719 return PyCodec_Decode(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	2720 }
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2721
2017f54b0325 Added new codec APIs and a new interface method .encode() which Marc-André Lemburg <mal@egenix.com> parents: 13354 diff changeset	2722
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2723 PyDoc_STRVAR(fromhex_doc,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2724 "bytes.fromhex(string) -> bytes\n\
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2725 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2726 Create a bytes object from a string of hexadecimal numbers.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2727 Spaces between two numbers are accepted.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2728 Example: bytes.fromhex('B9 01EF') -> b'\\xb9\\x01\\xef'.");
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2729
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2730 static int
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2731 hex_digit_to_int(Py_UNICODE c)
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2732 {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2733 if (c >= 128)
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2734 return -1;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2735 if (ISDIGIT(c))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2736 return c - '0';
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2737 else {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2738 if (ISUPPER(c))
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2739 c = TOLOWER(c);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2740 if (c >= 'a' && c <= 'f')
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2741 return c - 'a' + 10;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2742 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2743 return -1;
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2744 }
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2745
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2746 static PyObject *
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2747 string_fromhex(PyObject cls, PyObject args)
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2748 {
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2749 PyObject newstring, hexobj;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2750 char *buf;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2751 Py_UNICODE *hex;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2752 Py_ssize_t hexlen, byteslen, i, j;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2753 int top, bot;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2754
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2755 if (!PyArg_ParseTuple(args, "U:fromhex", &hexobj))
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2756 return NULL;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2757 assert(PyUnicode_Check(hexobj));
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2758 hexlen = PyUnicode_GET_SIZE(hexobj);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2759 hex = PyUnicode_AS_UNICODE(hexobj);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2760 byteslen = hexlen/2; /* This overestimates if there are spaces */
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2761 newstring = PyString_FromStringAndSize(NULL, byteslen);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2762 if (!newstring)
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2763 return NULL;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2764 buf = PyString_AS_STRING(newstring);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2765 for (i = j = 0; i < hexlen; i += 2) {
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2766 /* skip over spaces in the input */
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2767 while (hex[i] == ' ')
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2768 i++;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2769 if (i >= hexlen)
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2770 break;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2771 top = hex_digit_to_int(hex[i]);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2772 bot = hex_digit_to_int(hex[i+1]);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2773 if (top == -1 \|\| bot == -1) {
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2774 PyErr_Format(PyExc_ValueError,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2775 "non-hexadecimal number found in "
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2776 "fromhex() arg at position %zd", i);
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2777 goto error;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2778 }
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2779 buf[j++] = (top << 4) + bot;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2780 }
45052 e43238760c38 Fixed issue #1973: bytes.fromhex('') raises SystemError Christian Heimes <christian@cheimes.de> parents: 44548 diff changeset	2781 if (j != byteslen && _PyString_Resize(&newstring, j) < 0)
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2782 goto error;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2783 return newstring;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2784
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2785 error:
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2786 Py_XDECREF(newstring);
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2787 return NULL;
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2788 }
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2789
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2790
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	2791 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	2792 string_getnewargs(PyStringObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	2793 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	2794 return Py_BuildValue("(s#)", v->ob_sval, Py_SIZE(v));
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	2795 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27248 diff changeset	2796
45052 e43238760c38 Fixed issue #1973: bytes.fromhex('') raises SystemError Christian Heimes <christian@cheimes.de> parents: 44548 diff changeset	2797
17640 9934225fe297 A different approach to the problem reported in Tim Peters <tim.peters@gmail.com> parents: 17597 diff changeset	2798 static PyMethodDef
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2799 string_methods[] = {
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2800 {"__getnewargs__", (PyCFunction)string_getnewargs, METH_NOARGS},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2801 {"capitalize", (PyCFunction)stringlib_capitalize, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2802 _Py_capitalize__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2803 {"center", (PyCFunction)stringlib_center, METH_VARARGS, center__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2804 {"count", (PyCFunction)string_count, METH_VARARGS, count__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2805 {"decode", (PyCFunction)string_decode, METH_VARARGS, decode__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2806 {"endswith", (PyCFunction)string_endswith, METH_VARARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2807 endswith__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2808 {"expandtabs", (PyCFunction)stringlib_expandtabs, METH_VARARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2809 expandtabs__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2810 {"find", (PyCFunction)string_find, METH_VARARGS, find__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2811 {"fromhex", (PyCFunction)string_fromhex, METH_VARARGS\|METH_CLASS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2812 fromhex_doc},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2813 {"index", (PyCFunction)string_index, METH_VARARGS, index__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2814 {"isalnum", (PyCFunction)stringlib_isalnum, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2815 _Py_isalnum__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2816 {"isalpha", (PyCFunction)stringlib_isalpha, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2817 _Py_isalpha__doc__},
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	2818 {"isdigit", (PyCFunction)stringlib_isdigit, METH_NOARGS,
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	2819 _Py_isdigit__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2820 {"islower", (PyCFunction)stringlib_islower, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2821 _Py_islower__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2822 {"isspace", (PyCFunction)stringlib_isspace, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2823 _Py_isspace__doc__},
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	2824 {"istitle", (PyCFunction)stringlib_istitle, METH_NOARGS,
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	2825 _Py_istitle__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2826 {"isupper", (PyCFunction)stringlib_isupper, METH_NOARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2827 _Py_isupper__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2828 {"join", (PyCFunction)string_join, METH_O, join__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2829 {"ljust", (PyCFunction)stringlib_ljust, METH_VARARGS, ljust__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2830 {"lower", (PyCFunction)stringlib_lower, METH_NOARGS, _Py_lower__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2831 {"lstrip", (PyCFunction)string_lstrip, METH_VARARGS, lstrip__doc__},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2832 {"partition", (PyCFunction)string_partition, METH_O, partition__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2833 {"replace", (PyCFunction)string_replace, METH_VARARGS, replace__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2834 {"rfind", (PyCFunction)string_rfind, METH_VARARGS, rfind__doc__},
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2835 {"rindex", (PyCFunction)string_rindex, METH_VARARGS, rindex__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2836 {"rjust", (PyCFunction)stringlib_rjust, METH_VARARGS, rjust__doc__},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2837 {"rpartition", (PyCFunction)string_rpartition, METH_O,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37904 diff changeset	2838 rpartition__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2839 {"rsplit", (PyCFunction)string_rsplit, METH_VARARGS, rsplit__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2840 {"rstrip", (PyCFunction)string_rstrip, METH_VARARGS, rstrip__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2841 {"split", (PyCFunction)string_split, METH_VARARGS, split__doc__},
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2842 {"splitlines", (PyCFunction)stringlib_splitlines, METH_VARARGS,
0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2843 splitlines__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2844 {"startswith", (PyCFunction)string_startswith, METH_VARARGS,
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2845 startswith__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2846 {"strip", (PyCFunction)string_strip, METH_VARARGS, strip__doc__},
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	2847 {"swapcase", (PyCFunction)stringlib_swapcase, METH_NOARGS,
697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	2848 _Py_swapcase__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2849 {"title", (PyCFunction)stringlib_title, METH_NOARGS, _Py_title__doc__},
23046 769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2850 {"translate", (PyCFunction)string_translate, METH_VARARGS,
769e0a538e54 Remove 'const' from local variable declaration in string_zfill() -- it Guido van Rossum <guido@python.org> parents: 23045 diff changeset	2851 translate__doc__},
43693 0502a8c64ef2 Sort the method lists for str8 and bytes so differences are more apparent. Guido van Rossum <guido@python.org> parents: 43664 diff changeset	2852 {"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__},
43576 697cc31a83f6 For PEP3137: Adds missing methods to the mutable PyBytes object (soon Gregory P. Smith <greg@mad-scientist.com> parents: 43503 diff changeset	2853 {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, zfill__doc__},
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2854 {NULL, NULL} /* sentinel */
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2855 };
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2856
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24184 diff changeset	2857 static PyObject *
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2858 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	2859
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	2860 static PyObject *
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2861 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	2862 {
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2863 PyObject x = NULL, it;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2864 const char *encoding = NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2865 const char *errors = NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2866 PyObject *new = NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2867 Py_ssize_t i, size;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2868 static char *kwlist[] = {"source", "encoding", "errors", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2869
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2870 if (type != &PyString_Type)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	2871 return str_subtype_new(type, args, kwds);
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2872 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|Oss:bytes", kwlist, &x,
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2873 &encoding, &errors))
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2874 return NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2875 if (x == NULL) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2876 if (encoding != NULL \|\| errors != NULL) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2877 PyErr_SetString(PyExc_TypeError,
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2878 "encoding or errors without sequence "
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2879 "argument");
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2880 return NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2881 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2882 return PyString_FromString("");
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2883 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2884
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2885 if (PyUnicode_Check(x)) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2886 /* Encode via the codec registry */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2887 if (encoding == NULL) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2888 PyErr_SetString(PyExc_TypeError,
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2889 "string argument without an encoding");
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2890 return NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2891 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2892 new = PyCodec_Encode(x, encoding, errors);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2893 if (new == NULL)
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2894 return NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2895 assert(PyString_Check(new));
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2896 return new;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2897 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2898
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2899 /* If it's not unicode, there can't be encoding or errors */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2900 if (encoding != NULL \|\| errors != NULL) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2901 PyErr_SetString(PyExc_TypeError,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2902 "encoding or errors without a string argument");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	2903 return NULL;
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2904 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2905
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2906 /* Is it an int? */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2907 size = PyNumber_AsSsize_t(x, PyExc_ValueError);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2908 if (size == -1 && PyErr_Occurred()) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2909 PyErr_Clear();
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2910 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2911 else {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2912 if (size < 0) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2913 PyErr_SetString(PyExc_ValueError, "negative count");
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2914 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2915 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2916 new = PyString_FromStringAndSize(NULL, size);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2917 if (new == NULL) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2918 return NULL;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2919 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2920 if (size > 0) {
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2921 memset(((PyStringObject*)new)->ob_sval, 0, size);
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2922 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2923 return new;
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2924 }
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2925
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2926 /* Use the modern buffer interface */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2927 if (PyObject_CheckBuffer(x)) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2928 Py_buffer view;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2929 if (PyObject_GetBuffer(x, &view, PyBUF_FULL_RO) < 0)
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2930 return NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2931 new = PyString_FromStringAndSize(NULL, view.len);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2932 if (!new)
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2933 goto fail;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2934 // XXX(brett.cannon): Better way to get to internal buffer?
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2935 if (PyBuffer_ToContiguous(((PyStringObject *)new)->ob_sval,
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2936 &view, view.len, 'C') < 0)
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2937 goto fail;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2938 PyObject_ReleaseBuffer(x, &view);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2939 return new;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2940 fail:
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2941 Py_XDECREF(new);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2942 PyObject_ReleaseBuffer(x, &view);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2943 return NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2944 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2945
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2946 /* For iterator version, create a string object and resize as needed */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2947 /* XXX(gb): is 64 a good value? also, optimize if length is known */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2948 /* XXX(guido): perhaps use Pysequence_Fast() -- I can't imagine the
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	2949 input being a truly long iterator. */
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2950 size = 64;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2951 new = PyString_FromStringAndSize(NULL, size);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2952 if (new == NULL)
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2953 return NULL;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2954
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2955 /* XXX Optimize this if the arguments is a list, tuple */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2956
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2957 /* Get the iterator */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2958 it = PyObject_GetIter(x);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2959 if (it == NULL)
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2960 goto error;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2961
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2962 /* Run the iterator to exhaustion */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2963 for (i = 0; ; i++) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2964 PyObject *item;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2965 Py_ssize_t value;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2966
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2967 /* Get the next item */
44016 22e09905e400 Use proper API for iter.__next__(). Georg Brandl <georg@python.org> parents: 43976 diff changeset	2968 item = PyIter_Next(it);
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2969 if (item == NULL) {
44016 22e09905e400 Use proper API for iter.__next__(). Georg Brandl <georg@python.org> parents: 43976 diff changeset	2970 if (PyErr_Occurred())
22e09905e400 Use proper API for iter.__next__(). Georg Brandl <georg@python.org> parents: 43976 diff changeset	2971 goto error;
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2972 break;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2973 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2974
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2975 /* Interpret it as an int (__index__) */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2976 value = PyNumber_AsSsize_t(item, PyExc_ValueError);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2977 Py_DECREF(item);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2978 if (value == -1 && PyErr_Occurred())
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2979 goto error;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2980
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2981 /* Range check */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2982 if (value < 0 \|\| value >= 256) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2983 PyErr_SetString(PyExc_ValueError,
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2984 "bytes must be in range(0, 256)");
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2985 goto error;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2986 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2987
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2988 /* Append the byte */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2989 if (i >= size) {
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2990 size *= 2;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2991 if (_PyString_Resize(&new, size) < 0)
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2992 goto error;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2993 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2994 ((PyStringObject *)new)->ob_sval[i] = value;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2995 }
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2996 _PyString_Resize(&new, i);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2997
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2998 /* Clean up and return success */
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	2999 Py_DECREF(it);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	3000 return new;
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	3001
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	3002 error:
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3003 /* Error handling when new != NULL */
43664 33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	3004 Py_XDECREF(it);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	3005 Py_DECREF(new);
33efbfc28d2b Patch #1303: Adapt str8 constructor to bytes (now buffer) one. Georg Brandl <georg@python.org> parents: 43604 diff changeset	3006 return NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3007 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3008
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3009 static PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3010 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	3011 {
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3012 PyObject tmp, pnew;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3013 Py_ssize_t n;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3014
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3015 assert(PyType_IsSubtype(type, &PyString_Type));
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3016 tmp = string_new(&PyString_Type, args, kwds);
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3017 if (tmp == NULL)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3018 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	3019 assert(PyString_CheckExact(tmp));
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3020 n = PyString_GET_SIZE(tmp);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3021 pnew = type->tp_alloc(type, n);
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3022 if (pnew != NULL) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3023 Py_MEMCPY(PyString_AS_STRING(pnew),
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3024 PyString_AS_STRING(tmp), n+1);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3025 ((PyStringObject *)pnew)->ob_shash =
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3026 ((PyStringObject *)tmp)->ob_shash;
3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3027 }
19632 20fb7591f885 Fix a memory leak in str_subtype_new(). (All the other Guido van Rossum <guido@python.org> parents: 19592 diff changeset	3028 Py_DECREF(tmp);
19886 3b0da13ace48 str_subtype_new, unicode_subtype_new: Tim Peters <tim.peters@gmail.com> parents: 19884 diff changeset	3029 return pnew;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3030 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19489 diff changeset	3031
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	3032 PyDoc_STRVAR(string_doc,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3033 "bytes(iterable_of_ints) -> bytes.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3034 bytes(string, encoding[, errors]) -> bytes\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3035 bytes(bytes_or_buffer) -> immutable copy of bytes_or_buffer.\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3036 bytes(memory_view) -> bytes.\n\
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3037 \n\
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3038 Construct an immutable array of bytes from:\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3039 - an iterable yielding integers in range(256)\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3040 - a text string encoded using the specified encoding\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3041 - a bytes or a buffer object\n\
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3042 - any object implementing the buffer API.");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10923 diff changeset	3043
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3044 static PyObject str_iter(PyObject seq);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3045
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3046 PyTypeObject PyString_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42309 diff changeset	3047 PyVarObject_HEAD_INIT(&PyType_Type, 0)
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3048 "bytes",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3049 sizeof(PyStringObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3050 sizeof(char),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3051 string_dealloc, /* tp_dealloc */
42477 e7fd327e0c19 Kill all uses and definitions of tp_print under Objects/. (Others will follow.) Guido van Rossum <guido@python.org> parents: 42466 diff changeset	3052 0, /* tp_print */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3053 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3054 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3055 0, /* tp_compare */
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3056 (reprfunc)string_repr, /* tp_repr */
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3057 0, /* tp_as_number */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3058 &string_as_sequence, /* tp_as_sequence */
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23597 diff changeset	3059 &string_as_mapping, /* tp_as_mapping */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3060 (hashfunc)string_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3061 0, /* tp_call */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	3062 string_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3063 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3064 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3065 &string_as_buffer, /* tp_as_buffer */
40909 f2f0b41f270d Merged revisions 53875-53911 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	3066 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \|
f2f0b41f270d Merged revisions 53875-53911 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	3067 Py_TPFLAGS_STRING_SUBCLASS, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3068 string_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3069 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3070 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3071 (richcmpfunc)string_richcompare, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3072 0, /* tp_weaklistoffset */
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3073 str_iter, /* tp_iter */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3074 0, /* tp_iternext */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3075 string_methods, /* tp_methods */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3076 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3077 0, /* tp_getset */
43577 ace45b361e87 Patch# 1258 by Christian Heimes: kill basestring. Guido van Rossum <guido@python.org> parents: 43576 diff changeset	3078 &PyBaseObject_Type, /* tp_base */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3079 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3080 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3081 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3082 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3083 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3084 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18887 diff changeset	3085 string_new, /* tp_new */
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	3086 PyObject_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3087 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3088
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3089 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3090 PyString_Concat(register PyObject *pv, register PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3091 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3092 register PyObject *v;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3093 assert(pv != NULL);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3094 if (*pv == NULL)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3095 return;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3096 if (w == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3097 Py_DECREF(*pv);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3098 *pv = NULL;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3099 return;
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3100 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3101 v = string_concat(*pv, w);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3102 Py_DECREF(*pv);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3103 *pv = v;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3104 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3105
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3106 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3107 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	3108 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3109 PyString_Concat(pv, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3110 Py_XDECREF(w);
1847 0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3111 }
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3112
0d318475f9e3 fix nasty bug in resizing (formatstring) Guido van Rossum <guido@python.org> parents: 1409 diff changeset	3113
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3114 /* The following function breaks the notion that strings are immutable:
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3115 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	3116 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	3117 as creating a new string object and destroying the old one, only
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3118 more efficiently. In any case, don't use this if the string may
23295 6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	3119 already be known to some other part of the code...
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	3120 Note that if there's not enough memory to resize the string, the original
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	3121 string object at pv is deallocated, pv is set to NULL, an "out of
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	3122 memory" exception is set, and -1 is returned. Else (on success) 0 is
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	3123 returned, and the value in *pv may or may not be the same as on input.
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	3124 As always, an extra byte is allocated for a trailing \0 byte (newsize
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	3125 does not include that), and a trailing \0 byte is stored.
6fa76b4e59fe Repair widespread misuse of _PyString_Resize. Since it's clear people Tim Peters <tim.peters@gmail.com> parents: 23225 diff changeset	3126 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3127
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3128 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3129 _PyString_Resize(PyObject **pv, Py_ssize_t newsize)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3130 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3131 register PyObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3132 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	3133 v = *pv;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	3134 if (!PyString_Check(v) \|\| Py_REFCNT(v) != 1 \|\| newsize < 0) {
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3135 *pv = 0;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3136 Py_DECREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3137 PyErr_BadInternalCall();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	3138 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3139 }
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	3140 /* XXX UNREF/NEWREF interface should be more symmetrical */
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 23850 diff changeset	3141 _Py_DEC_REFTOTAL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3142 _Py_ForgetReference(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3143 pv = (PyObject )
32423 64534fb3afcd sizeof(char) is 1, by definition, so get rid of that expression in Tim Peters <tim.peters@gmail.com> parents: 32305 diff changeset	3144 PyObject_REALLOC((char *)v, sizeof(PyStringObject) + newsize);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3145 if (*pv == NULL) {
22977 4ba091cc70b8 Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22785 diff changeset	3146 PyObject_Del(v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3147 PyErr_NoMemory();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	3148 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3149 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3150 _Py_NewReference(*pv);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3151 sv = (PyStringObject ) pv;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	3152 Py_SIZE(sv) = newsize;
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	3153 sv->ob_sval[newsize] = '\0';
33833 10512ceba30c SF bug #1054139: serious string hashing error in 2.4b1 Raymond Hettinger <python@rcn.com> parents: 33246 diff changeset	3154 sv->ob_shash = -1; /* invalidate cached hash value */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3155 return 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3156 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3157
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	3158 /* _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	3159 * 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	3160 * 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	3161 * 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	3162 * . *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	3163 * *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	3164 * 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	3165 * 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	3166 * "-"? ("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	3167 * "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	3168 * 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	3169 * 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	3170 * 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	3171 * 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	3172 * 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	3173 * 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	3174 * 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	3175 *
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3176 * 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	3177 * 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	3178 */
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3179 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	3180 _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	3181 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	3182 {
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3183 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	3184 char *buf;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35999 diff changeset	3185 Py_ssize_t i;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3186 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	3187 int len; /* number of characters */
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	3188 Py_ssize_t llen;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3189 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	3190 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	3191
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	3192 /* Avoid exceeding SSIZE_T_MAX */
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	3193 if (prec > PY_SSIZE_T_MAX-3) {
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	3194 PyErr_SetString(PyExc_OverflowError,
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	3195 "precision too large");
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	3196 return NULL;
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	3197 }
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40450 diff changeset	3198
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	3199 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	3200 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	3201 case 'u':
42594 ac5ce7c43ee7 Format bools properly in %d. Martin v. Löwis <martin@v.loewis.de> parents: 42477 diff changeset	3202 /* Special-case boolean: we want 0/1 */
ac5ce7c43ee7 Format bools properly in %d. Martin v. Löwis <martin@v.loewis.de> parents: 42477 diff changeset	3203 if (PyBool_Check(val))
ac5ce7c43ee7 Format bools properly in %d. Martin v. Löwis <martin@v.loewis.de> parents: 42477 diff changeset	3204 result = PyNumber_ToBase(val, 10);
ac5ce7c43ee7 Format bools properly in %d. Martin v. Löwis <martin@v.loewis.de> parents: 42477 diff changeset	3205 else
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	3206 result = Py_TYPE(val)->tp_str(val);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3207 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	3208 case 'o':
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3209 numnondigits = 2;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3210 result = PyNumber_ToBase(val, 8);
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	3211 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	3212 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	3213 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	3214 numnondigits = 2;
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3215 result = PyNumber_ToBase(val, 16);
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3216 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	3217 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	3218 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	3219 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3220 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	3221 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	3222
43961 b231bda653a4 PyString_AsString is permissive and accepts unicode strings. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43947 diff changeset	3223 buf = PyUnicode_AsString(result);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39544 diff changeset	3224 if (!buf) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39544 diff changeset	3225 Py_DECREF(result);
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39544 diff changeset	3226 return NULL;
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39544 diff changeset	3227 }
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39544 diff changeset	3228
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	3229 /* To modify the string in-place, there can only be one reference. */
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44252 diff changeset	3230 if (Py_REFCNT(result) != 1) {
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3231 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	3232 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	3233 }
43961 b231bda653a4 PyString_AsString is permissive and accepts unicode strings. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43947 diff changeset	3234 llen = PyUnicode_GetSize(result);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	3235 if (llen > INT_MAX) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3236 PyErr_SetString(PyExc_ValueError,
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3237 "string too large in _PyString_FormatLong");
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	3238 return NULL;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	3239 }
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36675 diff changeset	3240 len = (int)llen;
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3241 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	3242 --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	3243 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	3244 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3245 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	3246 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	3247 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	3248 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	3249
17450 f74f5aafdc7e Bug 415514 reported that e.g. Tim Peters <tim.peters@gmail.com> parents: 17425 diff changeset	3250 /* Get rid of base marker unless F_ALT */
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3251 if (((flags & F_ALT) == 0 &&
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3252 (type == 'o' \|\| type == 'x' \|\| type == 'X'))) {
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3253 assert(buf[sign] == '0');
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3254 assert(buf[sign+1] == 'x' \|\| buf[sign+1] == 'X' \|\|
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3255 buf[sign+1] == 'o');
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3256 numnondigits -= 2;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3257 buf += 2;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3258 len -= 2;
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3259 if (sign)
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 42013 diff changeset	3260 buf[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	3261 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	3262 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	3263 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3264
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3265 /* 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	3266 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	3267 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	3268 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	3269 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	3270 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	3271 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	3272 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	3273 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3274 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	3275 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	3276 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	3277 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	3278 *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	3279 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	3280 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	3281 *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	3282 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	3283 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	3284 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	3285 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	3286 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3287
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3288 /* Fix up case for hex conversions. */
35177 27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	3289 if (type == 'X') {
27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	3290 /* Need to convert all lower case letters to upper case.
27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	3291 and need to convert 0x to 0X (and -0x to -0X). */
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3292 for (i = 0; i < len; i++)
35177 27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	3293 if (buf[i] >= 'a' && buf[i] <= 'x')
27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34621 diff changeset	3294 buf[i] -= 'a'-'A';
14713 58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3295 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3296 *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	3297 *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	3298 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	3299 }
58b832b8745e Derived from Martin's SF patch 110609: support unbounded ints in %d,i,u,x,X,o formats. Tim Peters <tim.peters@gmail.com> parents: 14696 diff changeset	3300
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3301 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13377 diff changeset	3302 PyString_Fini(void)
5920 5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3303 {
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3304 int i;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3305 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	3306 Py_XDECREF(characters[i]);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3307 characters[i] = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3308 }
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3309 Py_XDECREF(nullstring);
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3310 nullstring = NULL;
5fb30413b93b Added internal routine PyString_Fini() which deletes all interned Guido van Rossum <guido@python.org> parents: 5717 diff changeset	3311 }
16751 ca1be7d00413 _Py_ReleaseInternedStrings(): Private API function to decref and Barry Warsaw <barry@python.org> parents: 16226 diff changeset	3312
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3313 /********************* Str Iterator **************************/
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3314
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3315 typedef struct {
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3316 PyObject_HEAD
39544 01034018e8b2 Make the it_index field in the str/unicode iterators Py_ssize_t's. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	3317 Py_ssize_t it_index;
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3318 PyStringObject it_seq; / Set to NULL when iterator is exhausted */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3319 } striterobject;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3320
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3321 static void
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3322 striter_dealloc(striterobject *it)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3323 {
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3324 _PyObject_GC_UNTRACK(it);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3325 Py_XDECREF(it->it_seq);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3326 PyObject_GC_Del(it);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3327 }
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3328
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3329 static int
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3330 striter_traverse(striterobject it, visitproc visit, void arg)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3331 {
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3332 Py_VISIT(it->it_seq);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3333 return 0;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3334 }
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3335
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3336 static PyObject *
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3337 striter_next(striterobject *it)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3338 {
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3339 PyStringObject *seq;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3340 PyObject *item;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3341
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3342 assert(it != NULL);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3343 seq = it->it_seq;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3344 if (seq == NULL)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3345 return NULL;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3346 assert(PyString_Check(seq));
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3347
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3348 if (it->it_index < PyString_GET_SIZE(seq)) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	3349 item = PyLong_FromLong(
43604 b18f6092f6e0 Patch 1280, by Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 43577 diff changeset	3350 (unsigned char)seq->ob_sval[it->it_index]);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3351 if (item != NULL)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3352 ++it->it_index;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3353 return item;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3354 }
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3355
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3356 Py_DECREF(seq);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3357 it->it_seq = NULL;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3358 return NULL;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3359 }
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3360
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3361 static PyObject *
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3362 striter_len(striterobject *it)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3363 {
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3364 Py_ssize_t len = 0;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3365 if (it->it_seq)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3366 len = PyString_GET_SIZE(it->it_seq) - it->it_index;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44017 diff changeset	3367 return PyLong_FromSsize_t(len);
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3368 }
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3369
39544 01034018e8b2 Make the it_index field in the str/unicode iterators Py_ssize_t's. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	3370 PyDoc_STRVAR(length_hint_doc,
01034018e8b2 Make the it_index field in the str/unicode iterators Py_ssize_t's. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	3371 "Private method returning an estimate of len(list(it)).");
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3372
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3373 static PyMethodDef striter_methods[] = {
39544 01034018e8b2 Make the it_index field in the str/unicode iterators Py_ssize_t's. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	3374 {"__length_hint__", (PyCFunction)striter_len, METH_NOARGS,
01034018e8b2 Make the it_index field in the str/unicode iterators Py_ssize_t's. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	3375 length_hint_doc},
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3376 {NULL, NULL} /* sentinel */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3377 };
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3378
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3379 PyTypeObject PyStringIter_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42309 diff changeset	3380 PyVarObject_HEAD_INIT(&PyType_Type, 0)
43947 cbc8b3bd3157 Rename buffer -> bytearray. Guido van Rossum <guido@python.org> parents: 43897 diff changeset	3381 "bytes_iterator", /* tp_name */
39544 01034018e8b2 Make the it_index field in the str/unicode iterators Py_ssize_t's. Guido van Rossum <guido@python.org> parents: 39536 diff changeset	3382 sizeof(striterobject), /* tp_basicsize */
39536 8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3383 0, /* tp_itemsize */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3384 /* methods */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3385 (destructor)striter_dealloc, /* tp_dealloc */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3386 0, /* tp_print */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3387 0, /* tp_getattr */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3388 0, /* tp_setattr */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3389 0, /* tp_compare */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3390 0, /* tp_repr */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3391 0, /* tp_as_number */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3392 0, /* tp_as_sequence */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3393 0, /* tp_as_mapping */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3394 0, /* tp_hash */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3395 0, /* tp_call */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3396 0, /* tp_str */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3397 PyObject_GenericGetAttr, /* tp_getattro */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3398 0, /* tp_setattro */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3399 0, /* tp_as_buffer */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3400 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3401 0, /* tp_doc */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3402 (traverseproc)striter_traverse, /* tp_traverse */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3403 0, /* tp_clear */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3404 0, /* tp_richcompare */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3405 0, /* tp_weaklistoffset */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3406 PyObject_SelfIter, /* tp_iter */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3407 (iternextfunc)striter_next, /* tp_iternext */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3408 striter_methods, /* tp_methods */
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3409 0,
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3410 };
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3411
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3412 static PyObject *
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3413 str_iter(PyObject *seq)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3414 {
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3415 striterobject *it;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3416
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3417 if (!PyString_Check(seq)) {
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3418 PyErr_BadInternalCall();
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3419 return NULL;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3420 }
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3421 it = PyObject_GC_New(striterobject, &PyStringIter_Type);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3422 if (it == NULL)
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3423 return NULL;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3424 it->it_index = 0;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3425 Py_INCREF(seq);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3426 it->it_seq = (PyStringObject *)seq;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3427 _PyObject_GC_TRACK(it);
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3428 return (PyObject *)it;
8f5b9982beba Completely get rid of PyClass and PyInstance. Guido van Rossum <guido@python.org> parents: 39442 diff changeset	3429 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/stringobject.c @ 46909:ef4ec968fdb6