mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

* config.c: Added audioop to lists.

Browse source 
* Makefile: change default source directory
* socketmodule.c: added getsockname and getpeername
* bltinmodule.c: corrected typo in type() error message
* Added new built-in functions str() and repr(): repr(x) == `x`;
  str(x) == x if x is a string, otherwise str(x) == repr(x).
* Added joinfields to stropmodule.c (string.join calls joinfields now)
This commit is contained in:
Guido van Rossum 1992-11-26 08:54:07 +00:00
parent df9320f8bc
commit c89705d697
4 changed files with 152 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Modules/stropmodule.c
View file

@ -112,6 +112,70 @@ strop_splitfields(self, args)
}
static object *
strop_joinfields(self, args)
object *self; /* Not used */
object *args;
{
object *seq, *item, *res;
object * (*getitem) FPROTO((object *, int));
char *sep, *p;
int seplen, seqlen, reslen, itemlen, i;
if (!getargs(args, "(Os#)", &seq, &sep, &seplen))
return NULL;
if (is_listobject(seq)) {
getitem = getlistitem;
seqlen = getlistsize(seq);
}
else if (is_tupleobject(seq)) {
getitem = gettupleitem;
seqlen = gettuplesize(seq);
}
else {
err_setstr(TypeError, "first argument must be list/tuple");
return NULL;
}
reslen = 0;
for (i = 0; i < seqlen; i++) {
item = getitem(seq, i);
if (!is_stringobject(item)) {
err_setstr(TypeError,
"first argument must be list/tuple of strings");
return NULL;
}
if (i > 0)
reslen = reslen + seplen;
reslen = reslen + getstringsize(item);
}
if (seqlen == 1) {
/* Optimization if there's only one item */
item = getitem(seq, 0);
INCREF(item);
return item;
}
res = newsizedstringobject((char *)NULL, reslen);
if (res == NULL)
return NULL;
p = getstringvalue(res);
for (i = 0; i < seqlen; i++) {
item = getitem(seq, i);
if (i > 0) {
memcpy(p, sep, seplen);
p += seplen;
}
itemlen = getstringsize(item);
memcpy(p, getstringvalue(item), itemlen);
p += itemlen;
}
if (p != getstringvalue(res) + reslen) {
err_setstr(SystemError, "strop.joinfields: assertion failed");
return NULL;
}
return res;
}
static object *
strop_index(self, args)
object *self; /* Not used */
@ -290,6 +354,7 @@ strop_swapcase(self, args)
static struct methodlist strop_methods[] = {
{"index", strop_index},
{"joinfields", strop_joinfields},
{"lower", strop_lower},
{"split", strop_split},
{"splitfields", strop_splitfields},