cpython-lru_cache-weakref: Modules/stropmodule.c annotate

annotate Modules/stropmodule.c @ 25838:8540887bcec6 2.2

Backport of 2.183: Fix memory leak in add_subclass() found by NealN with valgrind.

author	Guido van Rossum <guido@python.org>
date	Fri, 18 Oct 2002 13:42:21 +0000
parents	c2150313d9d1
children	f64a1197a52a

rev	line source
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1 /* strop module */
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	2
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	3 static char strop_module__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	4 "Common string manipulations, optimized for speed.\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	5 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	6 "Always use \"import string\" rather than referencing\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	7 "this module directly.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	8
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	9 #include "Python.h"
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	10
1321 a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add Guido van Rossum <guido@python.org> parents: 1257 diff changeset	11 #include <ctype.h>
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	12 /* XXX This file assumes that the <ctype.h> is*() functions
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	13 XXX are defined for all 8-bit characters! */
1321 a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add Guido van Rossum <guido@python.org> parents: 1257 diff changeset	14
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	15 #define WARN if (PyErr_Warn(PyExc_DeprecationWarning, \
ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	16 "strop functions are obsolete; use string methods")) \
ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	17 return NULL
ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	18
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	19 /* The lstrip(), rstrip() and strip() functions are implemented
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	20 in do_strip(), which uses an additional parameter to indicate what
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	21 type of strip should occur. */
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	22
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	23 #define LEFTSTRIP 0
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	24 #define RIGHTSTRIP 1
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	25 #define BOTHSTRIP 2
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	26
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	27
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	28 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	29 split_whitespace(char *s, int len, int maxsplit)
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	30 {
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	31 int i = 0, j, err;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	32 int countsplit = 0;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	33 PyObject* item;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	34 PyObject *list = PyList_New(0);
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	35
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	36 if (list == NULL)
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	37 return NULL;
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	38
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	39 while (i < len) {
2310 07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2061 diff changeset	40 while (i < len && isspace(Py_CHARMASK(s[i]))) {
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	41 i = i+1;
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	42 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	43 j = i;
2335 e11e6b358531 fix stupid bug in strip and split Guido van Rossum <guido@python.org> parents: 2310 diff changeset	44 while (i < len && !isspace(Py_CHARMASK(s[i]))) {
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	45 i = i+1;
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	46 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	47 if (j < i) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	48 item = PyString_FromStringAndSize(s+j, (int)(i-j));
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	49 if (item == NULL)
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	50 goto finally;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	51
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	52 err = PyList_Append(list, item);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	53 Py_DECREF(item);
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	54 if (err < 0)
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	55 goto finally;
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	56
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	57 countsplit++;
6696 e92154022b48 split_whitespace(): Make sure delimiter is stripped from the beginning Barry Warsaw <barry@python.org> parents: 6684 diff changeset	58 while (i < len && isspace(Py_CHARMASK(s[i]))) {
e92154022b48 split_whitespace(): Make sure delimiter is stripped from the beginning Barry Warsaw <barry@python.org> parents: 6684 diff changeset	59 i = i+1;
e92154022b48 split_whitespace(): Make sure delimiter is stripped from the beginning Barry Warsaw <barry@python.org> parents: 6684 diff changeset	60 }
e92154022b48 split_whitespace(): Make sure delimiter is stripped from the beginning Barry Warsaw <barry@python.org> parents: 6684 diff changeset	61 if (maxsplit && (countsplit >= maxsplit) && i < len) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	62 item = PyString_FromStringAndSize(
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	63 s+i, (int)(len - i));
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	64 if (item == NULL)
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	65 goto finally;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	66
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	67 err = PyList_Append(list, item);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	68 Py_DECREF(item);
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	69 if (err < 0)
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	70 goto finally;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	71
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	72 i = len;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	73 }
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	74 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	75 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	76 return list;
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	77 finally:
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	78 Py_DECREF(list);
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	79 return NULL;
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	80 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	81
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	82
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	83 static char splitfields__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	84 "split(s [,sep [,maxsplit]]) -> list of strings\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	85 "splitfields(s [,sep [,maxsplit]]) -> list of strings\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	86 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	87 "Return a list of the words in the string s, using sep as the\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	88 "delimiter string. If maxsplit is nonzero, splits into at most\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	89 "maxsplit words. If sep is not specified, any whitespace string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	90 "is a separator. Maxsplit defaults to 0.\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	91 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	92 "(split and splitfields are synonymous)";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	93
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	94 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	95 strop_splitfields(PyObject self, PyObject args)
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	96 {
1394 98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	97 int len, n, i, j, err;
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	98 int splitcount, maxsplit;
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	99 char s, sub;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	100 PyObject list, item;
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	101
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	102 WARN;
2707 1306e761a623 unified join(fields), split(fields) Guido van Rossum <guido@python.org> parents: 2335 diff changeset	103 sub = NULL;
1306e761a623 unified join(fields), split(fields) Guido van Rossum <guido@python.org> parents: 2335 diff changeset	104 n = 0;
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	105 splitcount = 0;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	106 maxsplit = 0;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	107 if (!PyArg_ParseTuple(args, "t#\|z#i:split", &s, &len, &sub, &n, &maxsplit))
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	108 return NULL;
2707 1306e761a623 unified join(fields), split(fields) Guido van Rossum <guido@python.org> parents: 2335 diff changeset	109 if (sub == NULL)
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	110 return split_whitespace(s, len, maxsplit);
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	111 if (n == 0) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	112 PyErr_SetString(PyExc_ValueError, "empty separator");
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	113 return NULL;
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	114 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	115
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	116 list = PyList_New(0);
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	117 if (list == NULL)
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	118 return NULL;
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	119
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	120 i = j = 0;
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	121 while (i+n <= len) {
4352 6ec0caeaf823 Replace all uses of strncmp (in split, find, rfind) with memcmp, so Guido van Rossum <guido@python.org> parents: 4296 diff changeset	122 if (s[i] == sub[0] && (n == 1 \|\| memcmp(s+i, sub, n) == 0)) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	123 item = PyString_FromStringAndSize(s+j, (int)(i-j));
1394 98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	124 if (item == NULL)
98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	125 goto fail;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	126 err = PyList_Append(list, item);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	127 Py_DECREF(item);
1394 98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	128 if (err < 0)
98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	129 goto fail;
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	130 i = j = i + n;
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	131 splitcount++;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	132 if (maxsplit && (splitcount >= maxsplit))
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	133 break;
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	134 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	135 else
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	136 i++;
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	137 }
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	138 item = PyString_FromStringAndSize(s+j, (int)(len-j));
1394 98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	139 if (item == NULL)
98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	140 goto fail;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	141 err = PyList_Append(list, item);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	142 Py_DECREF(item);
1394 98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	143 if (err < 0)
98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	144 goto fail;
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	145
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	146 return list;
1394 98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	147
98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	148 fail:
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	149 Py_DECREF(list);
1394 98f51f61cb4b Fix memory leaks in join & joinfields Guido van Rossum <guido@python.org> parents: 1367 diff changeset	150 return NULL;
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	151 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	152
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	153
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	154 static char joinfields__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	155 "join(list [,sep]) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	156 "joinfields(list [,sep]) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	157 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	158 "Return a string composed of the words in list, with\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	159 "intervening occurrences of sep. Sep defaults to a single\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	160 "space.\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	161 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	162 "(join and joinfields are synonymous)";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	163
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	164 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	165 strop_joinfields(PyObject self, PyObject args)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	166 {
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	167 PyObject *seq;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	168 char *sep = NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	169 int seqlen, seplen = 0;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	170 int i, reslen = 0, slen = 0, sz = 100;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	171 PyObject *res = NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	172 char* p = NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	173 intargfunc getitemfunc;
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	174
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	175 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	176 if (!PyArg_ParseTuple(args, "O\|t#:join", &seq, &sep, &seplen))
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	177 return NULL;
2707 1306e761a623 unified join(fields), split(fields) Guido van Rossum <guido@python.org> parents: 2335 diff changeset	178 if (sep == NULL) {
1306e761a623 unified join(fields), split(fields) Guido van Rossum <guido@python.org> parents: 2335 diff changeset	179 sep = " ";
1306e761a623 unified join(fields), split(fields) Guido van Rossum <guido@python.org> parents: 2335 diff changeset	180 seplen = 1;
1306e761a623 unified join(fields), split(fields) Guido van Rossum <guido@python.org> parents: 2335 diff changeset	181 }
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	182
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13494 diff changeset	183 seqlen = PySequence_Size(seq);
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	184 if (seqlen < 0 && PyErr_Occurred())
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	185 return NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	186
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	187 if (seqlen == 1) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	188 /* Optimization if there's only one item */
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	189 PyObject *item = PySequence_GetItem(seq, 0);
7214 6222d3371fb8 Forgot to return NULL in joinfields() when a type error was detected Guido van Rossum <guido@python.org> parents: 7001 diff changeset	190 if (item && !PyString_Check(item)) {
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	191 PyErr_SetString(PyExc_TypeError,
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	192 "first argument must be sequence of strings");
9402 9ccaecd3dea3 Add a missing DECREF in an error exit. Submitted by Jonathan Giddy. Guido van Rossum <guido@python.org> parents: 9307 diff changeset	193 Py_DECREF(item);
7214 6222d3371fb8 Forgot to return NULL in joinfields() when a type error was detected Guido van Rossum <guido@python.org> parents: 7001 diff changeset	194 return NULL;
6222d3371fb8 Forgot to return NULL in joinfields() when a type error was detected Guido van Rossum <guido@python.org> parents: 7001 diff changeset	195 }
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	196 return item;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	197 }
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	198
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	199 if (!(res = PyString_FromStringAndSize((char*)NULL, sz)))
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	200 return NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	201 p = PyString_AsString(res);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	202
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	203 /* optimize for lists, since it's the most common case. all others
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	204 * (tuples and arbitrary sequences) just use the sequence abstract
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	205 * interface.
4894 f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	206 */
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	207 if (PyList_Check(seq)) {
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	208 for (i = 0; i < seqlen; i++) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	209 PyObject *item = PyList_GET_ITEM(seq, i);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	210 if (!PyString_Check(item)) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	211 PyErr_SetString(PyExc_TypeError,
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	212 "first argument must be sequence of strings");
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	213 Py_DECREF(res);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	214 return NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	215 }
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	216 slen = PyString_GET_SIZE(item);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	217 while (reslen + slen + seplen >= sz) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	218 if (_PyString_Resize(&res, sz * 2)) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	219 Py_DECREF(res);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	220 return NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	221 }
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	222 sz *= 2;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	223 p = PyString_AsString(res) + reslen;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	224 }
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	225 if (i > 0) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	226 memcpy(p, sep, seplen);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	227 p += seplen;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	228 reslen += seplen;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	229 }
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	230 memcpy(p, PyString_AS_STRING(item), slen);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	231 p += slen;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	232 reslen += slen;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	233 }
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	234 if (_PyString_Resize(&res, reslen)) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	235 Py_DECREF(res);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	236 res = NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	237 }
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	238 return res;
4894 f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	239 }
8405 3c40af2d1de9 Make sure that no use of a function pointer gotten from a Guido van Rossum <guido@python.org> parents: 8333 diff changeset	240
3c40af2d1de9 Make sure that no use of a function pointer gotten from a Guido van Rossum <guido@python.org> parents: 8333 diff changeset	241 if (seq->ob_type->tp_as_sequence == NULL \|\|
3c40af2d1de9 Make sure that no use of a function pointer gotten from a Guido van Rossum <guido@python.org> parents: 8333 diff changeset	242 (getitemfunc = seq->ob_type->tp_as_sequence->sq_item) == NULL)
3c40af2d1de9 Make sure that no use of a function pointer gotten from a Guido van Rossum <guido@python.org> parents: 8333 diff changeset	243 {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	244 PyErr_SetString(PyExc_TypeError,
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	245 "first argument must be a sequence");
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	246 return NULL;
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	247 }
8405 3c40af2d1de9 Make sure that no use of a function pointer gotten from a Guido van Rossum <guido@python.org> parents: 8333 diff changeset	248 /* This is now type safe */
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	249 for (i = 0; i < seqlen; i++) {
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	250 PyObject *item = getitemfunc(seq, i);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	251 if (!item \|\| !PyString_Check(item)) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	252 PyErr_SetString(PyExc_TypeError,
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	253 "first argument must be sequence of strings");
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	254 Py_DECREF(res);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	255 Py_XDECREF(item);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	256 return NULL;
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	257 }
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	258 slen = PyString_GET_SIZE(item);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	259 while (reslen + slen + seplen >= sz) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	260 if (_PyString_Resize(&res, sz * 2)) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	261 Py_DECREF(res);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	262 Py_DECREF(item);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	263 return NULL;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	264 }
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	265 sz *= 2;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	266 p = PyString_AsString(res) + reslen;
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	267 }
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	268 if (i > 0) {
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	269 memcpy(p, sep, seplen);
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	270 p += seplen;
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	271 reslen += seplen;
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	272 }
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	273 memcpy(p, PyString_AS_STRING(item), slen);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	274 p += slen;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	275 reslen += slen;
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	276 Py_DECREF(item);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	277 }
4901 770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	278 if (_PyString_Resize(&res, reslen)) {
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	279 Py_DECREF(res);
770104c8f84a New strop_joinfields implementation, highly optimized for Lists. All Barry Warsaw <barry@python.org> parents: 4895 diff changeset	280 res = NULL;
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	281 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	282 return res;
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	283 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1048 diff changeset	284
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	285
eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	286 static char find__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	287 "find(s, sub [,start [,end]]) -> in\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	288 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	289 "Return the lowest index in s where substring sub is found,\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	290 "such that sub is contained within s[start,end]. Optional\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	291 "arguments start and end are interpreted as in slice notation.\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	292 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	293 "Return -1 on failure.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	294
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	295 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	296 strop_find(PyObject self, PyObject args)
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	297 {
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	298 char s, sub;
5188 3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	299 int len, n, i = 0, last = INT_MAX;
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	300
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	301 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	302 if (!PyArg_ParseTuple(args, "t#t#\|ii:find", &s, &len, &sub, &n, &i, &last))
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	303 return NULL;
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	304
5188 3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	305 if (last > len)
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	306 last = len;
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	307 if (last < 0)
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	308 last += len;
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	309 if (last < 0)
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	310 last = 0;
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	311 if (i < 0)
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	312 i += len;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	313 if (i < 0)
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	314 i = 0;
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	315
7733 30e331496930 Check for boundary errors in [r]find -- find("x", "", 2) should return -1. Guido van Rossum <guido@python.org> parents: 7214 diff changeset	316 if (n == 0 && i <= last)
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	317 return PyInt_FromLong((long)i);
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	318
5188 3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	319 last -= n;
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	320 for (; i <= last; ++i)
1367 ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	321 if (s[i] == sub[0] &&
4352 6ec0caeaf823 Replace all uses of strncmp (in split, find, rfind) with memcmp, so Guido van Rossum <guido@python.org> parents: 4296 diff changeset	322 (n == 1 \|\| memcmp(&s[i+1], &sub[1], n-1) == 0))
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	323 return PyInt_FromLong((long)i);
1367 ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	324
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	325 return PyInt_FromLong(-1L);
1367 ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	326 }
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	327
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	328
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	329 static char rfind__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	330 "rfind(s, sub [,start [,end]]) -> int\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	331 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	332 "Return the highest index in s where substring sub is found,\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	333 "such that sub is contained within s[start,end]. Optional\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	334 "arguments start and end are interpreted as in slice notation.\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	335 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	336 "Return -1 on failure.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	337
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	338 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	339 strop_rfind(PyObject self, PyObject args)
1367 ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	340 {
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	341 char s, sub;
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	342 int len, n, j;
5188 3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	343 int i = 0, last = INT_MAX;
1367 ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	344
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	345 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	346 if (!PyArg_ParseTuple(args, "t#t#\|ii:rfind", &s, &len, &sub, &n, &i, &last))
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	347 return NULL;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	348
5188 3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	349 if (last > len)
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	350 last = len;
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	351 if (last < 0)
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	352 last += len;
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	353 if (last < 0)
3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	354 last = 0;
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	355 if (i < 0)
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	356 i += len;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	357 if (i < 0)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	358 i = 0;
1367 ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	359
7733 30e331496930 Check for boundary errors in [r]find -- find("x", "", 2) should return -1. Guido van Rossum <guido@python.org> parents: 7214 diff changeset	360 if (n == 0 && i <= last)
5188 3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	361 return PyInt_FromLong((long)last);
1367 ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index Guido van Rossum <guido@python.org> parents: 1356 diff changeset	362
5188 3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	363 for (j = last-n; j >= i; --j)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	364 if (s[j] == sub[0] &&
4352 6ec0caeaf823 Replace all uses of strncmp (in split, find, rfind) with memcmp, so Guido van Rossum <guido@python.org> parents: 4296 diff changeset	365 (n == 1 \|\| memcmp(&s[j+1], &sub[1], n-1) == 0))
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	366 return PyInt_FromLong((long)j);
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	367
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	368 return PyInt_FromLong(-1L);
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	369 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	370
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	371
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	372 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	373 do_strip(PyObject *args, int striptype)
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	374 {
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	375 char *s;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	376 int len, i, j;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	377
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	378
9307 928ea5a409e5 Use the t# format where appropriate. Greg Stein. Guido van Rossum <guido@python.org> parents: 9289 diff changeset	379 if (!PyArg_Parse(args, "t#", &s, &len))
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	380 return NULL;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	381
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	382 i = 0;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	383 if (striptype != RIGHTSTRIP) {
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	384 while (i < len && isspace(Py_CHARMASK(s[i]))) {
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	385 i++;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	386 }
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	387 }
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	388
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	389 j = len;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	390 if (striptype != LEFTSTRIP) {
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	391 do {
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	392 j--;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	393 } while (j >= i && isspace(Py_CHARMASK(s[j])));
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	394 j++;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	395 }
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	396
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	397 if (i == 0 && j == len) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	398 Py_INCREF(args);
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	399 return args;
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	400 }
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	401 else
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	402 return PyString_FromStringAndSize(s+i, j-i);
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	403 }
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	404
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	405
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	406 static char strip__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	407 "strip(s) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	408 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	409 "Return a copy of the string s with leading and trailing\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	410 "whitespace removed.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	411
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	412 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	413 strop_strip(PyObject self, PyObject args)
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	414 {
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	415 WARN;
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	416 return do_strip(args, BOTHSTRIP);
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	417 }
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	418
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	419
eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	420 static char lstrip__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	421 "lstrip(s) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	422 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	423 "Return a copy of the string s with leading whitespace removed.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	424
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	425 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	426 strop_lstrip(PyObject self, PyObject args)
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	427 {
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	428 WARN;
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	429 return do_strip(args, LEFTSTRIP);
b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	430 }
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	431
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	432
eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	433 static char rstrip__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	434 "rstrip(s) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	435 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	436 "Return a copy of the string s with trailing whitespace removed.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	437
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	438 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	439 strop_rstrip(PyObject self, PyObject args)
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	440 {
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	441 WARN;
3978 b93c4cfc2cfe Added lstrip() and rstrip(). Guido van Rossum <guido@python.org> parents: 3799 diff changeset	442 return do_strip(args, RIGHTSTRIP);
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	443 }
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	444
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	445
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	446 static char lower__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	447 "lower(s) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	448 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	449 "Return a copy of the string s converted to lowercase.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	450
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	451 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	452 strop_lower(PyObject self, PyObject args)
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	453 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	454 char s, s_new;
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	455 int i, n;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	456 PyObject *new;
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	457 int changed;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	458
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	459 WARN;
9307 928ea5a409e5 Use the t# format where appropriate. Greg Stein. Guido van Rossum <guido@python.org> parents: 9289 diff changeset	460 if (!PyArg_Parse(args, "t#", &s, &n))
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	461 return NULL;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	462 new = PyString_FromStringAndSize(NULL, n);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	463 if (new == NULL)
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	464 return NULL;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	465 s_new = PyString_AsString(new);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	466 changed = 0;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	467 for (i = 0; i < n; i++) {
2310 07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2061 diff changeset	468 int c = Py_CHARMASK(*s++);
4894 f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	469 if (isupper(c)) {
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	470 changed = 1;
4894 f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	471 *s_new = tolower(c);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	472 } else
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	473 *s_new = c;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	474 s_new++;
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	475 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	476 if (!changed) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	477 Py_DECREF(new);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	478 Py_INCREF(args);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	479 return args;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	480 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	481 return new;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	482 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	483
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	484
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	485 static char upper__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	486 "upper(s) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	487 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	488 "Return a copy of the string s converted to uppercase.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	489
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	490 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	491 strop_upper(PyObject self, PyObject args)
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	492 {
4894 f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	493 char s, s_new;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	494 int i, n;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	495 PyObject *new;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	496 int changed;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	497
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	498 WARN;
9307 928ea5a409e5 Use the t# format where appropriate. Greg Stein. Guido van Rossum <guido@python.org> parents: 9289 diff changeset	499 if (!PyArg_Parse(args, "t#", &s, &n))
4894 f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	500 return NULL;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	501 new = PyString_FromStringAndSize(NULL, n);
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	502 if (new == NULL)
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	503 return NULL;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	504 s_new = PyString_AsString(new);
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	505 changed = 0;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	506 for (i = 0; i < n; i++) {
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	507 int c = Py_CHARMASK(*s++);
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	508 if (islower(c)) {
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	509 changed = 1;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	510 *s_new = toupper(c);
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	511 } else
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	512 *s_new = c;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	513 s_new++;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	514 }
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	515 if (!changed) {
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	516 Py_DECREF(new);
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	517 Py_INCREF(args);
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	518 return args;
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	519 }
f31f47ff1fdd strop_upper(), strop_lower(): shared code version caused to much of a Barry Warsaw <barry@python.org> parents: 4889 diff changeset	520 return new;
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	521 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	522
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	523
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	524 static char capitalize__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	525 "capitalize(s) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	526 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	527 "Return a copy of the string s with only its first character\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	528 "capitalized.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	529
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	530 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	531 strop_capitalize(PyObject self, PyObject args)
3676 74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	532 {
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	533 char s, s_new;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	534 int i, n;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	535 PyObject *new;
3676 74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	536 int changed;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	537
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	538 WARN;
9307 928ea5a409e5 Use the t# format where appropriate. Greg Stein. Guido van Rossum <guido@python.org> parents: 9289 diff changeset	539 if (!PyArg_Parse(args, "t#", &s, &n))
3676 74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	540 return NULL;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	541 new = PyString_FromStringAndSize(NULL, n);
3676 74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	542 if (new == NULL)
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	543 return NULL;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	544 s_new = PyString_AsString(new);
3676 74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	545 changed = 0;
3679 b8980735d03b Test for zero-length argument in capitalize(). Guido van Rossum <guido@python.org> parents: 3676 diff changeset	546 if (0 < n) {
3676 74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	547 int c = Py_CHARMASK(*s++);
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	548 if (islower(c)) {
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	549 changed = 1;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	550 *s_new = toupper(c);
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	551 } else
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	552 *s_new = c;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	553 s_new++;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	554 }
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	555 for (i = 1; i < n; i++) {
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	556 int c = Py_CHARMASK(*s++);
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	557 if (isupper(c)) {
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	558 changed = 1;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	559 *s_new = tolower(c);
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	560 } else
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	561 *s_new = c;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	562 s_new++;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	563 }
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	564 if (!changed) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	565 Py_DECREF(new);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	566 Py_INCREF(args);
3676 74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	567 return args;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	568 }
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	569 return new;
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	570 }
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	571
74764b3ec1bd added capitalize() Guido van Rossum <guido@python.org> parents: 3087 diff changeset	572
9953 ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	573 static char expandtabs__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	574 "expandtabs(string, [tabsize]) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	575 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	576 "Expand tabs in a string, i.e. replace them by one or more spaces,\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	577 "depending on the current column and the given tab size (default 8).\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	578 "The column number is reset to zero after each newline occurring in the\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	579 "string. This doesn't understand other non-printing characters.";
9953 ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	580
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	581 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	582 strop_expandtabs(PyObject self, PyObject args)
9953 ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	583 {
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	584 /* Original by Fredrik Lundh */
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	585 char* e;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	586 char* p;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	587 char* q;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	588 int i, j;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	589 PyObject* out;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	590 char* string;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	591 int stringlen;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	592 int tabsize = 8;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	593
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	594 WARN;
9953 ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	595 /* Get arguments */
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	596 if (!PyArg_ParseTuple(args, "s#\|i:expandtabs", &string, &stringlen, &tabsize))
9953 ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	597 return NULL;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	598 if (tabsize < 1) {
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	599 PyErr_SetString(PyExc_ValueError,
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	600 "tabsize must be at least 1");
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	601 return NULL;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	602 }
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	603
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	604 /* First pass: determine size of output string */
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	605 i = j = 0; /* j: current column; i: total of previous lines */
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	606 e = string + stringlen;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	607 for (p = string; p < e; p++) {
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	608 if (*p == '\t')
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	609 j += tabsize - (j%tabsize);
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	610 else {
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	611 j++;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	612 if (*p == '\n') {
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	613 i += j;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	614 j = 0;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	615 }
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	616 }
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	617 }
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	618
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	619 /* Second pass: create output string and fill it */
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	620 out = PyString_FromStringAndSize(NULL, i+j);
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	621 if (out == NULL)
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	622 return NULL;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	623
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	624 i = 0;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	625 q = PyString_AS_STRING(out);
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	626
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	627 for (p = string; p < e; p++) {
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	628 if (*p == '\t') {
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	629 j = tabsize - (i%tabsize);
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	630 i += j;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	631 while (j-- > 0)
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	632 *q++ = ' ';
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	633 } else {
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	634 q++ = p;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	635 i++;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	636 if (*p == '\n')
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	637 i = 0;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	638 }
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	639 }
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	640
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	641 return out;
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	642 }
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	643
ca2745271111 A gift from Fredrik Lundh: fast C implementation of expandtabs(). Guido van Rossum <guido@python.org> parents: 9626 diff changeset	644
9258 2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	645 static char count__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	646 "count(s, sub[, start[, end]]) -> int\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	647 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	648 "Return the number of occurrences of substring sub in string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	649 "s[start:end]. Optional arguments start and end are\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	650 "interpreted as in slice notation.";
9258 2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	651
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	652 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	653 strop_count(PyObject self, PyObject args)
9258 2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	654 {
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	655 char s, sub;
9289 5d344710fcc3 Make gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 9258 diff changeset	656 int len, n;
9258 2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	657 int i = 0, last = INT_MAX;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	658 int m, r;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	659
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	660 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	661 if (!PyArg_ParseTuple(args, "t#t#\|ii:count", &s, &len, &sub, &n, &i, &last))
9258 2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	662 return NULL;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	663 if (last > len)
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	664 last = len;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	665 if (last < 0)
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	666 last += len;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	667 if (last < 0)
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	668 last = 0;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	669 if (i < 0)
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	670 i += len;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	671 if (i < 0)
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	672 i = 0;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	673 m = last + 1 - n;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	674 if (n == 0)
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	675 return PyInt_FromLong((long) (m-i));
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	676
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	677 r = 0;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	678 while (i < m) {
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	679 if (!memcmp(s+i, sub, n)) {
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	680 r++;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	681 i += n;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	682 } else {
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	683 i++;
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	684 }
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	685 }
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	686 return PyInt_FromLong((long) r);
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	687 }
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	688
2577c0cc7482 Andrew Dalke's implementation of string.count(). Guido van Rossum <guido@python.org> parents: 8809 diff changeset	689
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	690 static char swapcase__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	691 "swapcase(s) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	692 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	693 "Return a copy of the string s with upper case characters\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	694 "converted to lowercase and vice versa.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	695
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	696 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	697 strop_swapcase(PyObject self, PyObject args)
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	698 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	699 char s, s_new;
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	700 int i, n;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	701 PyObject *new;
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	702 int changed;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	703
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	704 WARN;
9307 928ea5a409e5 Use the t# format where appropriate. Greg Stein. Guido van Rossum <guido@python.org> parents: 9289 diff changeset	705 if (!PyArg_Parse(args, "t#", &s, &n))
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	706 return NULL;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	707 new = PyString_FromStringAndSize(NULL, n);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	708 if (new == NULL)
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	709 return NULL;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	710 s_new = PyString_AsString(new);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	711 changed = 0;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	712 for (i = 0; i < n; i++) {
2310 07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2061 diff changeset	713 int c = Py_CHARMASK(*s++);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	714 if (islower(c)) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	715 changed = 1;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	716 *s_new = toupper(c);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	717 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	718 else if (isupper(c)) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	719 changed = 1;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	720 *s_new = tolower(c);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	721 }
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	722 else
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	723 *s_new = c;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1337 diff changeset	724 s_new++;
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	725 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	726 if (!changed) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	727 Py_DECREF(new);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	728 Py_INCREF(args);
1048 c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	729 return args;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	730 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	731 return new;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	732 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	733
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added Guido van Rossum <guido@python.org> parents: 1012 diff changeset	734
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	735 static char atoi__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	736 "atoi(s [,base]) -> int\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	737 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	738 "Return the integer represented by the string s in the given\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	739 "base, which defaults to 10. The string s must consist of one\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	740 "or more digits, possibly preceded by a sign. If base is 0, it\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	741 "is chosen from the leading characters of s, 0 for octal, 0x or\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	742 "0X for hexadecimal. If base is 16, a preceding 0x or 0X is\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	743 "accepted.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	744
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	745 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	746 strop_atoi(PyObject self, PyObject args)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	747 {
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	748 char s, end;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	749 int base = 10;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	750 long x;
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	751 char buffer[256]; /* For errors */
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	752
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	753 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	754 if (!PyArg_ParseTuple(args, "s\|i:atoi", &s, &base))
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	755 return NULL;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	756
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	757 if ((base != 0 && base < 2) \|\| base > 36) {
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	758 PyErr_SetString(PyExc_ValueError, "invalid base for atoi()");
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	759 return NULL;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	760 }
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	761
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	762 while (s && isspace(Py_CHARMASK(s)))
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	763 s++;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	764 errno = 0;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	765 if (base == 0 && s[0] == '0')
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	766 x = (long) PyOS_strtoul(s, &end, base);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	767 else
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	768 x = PyOS_strtol(s, &end, base);
10268 35df4dc2d30d In atoi(), don't use isxdigit() to test whether the last character Guido van Rossum <guido@python.org> parents: 9955 diff changeset	769 if (end == s \|\| !isalnum(end[-1]))
8809 c5d72bcda932 Better error messages when raising ValueError for int literals. (The Guido van Rossum <guido@python.org> parents: 8757 diff changeset	770 goto bad;
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	771 while (end && isspace(Py_CHARMASK(end)))
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	772 end++;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	773 if (*end != '\0') {
8809 c5d72bcda932 Better error messages when raising ValueError for int literals. (The Guido van Rossum <guido@python.org> parents: 8757 diff changeset	774 bad:
21073 304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 17834 diff changeset	775 PyOS_snprintf(buffer, sizeof(buffer),
304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 17834 diff changeset	776 "invalid literal for atoi(): %.200s", s);
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	777 PyErr_SetString(PyExc_ValueError, buffer);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	778 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	779 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	780 else if (errno != 0) {
21094 c2150313d9d1 More sprintf -> PyOS_snprintf. Tim Peters <tim.peters@gmail.com> parents: 21073 diff changeset	781 PyOS_snprintf(buffer, sizeof(buffer),
c2150313d9d1 More sprintf -> PyOS_snprintf. Tim Peters <tim.peters@gmail.com> parents: 21073 diff changeset	782 "atoi() literal too large: %.200s", s);
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	783 PyErr_SetString(PyExc_ValueError, buffer);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	784 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	785 }
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	786 return PyInt_FromLong(x);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	787 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	788
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	789
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	790 static char atol__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	791 "atol(s [,base]) -> long\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	792 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	793 "Return the long integer represented by the string s in the\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	794 "given base, which defaults to 10. The string s must consist\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	795 "of one or more digits, possibly preceded by a sign. If base\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	796 "is 0, it is chosen from the leading characters of s, 0 for\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	797 "octal, 0x or 0X for hexadecimal. If base is 16, a preceding\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	798 "0x or 0X is accepted. A trailing L or l is not accepted,\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	799 "unless base is 0.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	800
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	801 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	802 strop_atol(PyObject self, PyObject args)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	803 {
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	804 char s, end;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	805 int base = 10;
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	806 PyObject *x;
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	807 char buffer[256]; /* For errors */
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	808
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	809 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	810 if (!PyArg_ParseTuple(args, "s\|i:atol", &s, &base))
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	811 return NULL;
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	812
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	813 if ((base != 0 && base < 2) \|\| base > 36) {
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	814 PyErr_SetString(PyExc_ValueError, "invalid base for atol()");
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	815 return NULL;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	816 }
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	817
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	818 while (s && isspace(Py_CHARMASK(s)))
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	819 s++;
4094 8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4035 diff changeset	820 if (s[0] == '\0') {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	821 PyErr_SetString(PyExc_ValueError, "empty string for atol()");
4094 8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4035 diff changeset	822 return NULL;
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4035 diff changeset	823 }
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	824 x = PyLong_FromString(s, &end, base);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	825 if (x == NULL)
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	826 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	827 if (base == 0 && (end == 'l' \|\| end == 'L'))
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	828 end++;
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	829 while (end && isspace(Py_CHARMASK(end)))
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	830 end++;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	831 if (*end != '\0') {
21094 c2150313d9d1 More sprintf -> PyOS_snprintf. Tim Peters <tim.peters@gmail.com> parents: 21073 diff changeset	832 PyOS_snprintf(buffer, sizeof(buffer),
c2150313d9d1 More sprintf -> PyOS_snprintf. Tim Peters <tim.peters@gmail.com> parents: 21073 diff changeset	833 "invalid literal for atol(): %.200s", s);
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	834 PyErr_SetString(PyExc_ValueError, buffer);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	835 Py_DECREF(x);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	836 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	837 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	838 return x;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	839 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	840
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	841
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	842 static char atof__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	843 "atof(s) -> float\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	844 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	845 "Return the floating point number represented by the string s.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	846
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	847 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	848 strop_atof(PyObject self, PyObject args)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	849 {
13447 a89f7f268de4 Nuke all remaining occurrences of Py_PROTO and Py_FPROTO. Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	850 extern double strtod(const char , char *);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	851 char s, end;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	852 double x;
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	853 char buffer[256]; /* For errors */
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	854
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	855 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	856 if (!PyArg_ParseTuple(args, "s:atof", &s))
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	857 return NULL;
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	858 while (s && isspace(Py_CHARMASK(s)))
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	859 s++;
4094 8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4035 diff changeset	860 if (s[0] == '\0') {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	861 PyErr_SetString(PyExc_ValueError, "empty string for atof()");
4094 8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4035 diff changeset	862 return NULL;
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4035 diff changeset	863 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	864 errno = 0;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4901 diff changeset	865 PyFPE_START_PROTECT("strop_atof", return 0)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	866 x = strtod(s, &end);
5188 3ec3d8807f9e Add optional 4th argument to [r]find and [r]index (end of slice). Guido van Rossum <guido@python.org> parents: 5120 diff changeset	867 PyFPE_END_PROTECT(x)
4296 75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	868 while (end && isspace(Py_CHARMASK(end)))
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof(). Guido van Rossum <guido@python.org> parents: 4094 diff changeset	869 end++;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	870 if (*end != '\0') {
21073 304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 17834 diff changeset	871 PyOS_snprintf(buffer, sizeof(buffer),
304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 17834 diff changeset	872 "invalid literal for atof(): %.200s", s);
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	873 PyErr_SetString(PyExc_ValueError, buffer);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	874 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	875 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	876 else if (errno != 0) {
21073 304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 17834 diff changeset	877 PyOS_snprintf(buffer, sizeof(buffer),
304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 17834 diff changeset	878 "atof() literal too large: %.200s", s);
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	879 PyErr_SetString(PyExc_ValueError, buffer);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	880 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	881 }
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	882 return PyFloat_FromDouble(x);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	883 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	884
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1394 diff changeset	885
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	886 static char maketrans__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	887 "maketrans(frm, to) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	888 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	889 "Return a translation table (a string of 256 bytes long)\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	890 "suitable for use in string.translate. The strings frm and to\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	891 "must be of the same length.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	892
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	893 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	894 strop_maketrans(PyObject self, PyObject args)
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	895 {
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	896 unsigned char c, from=NULL, *to=NULL;
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	897 int i, fromlen=0, tolen=0;
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	898 PyObject *result;
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	899
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	900 if (!PyArg_ParseTuple(args, "t#t#:maketrans", &from, &fromlen, &to, &tolen))
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	901 return NULL;
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	902
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	903 if (fromlen != tolen) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	904 PyErr_SetString(PyExc_ValueError,
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	905 "maketrans arguments must have same length");
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	906 return NULL;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	907 }
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	908
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	909 result = PyString_FromStringAndSize((char *)NULL, 256);
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	910 if (result == NULL)
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	911 return NULL;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	912 c = (unsigned char ) PyString_AS_STRING((PyStringObject )result);
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	913 for (i = 0; i < 256; i++)
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	914 c[i]=(unsigned char)i;
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	915 for (i = 0; i < fromlen; i++)
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	916 c[from[i]]=to[i];
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	917
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	918 return result;
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	919 }
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	920
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	921
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	922 static char translate__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	923 "translate(s,table [,deletechars]) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	924 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	925 "Return a copy of the string s, where all characters occurring\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	926 "in the optional argument deletechars are removed, and the\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	927 "remaining characters have been mapped through the given\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	928 "translation table, which must be a string of length 256.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	929
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	930 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	931 strop_translate(PyObject self, PyObject args)
3087 31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	932 {
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	933 register char input, table, *output;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	934 register int i, c, changed = 0;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	935 PyObject *input_obj;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	936 char table1, output_start, *del_table=NULL;
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	937 int inlen, tablen, dellen = 0;
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	938 PyObject *result;
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	939 int trans_table[256];
3087 31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	940
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	941 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	942 if (!PyArg_ParseTuple(args, "St#\|t#:translate", &input_obj,
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	943 &table1, &tablen, &del_table, &dellen))
3087 31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	944 return NULL;
31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	945 if (tablen != 256) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	946 PyErr_SetString(PyExc_ValueError,
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	947 "translation table must be 256 characters long");
3087 31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	948 return NULL;
31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	949 }
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	950
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	951 table = table1;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	952 inlen = PyString_Size(input_obj);
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	953 result = PyString_FromStringAndSize((char *)NULL, inlen);
3087 31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	954 if (result == NULL)
31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	955 return NULL;
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	956 output_start = output = PyString_AsString(result);
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	957 input = PyString_AsString(input_obj);
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	958
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	959 if (dellen == 0) {
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	960 /* If no deletions are required, use faster code */
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	961 for (i = inlen; --i >= 0; ) {
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	962 c = Py_CHARMASK(*input++);
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	963 if (Py_CHARMASK((*output++ = table[c])) != c)
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	964 changed = 1;
3799 2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete. Guido van Rossum <guido@python.org> parents: 3679 diff changeset	965 }
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	966 if (changed)
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	967 return result;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	968 Py_DECREF(result);
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	969 Py_INCREF(input_obj);
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	970 return input_obj;
3087 31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	971 }
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	972
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	973 for (i = 0; i < 256; i++)
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	974 trans_table[i] = Py_CHARMASK(table[i]);
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	975
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	976 for (i = 0; i < dellen; i++)
5380 2d4c6cba01bf Keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 5249 diff changeset	977 trans_table[(int) Py_CHARMASK(del_table[i])] = -1;
4895 5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	978
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	979 for (i = inlen; --i >= 0; ) {
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	980 c = Py_CHARMASK(*input++);
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	981 if (trans_table[c] != -1)
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	982 if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c)
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	983 continue;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	984 changed = 1;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	985 }
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	986 if (!changed) {
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	987 Py_DECREF(result);
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	988 Py_INCREF(input_obj);
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	989 return input_obj;
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	990 }
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	991 /* Fix the size of the resulting string */
5568320da9b5 Rewrote translate() as follows: Guido van Rossum <guido@python.org> parents: 4894 diff changeset	992 if (inlen > 0 &&_PyString_Resize(&result, output-output_start))
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	993 return NULL;
3087 31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	994 return result;
31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	995 }
31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	996
31684c5bb172 added strop.translate(s, table) Guido van Rossum <guido@python.org> parents: 2707 diff changeset	997
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	998 /* What follows is used for implementing replace(). Perry Stoll. */
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	999
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1000 /*
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1001 mymemfind
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1002
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1003 strstr replacement for arbitrary blocks of memory.
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1004
12025 7994d9db7f4d On 17-Mar-2000, Marc-Andre Lemburg said: Barry Warsaw <barry@python.org> parents: 11882 diff changeset	1005 Locates the first occurrence in the memory pointed to by MEM of the
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1006 contents of memory pointed to by PAT. Returns the index into MEM if
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1007 found, or -1 if not found. If len of PAT is greater than length of
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1008 MEM, the function returns -1.
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1009 */
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1010 static int
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1011 mymemfind(const char mem, int len, const char pat, int pat_len)
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1012 {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1013 register int ii;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1014
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1015 /* pattern can not occur in the last pat_len-1 chars */
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1016 len -= pat_len;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1017
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1018 for (ii = 0; ii <= len; ii++) {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1019 if (mem[ii] == pat[0] &&
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1020 (pat_len == 1 \|\|
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1021 memcmp(&mem[ii+1], &pat[1], pat_len-1) == 0)) {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1022 return ii;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1023 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1024 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1025 return -1;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1026 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1027
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1028 /*
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1029 mymemcnt
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1030
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1031 Return the number of distinct times PAT is found in MEM.
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1032 meaning mem=1111 and pat==11 returns 2.
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1033 mem=11111 and pat==11 also return 2.
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1034 */
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1035 static int
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1036 mymemcnt(const char mem, int len, const char pat, int pat_len)
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1037 {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1038 register int offset = 0;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1039 int nfound = 0;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1040
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1041 while (len >= 0) {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1042 offset = mymemfind(mem, len, pat, pat_len);
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1043 if (offset == -1)
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1044 break;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1045 mem += offset + pat_len;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1046 len -= offset + pat_len;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1047 nfound++;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1048 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1049 return nfound;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1050 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1051
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1052 /*
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1053 mymemreplace
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1054
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1055 Return a string in which all occurrences of PAT in memory STR are
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1056 replaced with SUB.
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1057
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	1058 If length of PAT is less than length of STR or there are no occurrences
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1059 of PAT in STR, then the original string is returned. Otherwise, a new
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1060 string is allocated here and returned.
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1061
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1062 on return, out_len is:
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1063 the length of output string, or
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1064 -1 if the input string is returned, or
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1065 unchanged if an error occurs (no memory).
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1066
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1067 return value is:
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1068 the new string allocated locally, or
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1069 NULL if an error occurred.
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1070 */
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1071 static char *
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1072 mymemreplace(const char str, int len, / input string */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1073 const char pat, int pat_len, / pattern string to find */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1074 const char sub, int sub_len, / substitution string */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1075 int count, /* number of replacements */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1076 int *out_len)
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1077 {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1078 char *out_s;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1079 char *new_s;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1080 int nfound, offset, new_len;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1081
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1082 if (len == 0 \|\| pat_len > len)
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1083 goto return_same;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1084
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1085 /* find length of output string */
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1086 nfound = mymemcnt(str, len, pat, pat_len);
17751 c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	1087 if (count < 0)
c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	1088 count = INT_MAX;
c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	1089 else if (nfound > count)
c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	1090 nfound = count;
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1091 if (nfound == 0)
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1092 goto return_same;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1093
17749 f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1094 new_len = len + nfound*(sub_len - pat_len);
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1095 if (new_len == 0) {
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1096 /* Have to allocate something for the caller to free(). */
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1097 out_s = (char *)PyMem_MALLOC(1);
17751 c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	1098 if (out_s == NULL)
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1099 return NULL;
b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1100 out_s[0] = '\0';
17749 f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1101 }
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1102 else {
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1103 assert(new_len > 0);
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1104 new_s = (char *)PyMem_MALLOC(new_len);
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1105 if (new_s == NULL)
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1106 return NULL;
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1107 out_s = new_s;
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1108
17751 c886cd1c2184 Heh. I need a break. After this: stropmodule & stringobject were more Tim Peters <tim.peters@gmail.com> parents: 17750 diff changeset	1109 for (; count > 0 && len > 0; --count) {
17749 f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1110 /* find index of next instance of pattern */
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1111 offset = mymemfind(str, len, pat, pat_len);
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1112 if (offset == -1)
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1113 break;
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1114
17749 f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1115 /* copy non matching part of input string */
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1116 memcpy(new_s, str, offset);
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1117 str += offset + pat_len;
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1118 len -= offset + pat_len;
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1119
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1120 /* copy substitute into the output string */
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1121 new_s += offset;
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1122 memcpy(new_s, sub, sub_len);
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1123 new_s += sub_len;
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1124 }
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1125 /* copy any remaining values into output string */
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1126 if (len > 0)
f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1127 memcpy(new_s, str, len);
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1128 }
17749 f465cae301ee SF bug #422088: [OSF1 alpha] string.replace(). Tim Peters <tim.peters@gmail.com> parents: 17748 diff changeset	1129 *out_len = new_len;
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1130 return out_s;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1131
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1132 return_same:
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1133 *out_len = -1;
17750 b39266f7484c Fudge. stropmodule and stringobject both had copies of the buggy Tim Peters <tim.peters@gmail.com> parents: 17749 diff changeset	1134 return (char )str; / cast away const */
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1135 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1136
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1137
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1138 static char replace__doc__[] =
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1139 "replace (str, old, new[, maxsplit]) -> string\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1140 "\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1141 "Return a copy of string str with all occurrences of substring\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1142 "old replaced by new. If the optional argument maxsplit is\n"
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1143 "given, only the first maxsplit occurrences are replaced.";
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1144
eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1145 static PyObject *
13494 4aa12e55bf95 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13447 diff changeset	1146 strop_replace(PyObject self, PyObject args)
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1147 {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1148 char str, pat,sub,new_s;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1149 int len,pat_len,sub_len,out_len;
17752 f4374d7931ba The strop module and test_strop.py believe replace() with a 0 count Tim Peters <tim.peters@gmail.com> parents: 17751 diff changeset	1150 int count = -1;
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1151 PyObject *new;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1152
17834 ed1e8b6e26ec Add warnings to the strop module, for to those functions that really Guido van Rossum <guido@python.org> parents: 17753 diff changeset	1153 WARN;
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11439 diff changeset	1154 if (!PyArg_ParseTuple(args, "t#t#t#\|i:replace",
6684 017467de7933 mymemreplace(), strop_replace(): Add support for optional 4th argument Barry Warsaw <barry@python.org> parents: 5380 diff changeset	1155 &str, &len, &pat, &pat_len, &sub, &sub_len,
017467de7933 mymemreplace(), strop_replace(): Add support for optional 4th argument Barry Warsaw <barry@python.org> parents: 5380 diff changeset	1156 &count))
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1157 return NULL;
8333 a4ae792b9b68 strop_replace(): balk if the pattern string is empty. Guido van Rossum <guido@python.org> parents: 7733 diff changeset	1158 if (pat_len <= 0) {
a4ae792b9b68 strop_replace(): balk if the pattern string is empty. Guido van Rossum <guido@python.org> parents: 7733 diff changeset	1159 PyErr_SetString(PyExc_ValueError, "empty pattern string");
a4ae792b9b68 strop_replace(): balk if the pattern string is empty. Guido van Rossum <guido@python.org> parents: 7733 diff changeset	1160 return NULL;
a4ae792b9b68 strop_replace(): balk if the pattern string is empty. Guido van Rossum <guido@python.org> parents: 7733 diff changeset	1161 }
17753 c47cc9a9864c Guido has Spoken. Restore strop.replace()'s treatment of a 0 count as Tim Peters <tim.peters@gmail.com> parents: 17752 diff changeset	1162 /* CAUTION: strop treats a replace count of 0 as infinity, unlke
c47cc9a9864c Guido has Spoken. Restore strop.replace()'s treatment of a 0 count as Tim Peters <tim.peters@gmail.com> parents: 17752 diff changeset	1163 * current (2.1) string.py and string methods. Preserve this for
c47cc9a9864c Guido has Spoken. Restore strop.replace()'s treatment of a 0 count as Tim Peters <tim.peters@gmail.com> parents: 17752 diff changeset	1164 * ... well, hard to say for what <wink>.
c47cc9a9864c Guido has Spoken. Restore strop.replace()'s treatment of a 0 count as Tim Peters <tim.peters@gmail.com> parents: 17752 diff changeset	1165 */
c47cc9a9864c Guido has Spoken. Restore strop.replace()'s treatment of a 0 count as Tim Peters <tim.peters@gmail.com> parents: 17752 diff changeset	1166 if (count == 0)
c47cc9a9864c Guido has Spoken. Restore strop.replace()'s treatment of a 0 count as Tim Peters <tim.peters@gmail.com> parents: 17752 diff changeset	1167 count = -1;
6684 017467de7933 mymemreplace(), strop_replace(): Add support for optional 4th argument Barry Warsaw <barry@python.org> parents: 5380 diff changeset	1168 new_s = mymemreplace(str,len,pat,pat_len,sub,sub_len,count,&out_len);
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1169 if (new_s == NULL) {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1170 PyErr_NoMemory();
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1171 return NULL;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1172 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1173 if (out_len == -1) {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1174 /* we're returning another reference to the input string */
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1175 new = PyTuple_GetItem(args, 0);
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1176 Py_XINCREF(new);
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1177 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1178 else {
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1179 new = PyString_FromStringAndSize(new_s, out_len);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12025 diff changeset	1180 PyMem_FREE(new_s);
5249 13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1181 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1182 return new;
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1183 }
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1184
13005872d053 Added replace() implementation by Perry Stoll (debugged and reformatted by me). Guido van Rossum <guido@python.org> parents: 5188 diff changeset	1185
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1186 /* List of functions defined in the module */
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1187
4889 9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	1188 static PyMethodDef
9c6b5a65ce63 Several changes: Barry Warsaw <barry@python.org> parents: 4617 diff changeset	1189 strop_methods[] = {
17748 261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1190 {"atof", strop_atof, METH_VARARGS, atof__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1191 {"atoi", strop_atoi, METH_VARARGS, atoi__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1192 {"atol", strop_atol, METH_VARARGS, atol__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1193 {"capitalize", strop_capitalize, METH_OLDARGS, capitalize__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1194 {"count", strop_count, METH_VARARGS, count__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1195 {"expandtabs", strop_expandtabs, METH_VARARGS, expandtabs__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1196 {"find", strop_find, METH_VARARGS, find__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1197 {"join", strop_joinfields, METH_VARARGS, joinfields__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1198 {"joinfields", strop_joinfields, METH_VARARGS, joinfields__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1199 {"lstrip", strop_lstrip, METH_OLDARGS, lstrip__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1200 {"lower", strop_lower, METH_OLDARGS, lower__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1201 {"maketrans", strop_maketrans, METH_VARARGS, maketrans__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1202 {"replace", strop_replace, METH_VARARGS, replace__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1203 {"rfind", strop_rfind, METH_VARARGS, rfind__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1204 {"rstrip", strop_rstrip, METH_OLDARGS, rstrip__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1205 {"split", strop_splitfields, METH_VARARGS, splitfields__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1206 {"splitfields", strop_splitfields, METH_VARARGS, splitfields__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1207 {"strip", strop_strip, METH_OLDARGS, strip__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1208 {"swapcase", strop_swapcase, METH_OLDARGS, swapcase__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1209 {"translate", strop_translate, METH_VARARGS, translate__doc__},
261196bd16d7 Mechanical changes for easier edits. Tim Peters <tim.peters@gmail.com> parents: 14869 diff changeset	1210 {"upper", strop_upper, METH_OLDARGS, upper__doc__},
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1211 {NULL, NULL} /* sentinel */
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1212 };
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1213
806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1214
9588 38023a425e48 Add DL_EXPORT() to all modules that could possibly be used Guido van Rossum <guido@python.org> parents: 9402 diff changeset	1215 DL_EXPORT(void)
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1216 initstrop(void)
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1217 {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1218 PyObject m, d, *s;
1321 a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1219 char buf[256];
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1220 int c, n;
6966 eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1221 m = Py_InitModule4("strop", strop_methods, strop_module__doc__,
eed63049df95 Added doc string, provided by Charles Waldman (with some reformatting Guido van Rossum <guido@python.org> parents: 6696 diff changeset	1222 (PyObject*)NULL, PYTHON_API_VERSION);
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1223 d = PyModule_GetDict(m);
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1224
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1225 /* Create 'whitespace' object */
1321 a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1226 n = 0;
2310 07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2061 diff changeset	1227 for (c = 0; c < 256; c++) {
1321 a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1228 if (isspace(c))
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1229 buf[n++] = c;
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1230 }
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1231 s = PyString_FromStringAndSize(buf, n);
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1232 if (s) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1233 PyDict_SetItemString(d, "whitespace", s);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1234 Py_DECREF(s);
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1235 }
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1236 /* Create 'lowercase' object */
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1237 n = 0;
2310 07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2061 diff changeset	1238 for (c = 0; c < 256; c++) {
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1239 if (islower(c))
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1240 buf[n++] = c;
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1241 }
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1242 s = PyString_FromStringAndSize(buf, n);
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1243 if (s) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1244 PyDict_SetItemString(d, "lowercase", s);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1245 Py_DECREF(s);
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1246 }
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1247
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1248 /* Create 'uppercase' object */
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1249 n = 0;
2310 07913fb8f92f use Py_CHARMASK Guido van Rossum <guido@python.org> parents: 2061 diff changeset	1250 for (c = 0; c < 256; c++) {
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1251 if (isupper(c))
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1252 buf[n++] = c;
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1253 }
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1254 s = PyString_FromStringAndSize(buf, n);
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1255 if (s) {
4617 87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1256 PyDict_SetItemString(d, "uppercase", s);
87999dc4d798 Greatly renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1257 Py_DECREF(s);
1322 f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS Guido van Rossum <guido@python.org> parents: 1321 diff changeset	1258 }
1012 806689b93558 Re-implement some operations from string.py in C, for speed. Guido van Rossum <guido@python.org> parents: diff changeset	1259 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/stropmodule.c @ 25838:8540887bcec6 2.2