Mercurial > cpython-lru_cache-weakref

annotate Modules/stropmodule.c @ 4566:6403c94de50d legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added safeguard against failure in __del__.
author Guido van Rossum <guido@python.org>
date Wed, 27 Nov 1996 19:39:58 +0000
parents 65d2d8e67da3
children d36250aefb82
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 /***********************************************************
2061
172ba04a5191 Added 1995 to copyright message.
Guido van Rossum <guido@python.org>
parents: 1888
diff changeset
2 Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
172ba04a5191 Added 1995 to copyright message.
Guido van Rossum <guido@python.org>
parents: 1888
diff changeset
3 The Netherlands.
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
4
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
5 All Rights Reserved
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
6
4503
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
7 Permission to use, copy, modify, and distribute this software and its
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
8 documentation for any purpose and without fee is hereby granted,
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
9 provided that the above copyright notice appear in all copies and that
4503
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
10 both that copyright notice and this permission notice appear in
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
11 supporting documentation, and that the names of Stichting Mathematisch
4503
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
12 Centrum or CWI or Corporation for National Research Initiatives or
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
13 CNRI not be used in advertising or publicity pertaining to
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
14 distribution of the software without specific, written prior
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
15 permission.
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
16
4503
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
17 While CWI is the initial source for this software, a modified version
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
18 is made available by the Corporation for National Research Initiatives
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
19 (CNRI) at the Internet address ftp://ftp.python.org.
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
20
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
21 STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
22 REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
23 MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
24 CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
25 DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
26 PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
27 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
65d2d8e67da3 New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents: 4352
diff changeset
28 PERFORMANCE OF THIS SOFTWARE.
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
29
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
30 ******************************************************************/
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
31
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
32 /* strop module */
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
33
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
34 #include "allobjects.h"
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
35 #include "modsupport.h"
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
36
1321
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add
Guido van Rossum <guido@python.org>
parents: 1257
diff changeset
37 #include <ctype.h>
1322
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
38 /* 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
39 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
40
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
41 #include <errno.h>
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
42
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
43 /* The lstrip(), rstrip() and strip() functions are implemented
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
44 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
45 type of strip should occur. */
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
46
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
47 #define LEFTSTRIP 0
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
48 #define RIGHTSTRIP 1
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
49 #define BOTHSTRIP 2
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
50
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
51
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
52 static object *
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
53 split_whitespace(s, len, maxsplit)
2707
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
54 char *s;
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
55 int len;
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
56 int maxsplit;
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
57 {
2707
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
58 int i, j, err;
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
59 int countsplit;
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
60 object *list, *item;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
61
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
62 list = newlistobject(0);
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
63 if (list == NULL)
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
64 return NULL;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
65
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
66 i = 0;
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
67 countsplit = 0;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
68
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
69 while (i < len) {
2310
07913fb8f92f use Py_CHARMASK
Guido van Rossum <guido@python.org>
parents: 2061
diff changeset
70 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
71 i = i+1;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
72 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
73 j = i;
2335
e11e6b358531 fix stupid bug in strip and split
Guido van Rossum <guido@python.org>
parents: 2310
diff changeset
74 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
75 i = i+1;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
76 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
77 if (j < i) {
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
78 item = newsizedstringobject(s+j, (int)(i-j));
1394
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
79 if (item == NULL) {
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
80 DECREF(list);
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
81 return NULL;
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
82 }
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
83 err = addlistitem(list, item);
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
84 DECREF(item);
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
85 if (err < 0) {
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
86 DECREF(list);
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
87 return NULL;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
88 }
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
89
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
90 countsplit++;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
91 if (maxsplit && (countsplit >= maxsplit)) {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
92 item = newsizedstringobject(s+i, (int)(len - i));
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
93 if (item == NULL) {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
94 DECREF(list);
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
95 return NULL;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
96 }
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
97 err = addlistitem(list, item);
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
98 DECREF(item);
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
99 if (err < 0) {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
100 DECREF(list);
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
101 return NULL;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
102 }
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
103 i = len;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
104 }
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
105
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
106 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
107 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
108
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
109 return list;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
110 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
111
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
112
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
113 static object *
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
114 strop_splitfields(self, args)
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
115 object *self; /* Not used */
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
116 object *args;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
117 {
1394
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
118 int len, n, i, j, err;
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
119 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
120 char *s, *sub;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
121 object *list, *item;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
122
2707
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
123 sub = NULL;
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
124 n = 0;
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
125 splitcount = 0;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
126 maxsplit = 0;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
127 if (!newgetargs(args, "s#|z#i", &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
128 return NULL;
2707
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
129 if (sub == NULL)
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
130 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
131 if (n == 0) {
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
132 err_setstr(ValueError, "empty separator");
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
133 return NULL;
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
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
136 list = newlistobject(0);
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
137 if (list == NULL)
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
138 return NULL;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
139
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
140 i = j = 0;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
141 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
142 if (s[i] == sub[0] && (n == 1 || memcmp(s+i, sub, n) == 0)) {
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
143 item = newsizedstringobject(s+j, (int)(i-j));
1394
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
144 if (item == NULL)
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
145 goto fail;
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
146 err = addlistitem(list, item);
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
147 DECREF(item);
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
148 if (err < 0)
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
149 goto fail;
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
150 i = j = i + n;
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
151 splitcount++;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
152 if (maxsplit && (splitcount >= maxsplit))
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
153 break;
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
154 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
155 else
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
156 i++;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
157 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
158 item = newsizedstringobject(s+j, (int)(len-j));
1394
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
159 if (item == NULL)
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
160 goto fail;
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
161 err = addlistitem(list, item);
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
162 DECREF(item);
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
163 if (err < 0)
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
164 goto fail;
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
165
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
166 return list;
1394
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
167
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
168 fail:
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
169 DECREF(list);
98f51f61cb4b Fix memory leaks in join & joinfields
Guido van Rossum <guido@python.org>
parents: 1367
diff changeset
170 return NULL;
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
171 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
172
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
173
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
174 static object *
1094
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
175 strop_joinfields(self, args)
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
176 object *self; /* Not used */
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
177 object *args;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
178 {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
179 object *seq, *item, *res;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
180 object * (*getitem) FPROTO((object *, int));
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
181 char *sep, *p;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
182 int seplen, seqlen, reslen, itemlen, i;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
183
2707
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
184 sep = NULL;
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
185 seplen = 0;
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
186 if (!newgetargs(args, "O|s#", &seq, &sep, &seplen))
1094
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
187 return NULL;
2707
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
188 if (sep == NULL) {
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
189 sep = " ";
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
190 seplen = 1;
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
191 }
1094
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
192 if (is_listobject(seq)) {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
193 getitem = getlistitem;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
194 seqlen = getlistsize(seq);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
195 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
196 else if (is_tupleobject(seq)) {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
197 getitem = gettupleitem;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
198 seqlen = gettuplesize(seq);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
199 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
200 else {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
201 err_setstr(TypeError, "first argument must be list/tuple");
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
202 return NULL;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
203 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
204 reslen = 0;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
205 for (i = 0; i < seqlen; i++) {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
206 item = getitem(seq, i);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
207 if (!is_stringobject(item)) {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
208 err_setstr(TypeError,
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
209 "first argument must be list/tuple of strings");
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
210 return NULL;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
211 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
212 if (i > 0)
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
213 reslen = reslen + seplen;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
214 reslen = reslen + getstringsize(item);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
215 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
216 if (seqlen == 1) {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
217 /* Optimization if there's only one item */
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
218 item = getitem(seq, 0);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
219 INCREF(item);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
220 return item;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
221 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
222 res = newsizedstringobject((char *)NULL, reslen);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
223 if (res == NULL)
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
224 return NULL;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
225 p = getstringvalue(res);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
226 for (i = 0; i < seqlen; i++) {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
227 item = getitem(seq, i);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
228 if (i > 0) {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
229 memcpy(p, sep, seplen);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
230 p += seplen;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
231 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
232 itemlen = getstringsize(item);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
233 memcpy(p, getstringvalue(item), itemlen);
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
234 p += itemlen;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
235 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
236 if (p != getstringvalue(res) + reslen) {
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
237 err_setstr(SystemError, "strop.joinfields: assertion failed");
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
238 return NULL;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
239 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
240 return res;
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
241 }
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
242
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
243
d2af6bdcb6d0 * config.c: Added audioop to lists.
Guido van Rossum <guido@python.org>
parents: 1048
diff changeset
244 static object *
1787
cb84dd51c2aa * Modules/stropmodule.c: implement find/rfind instead of
Guido van Rossum <guido@python.org>
parents: 1760
diff changeset
245 strop_find(self, args)
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
246 object *self; /* Not used */
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
247 object *args;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
248 {
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
249 char *s, *sub;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
250 int len, n, i;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
251
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
252 if (getargs(args, "(s#s#i)", &s, &len, &sub, &n, &i)) {
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
253 if (i < 0)
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
254 i += len;
1888
be956b1efb97 * various modules: #include "Python.h" and remove most remporary
Guido van Rossum <guido@python.org>
parents: 1787
diff changeset
255 if (i < 0)
be956b1efb97 * various modules: #include "Python.h" and remove most remporary
Guido van Rossum <guido@python.org>
parents: 1787
diff changeset
256 i = 0;
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
257 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
258 else {
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
259 err_clear();
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
260 if (!getargs(args, "(s#s#)", &s, &len, &sub, &n))
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
261 return NULL;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
262 i = 0;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
263 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
264
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
265 if (n == 0)
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
266 return newintobject((long)i);
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
267
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
268 len -= n;
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
269 for (; i <= len; ++i)
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
270 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
271 (n == 1 || memcmp(&s[i+1], &sub[1], n-1) == 0))
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
272 return newintobject((long)i);
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
273
1787
cb84dd51c2aa * Modules/stropmodule.c: implement find/rfind instead of
Guido van Rossum <guido@python.org>
parents: 1760
diff changeset
274 return newintobject(-1L);
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
275 }
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
276
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
277
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
278 static object *
1787
cb84dd51c2aa * Modules/stropmodule.c: implement find/rfind instead of
Guido van Rossum <guido@python.org>
parents: 1760
diff changeset
279 strop_rfind(self, args)
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
280 object *self; /* Not used */
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
281 object *args;
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
282 {
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
283 char *s, *sub;
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
284 int len, n, i, j;
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
285
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
286 if (getargs(args, "(s#s#i)", &s, &len, &sub, &n, &i)) {
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
287 if (i < 0)
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
288 i += len;
1888
be956b1efb97 * various modules: #include "Python.h" and remove most remporary
Guido van Rossum <guido@python.org>
parents: 1787
diff changeset
289 if (i < 0)
be956b1efb97 * various modules: #include "Python.h" and remove most remporary
Guido van Rossum <guido@python.org>
parents: 1787
diff changeset
290 i = 0;
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
291 }
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
292 else {
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
293 err_clear();
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
294 if (!getargs(args, "(s#s#)", &s, &len, &sub, &n))
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
295 return NULL;
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
296 i = 0;
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
297 }
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
298
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
299 if (n == 0)
1760
48e6b319f3e4 * Modules/{Setup.in,Makefile.pre.in}: renamed some modules to
Guido van Rossum <guido@python.org>
parents: 1746
diff changeset
300 return newintobject((long)len);
1367
ee4a2f893254 Added rindex(). index() and rindex() interpret negative start index
Guido van Rossum <guido@python.org>
parents: 1356
diff changeset
301
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
302 for (j = len-n; j >= i; --j)
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
303 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
304 (n == 1 || memcmp(&s[j+1], &sub[1], n-1) == 0))
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
305 return newintobject((long)j);
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
306
1787
cb84dd51c2aa * Modules/stropmodule.c: implement find/rfind instead of
Guido van Rossum <guido@python.org>
parents: 1760
diff changeset
307 return newintobject(-1L);
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
308 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
309
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
310 static object *
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
311 do_strip(args, striptype)
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
312 object *args;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
313 int striptype;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
314 {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
315 char *s;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
316 int len, i, j;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
317
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
318
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
319 if (!getargs(args, "s#", &s, &len))
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
320 return NULL;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
321
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
322 i = 0;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
323 if (striptype != RIGHTSTRIP) {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
324 while (i < len && isspace(Py_CHARMASK(s[i]))) {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
325 i++;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
326 }
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
327 }
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
328
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
329
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
330 j = len;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
331 if (striptype != LEFTSTRIP) {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
332 do {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
333 j--;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
334 } while (j >= i && isspace(Py_CHARMASK(s[j])));
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
335 j++;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
336 }
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
337
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
338 if (i == 0 && j == len) {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
339 INCREF(args);
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
340 return args;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
341 }
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
342 else
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
343 return newsizedstringobject(s+i, j-i);
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
344 }
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
345
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
346
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
347 static object *
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
348 strop_strip(self, args)
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
349 object *self; /* Not used */
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
350 object *args;
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
351 {
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
352 return do_strip(args, BOTHSTRIP);
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
353 }
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
354
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
355 static object *
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
356 strop_lstrip(self, args)
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
357 object *self; /* Not used */
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
358 object *args;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
359 {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
360 return do_strip(args, LEFTSTRIP);
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
361 }
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
362
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
363 static object *
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
364 strop_rstrip(self, args)
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
365 object *self; /* Not used */
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
366 object *args;
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
367 {
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
368 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
369 }
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
370
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
371
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
372 static object *
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
373 strop_lower(self, args)
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
374 object *self; /* Not used */
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
375 object *args;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
376 {
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
377 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
378 int i, n;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
379 object *new;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
380 int changed;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
381
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
382 if (!getargs(args, "s#", &s, &n))
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
383 return NULL;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
384 new = newsizedstringobject(NULL, n);
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
385 if (new == NULL)
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
386 return NULL;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
387 s_new = getstringvalue(new);
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
388 changed = 0;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
389 for (i = 0; i < n; i++) {
2310
07913fb8f92f use Py_CHARMASK
Guido van Rossum <guido@python.org>
parents: 2061
diff changeset
390 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
391 if (isupper(c)) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
392 changed = 1;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
393 *s_new = tolower(c);
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
394 } else
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
395 *s_new = c;
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
396 s_new++;
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
397 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
398 if (!changed) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
399 DECREF(new);
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
400 INCREF(args);
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
401 return args;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
402 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
403 return new;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
404 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
405
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
406
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
407 static object *
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
408 strop_upper(self, args)
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
409 object *self; /* Not used */
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
410 object *args;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
411 {
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
412 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
413 int i, n;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
414 object *new;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
415 int changed;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
416
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
417 if (!getargs(args, "s#", &s, &n))
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
418 return NULL;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
419 new = newsizedstringobject(NULL, n);
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
420 if (new == NULL)
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
421 return NULL;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
422 s_new = getstringvalue(new);
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
423 changed = 0;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
424 for (i = 0; i < n; i++) {
2310
07913fb8f92f use Py_CHARMASK
Guido van Rossum <guido@python.org>
parents: 2061
diff changeset
425 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
426 if (islower(c)) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
427 changed = 1;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
428 *s_new = toupper(c);
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
429 } else
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
430 *s_new = c;
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
431 s_new++;
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
432 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
433 if (!changed) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
434 DECREF(new);
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
435 INCREF(args);
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
436 return args;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
437 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
438 return new;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
439 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
440
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
441
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
442 static object *
3676
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
443 strop_capitalize(self, args)
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
444 object *self; /* Not used */
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
445 object *args;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
446 {
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
447 char *s, *s_new;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
448 int i, n;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
449 object *new;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
450 int changed;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
451
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
452 if (!getargs(args, "s#", &s, &n))
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
453 return NULL;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
454 new = newsizedstringobject(NULL, n);
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
455 if (new == NULL)
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
456 return NULL;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
457 s_new = getstringvalue(new);
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
458 changed = 0;
3679
b8980735d03b Test for zero-length argument in capitalize().
Guido van Rossum <guido@python.org>
parents: 3676
diff changeset
459 if (0 < n) {
3676
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
460 int c = Py_CHARMASK(*s++);
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
461 if (islower(c)) {
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
462 changed = 1;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
463 *s_new = toupper(c);
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
464 } else
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
465 *s_new = c;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
466 s_new++;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
467 }
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
468 for (i = 1; i < n; i++) {
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
469 int c = Py_CHARMASK(*s++);
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
470 if (isupper(c)) {
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
471 changed = 1;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
472 *s_new = tolower(c);
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
473 } else
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
474 *s_new = c;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
475 s_new++;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
476 }
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
477 if (!changed) {
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
478 DECREF(new);
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
479 INCREF(args);
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
480 return args;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
481 }
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
482 return new;
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
483 }
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
484
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
485
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
486 static object *
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
487 strop_swapcase(self, args)
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
488 object *self; /* Not used */
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
489 object *args;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
490 {
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
491 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
492 int i, n;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
493 object *new;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
494 int changed;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
495
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
496 if (!getargs(args, "s#", &s, &n))
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
497 return NULL;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
498 new = newsizedstringobject(NULL, n);
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
499 if (new == NULL)
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
500 return NULL;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
501 s_new = getstringvalue(new);
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
502 changed = 0;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
503 for (i = 0; i < n; i++) {
2310
07913fb8f92f use Py_CHARMASK
Guido van Rossum <guido@python.org>
parents: 2061
diff changeset
504 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
505 if (islower(c)) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
506 changed = 1;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
507 *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
508 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
509 else if (isupper(c)) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
510 changed = 1;
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
511 *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
512 }
1356
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
513 else
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
514 *s_new = c;
043da19302ef Several optimizations and speed improvements.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1337
diff changeset
515 s_new++;
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
516 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
517 if (!changed) {
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
518 DECREF(new);
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
519 INCREF(args);
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
520 return args;
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 return new;
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
523 }
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
524
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
525
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
526 static object *
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
527 strop_atoi(self, args)
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
528 object *self; /* Not used */
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
529 object *args;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
530 {
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
531 extern long mystrtol PROTO((const char *, char **, int));
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
532 extern unsigned long mystrtoul PROTO((const char *, char **, int));
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
533 char *s, *end;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
534 int base = 10;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
535 long x;
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
536 char buffer[256]; /* For errors */
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
537
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
538 if (args != NULL && is_tupleobject(args)) {
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
539 if (!getargs(args, "(si)", &s, &base))
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
540 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
541 if (base != 0 && base < 2 || base > 36) {
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
542 err_setstr(ValueError, "invalid base for atoi()");
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
543 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
544 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
545 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
546 else if (!getargs(args, "s", &s))
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
547 return NULL;
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
548 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
549 s++;
4094
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
550 if (s[0] == '\0') {
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
551 err_setstr(ValueError, "empty string for atoi()");
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
552 return NULL;
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
553 }
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
554 errno = 0;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
555 if (base == 0 && s[0] == '0')
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
556 x = (long) mystrtoul(s, &end, base);
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
557 else
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
558 x = mystrtol(s, &end, base);
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
559 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
560 end++;
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
561 if (*end != '\0') {
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
562 sprintf(buffer, "invalid literal for atoi(): %.200s", s);
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
563 err_setstr(ValueError, buffer);
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
564 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
565 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
566 else if (errno != 0) {
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
567 sprintf(buffer, "atoi() literal too large: %.200s", s);
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
568 err_setstr(ValueError, buffer);
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
569 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
570 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
571 return newintobject(x);
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
572 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
573
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
574
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
575 static object *
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
576 strop_atol(self, args)
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
577 object *self; /* Not used */
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
578 object *args;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
579 {
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
580 char *s, *end;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
581 int base = 10;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
582 object *x;
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
583 char buffer[256]; /* For errors */
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
584
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
585 if (args != NULL && is_tupleobject(args)) {
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
586 if (!getargs(args, "(si)", &s, &base))
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
587 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
588 if (base != 0 && base < 2 || base > 36) {
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
589 err_setstr(ValueError, "invalid base for atol()");
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
590 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
591 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
592 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
593 else if (!getargs(args, "s", &s))
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
594 return NULL;
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
595 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
596 s++;
4094
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
597 if (s[0] == '\0') {
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
598 err_setstr(ValueError, "empty string for atol()");
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
599 return NULL;
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
600 }
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
601 x = long_escan(s, &end, base);
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
602 if (x == NULL)
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
603 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
604 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
605 end++;
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
606 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
607 end++;
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
608 if (*end != '\0') {
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
609 sprintf(buffer, "invalid literal for atol(): %.200s", s);
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
610 err_setstr(ValueError, buffer);
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
611 DECREF(x);
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
612 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
613 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
614 return x;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
615 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
616
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
617
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
618 static object *
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
619 strop_atof(self, args)
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
620 object *self; /* Not used */
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
621 object *args;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
622 {
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
623 extern double strtod PROTO((const char *, char **));
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
624 char *s, *end;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
625 double x;
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
626 char buffer[256]; /* For errors */
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
627
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
628 if (!getargs(args, "s", &s))
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
629 return NULL;
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
630 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
631 s++;
4094
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
632 if (s[0] == '\0') {
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
633 err_setstr(ValueError, "empty string for atof()");
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
634 return NULL;
8438184e448e Raise ValueError on empty string passed into atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4035
diff changeset
635 }
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
636 errno = 0;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
637 x = strtod(s, &end);
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
638 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
639 end++;
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
640 if (*end != '\0') {
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
641 sprintf(buffer, "invalid literal for atof(): %.200s", s);
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
642 err_setstr(ValueError, buffer);
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
643 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
644 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
645 else if (errno != 0) {
4296
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
646 sprintf(buffer, "atof() literal too large: %.200s", s);
75d75732a9e4 Add text of argument to errors for atoi(), atol(), atof().
Guido van Rossum <guido@python.org>
parents: 4094
diff changeset
647 err_setstr(ValueError, buffer);
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
648 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
649 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
650 return newfloatobject(x);
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
651 }
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
652
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
653
3799
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
654 static PyObject *
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
655 strop_maketrans(self, args)
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
656 PyObject *self; /* Not used */
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
657 PyObject *args;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
658 {
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
659 unsigned char c[256], *from=NULL, *to=NULL;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
660 int i, fromlen=0, tolen=0;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
661
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
662 if (PyTuple_Size(args)!=0) {
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
663 if (!PyArg_ParseTuple(args, "s#s#", &from, &fromlen,
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
664 &to, &tolen))
3799
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
665 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
666 }
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
667
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
668 if (fromlen!=tolen) {
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
669 PyErr_SetString(ValueError,
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
670 "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
671 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
672 }
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
673 for(i=0; i<256; i++)
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
674 c[i]=(unsigned char)i;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
675 for(i=0; i<fromlen; i++) {
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
676 c[from[i]]=to[i];
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
677 }
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
678 return PyString_FromStringAndSize((char *)c, 256);
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
679 }
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
680
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
681
3087
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
682 static object *
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
683 strop_translate(self, args)
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
684 object *self;
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
685 object *args;
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
686 {
3799
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
687 char *input, *table, *output, *output_start, *delete=NULL;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
688 int inlen, tablen, dellen;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
689 PyObject *result;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
690 int i, trans_table[256];
3087
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
691
3799
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
692 if (!PyArg_ParseTuple(args, "s#s#|s#", &input, &inlen,
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
693 &table, &tablen, &delete, &dellen))
3087
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
694 return NULL;
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
695 if (tablen != 256) {
3799
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
696 PyErr_SetString(ValueError,
3087
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
697 "translation table must be 256 characters long");
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
698 return NULL;
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
699 }
3799
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
700 for(i=0; i<256; i++)
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
701 trans_table[i]=Py_CHARMASK(table[i]);
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
702 if (delete!=NULL) {
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
703 for(i=0; i<dellen; i++)
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
704 trans_table[delete[i]]=-1;
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
705 }
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
706
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
707 result = PyString_FromStringAndSize((char *)NULL, inlen);
3087
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
708 if (result == NULL)
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
709 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
710 output_start = output = PyString_AsString(result);
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
711 if (delete!=NULL && 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
712 for (i = 0; i < inlen; i++) {
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
713 int c = Py_CHARMASK(*input++);
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
714 if (trans_table[c]!=-1)
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
715 *output++ = (char)trans_table[c];
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
716 }
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
717 /* Fix the size of the resulting string */
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
718 if (inlen > 0 &&_PyString_Resize(&result, output-output_start))
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
719 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
720 } else {
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
721 /* If no deletions are required, use a faster loop */
3799
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
722 for (i = 0; i < inlen; i++) {
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
723 int c = Py_CHARMASK(*input++);
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
724 *output++ = (char)trans_table[c];
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
725 }
3087
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
726 }
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
727 return result;
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
728 }
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
729
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
730
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
731 /* 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
732
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
733 static struct methodlist strop_methods[] = {
1746
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
734 {"atof", strop_atof},
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
735 {"atoi", strop_atoi},
1940892d2fe3 Merge alpha100 branch back to main trunk
Guido van Rossum <guido@python.org>
parents: 1394
diff changeset
736 {"atol", strop_atol},
3676
74764b3ec1bd added capitalize()
Guido van Rossum <guido@python.org>
parents: 3087
diff changeset
737 {"capitalize", strop_capitalize},
1787
cb84dd51c2aa * Modules/stropmodule.c: implement find/rfind instead of
Guido van Rossum <guido@python.org>
parents: 1760
diff changeset
738 {"find", strop_find},
2707
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
739 {"join", strop_joinfields, 1},
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
740 {"joinfields", strop_joinfields, 1},
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
741 {"lstrip", strop_lstrip},
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
742 {"lower", strop_lower},
1787
cb84dd51c2aa * Modules/stropmodule.c: implement find/rfind instead of
Guido van Rossum <guido@python.org>
parents: 1760
diff changeset
743 {"rfind", strop_rfind},
3978
b93c4cfc2cfe Added lstrip() and rstrip().
Guido van Rossum <guido@python.org>
parents: 3799
diff changeset
744 {"rstrip", strop_rstrip},
2707
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
745 {"split", strop_splitfields, 1},
1306e761a623 unified join(fields), split(fields)
Guido van Rossum <guido@python.org>
parents: 2335
diff changeset
746 {"splitfields", strop_splitfields, 1},
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
747 {"strip", strop_strip},
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
748 {"swapcase", strop_swapcase},
3799
2f27501db3c3 Added 3rd optional argument to translate(), a string of characters to delete.
Guido van Rossum <guido@python.org>
parents: 3679
diff changeset
749 {"maketrans", strop_maketrans, 1},
3087
31684c5bb172 added strop.translate(s, table)
Guido van Rossum <guido@python.org>
parents: 2707
diff changeset
750 {"translate", strop_translate, 1},
1048
c1ebfde341a3 Makefile uses $> more often; cgen supports filename argument; added
Guido van Rossum <guido@python.org>
parents: 1012
diff changeset
751 {"upper", strop_upper},
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
752 {NULL, NULL} /* sentinel */
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
753 };
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
754
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
755
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
756 void
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
757 initstrop()
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
758 {
1321
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add
Guido van Rossum <guido@python.org>
parents: 1257
diff changeset
759 object *m, *d, *s;
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add
Guido van Rossum <guido@python.org>
parents: 1257
diff changeset
760 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
761 int c, n;
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add
Guido van Rossum <guido@python.org>
parents: 1257
diff changeset
762 m = initmodule("strop", strop_methods);
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add
Guido van Rossum <guido@python.org>
parents: 1257
diff changeset
763 d = getmoduledict(m);
1322
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
764
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
765 /* 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
766 n = 0;
2310
07913fb8f92f use Py_CHARMASK
Guido van Rossum <guido@python.org>
parents: 2061
diff changeset
767 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
768 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
769 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
770 }
1337
f8f64cbd9fb5 Bug fix: check whether call succeeded *after* the call.
Sjoerd Mullender <sjoerd@acm.org>
parents: 1322
diff changeset
771 s = newsizedstringobject(buf, n);
1322
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
772 if (s) {
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
773 dictinsert(d, "whitespace", s);
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
774 DECREF(s);
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
775 }
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
776 /* Create 'lowercase' object */
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
777 n = 0;
2310
07913fb8f92f use Py_CHARMASK
Guido van Rossum <guido@python.org>
parents: 2061
diff changeset
778 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
779 if (islower(c))
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
780 buf[n++] = c;
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
781 }
1321
a80677798f84 stropmodule.c: use C isspace(c) to test for whitespace; add
Guido van Rossum <guido@python.org>
parents: 1257
diff changeset
782 s = newsizedstringobject(buf, n);
1322
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
783 if (s) {
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
784 dictinsert(d, "lowercase", s);
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
785 DECREF(s);
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
786 }
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
787
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
788 /* Create 'uppercase' object */
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
789 n = 0;
2310
07913fb8f92f use Py_CHARMASK
Guido van Rossum <guido@python.org>
parents: 2061
diff changeset
790 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
791 if (isupper(c))
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
792 buf[n++] = c;
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
793 }
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
794 s = newsizedstringobject(buf, n);
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
795 if (s) {
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
796 dictinsert(d, "uppercase", s);
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
797 DECREF(s);
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
798 }
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
799
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
800 if (err_occurred())
f3c907efe5d7 * config.c: different default PYTHONPATH for MS-DOS
Guido van Rossum <guido@python.org>
parents: 1321
diff changeset
801 fatal("can't initialize module strop");
1012
806689b93558 Re-implement some operations from string.py in C, for speed.
Guido van Rossum <guido@python.org>
parents:
diff changeset
802 }