summaryrefslogtreecommitdiffstats
path: root/Python/bltinmodule.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-07-10 13:52:21 (GMT)
committerGuido van Rossum <guido@python.org>1995-07-10 13:52:21 (GMT)
commit32120311ed8f167f841249d8fd7799ba517f2a44 (patch)
tree81c8441cc34f5cc78db9bd52c57a63d669bdd674 /Python/bltinmodule.c
parent9f02331d807e09dbef6192f28895c49283a01fef (diff)
downloadcpython-32120311ed8f167f841249d8fd7799ba517f2a44.zip
cpython-32120311ed8f167f841249d8fd7799ba517f2a44.tar.gz
cpython-32120311ed8f167f841249d8fd7799ba517f2a44.tar.bz2
rename arglist to alist (conflict with new grammar symbol)
Diffstat (limited to 'Python/bltinmodule.c')
-rw-r--r--Python/bltinmodule.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 7a55b51..5103622 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -80,15 +80,15 @@ builtin_apply(self, args)
object *self;
object *args;
{
- object *func, *arglist;
+ object *func, *alist;
- if (!newgetargs(args, "OO:apply", &func, &arglist))
+ if (!newgetargs(args, "OO:apply", &func, &alist))
return NULL;
- if (!is_tupleobject(arglist)) {
+ if (!is_tupleobject(alist)) {
err_setstr(TypeError, "apply() 2nd argument must be tuple");
return NULL;
}
- return call_object(func, arglist);
+ return call_object(func, alist);
}
static object *
@@ -566,13 +566,13 @@ builtin_map(self, args)
/* XXX Special case map(None, single_list) could be more efficient */
for (i = 0; ; ++i) {
- object *arglist, *item, *value;
+ object *alist, *item, *value;
int any = 0;
if (func == None && n == 1)
- arglist = NULL;
+ alist = NULL;
else {
- if ((arglist = newtupleobject(n)) == NULL)
+ if ((alist = newtupleobject(n)) == NULL)
goto Fail_1;
}
@@ -600,32 +600,32 @@ builtin_map(self, args)
any = 1;
}
- if (!arglist)
+ if (!alist)
break;
- if (settupleitem(arglist, j, item) < 0) {
+ if (settupleitem(alist, j, item) < 0) {
DECREF(item);
goto Fail_0;
}
continue;
Fail_0:
- XDECREF(arglist);
+ XDECREF(alist);
goto Fail_1;
}
- if (!arglist)
- arglist = item;
+ if (!alist)
+ alist = item;
if (!any) {
- DECREF(arglist);
+ DECREF(alist);
break;
}
if (func == None)
- value = arglist;
+ value = alist;
else {
- value = call_object(func, arglist);
- DECREF(arglist);
+ value = call_object(func, alist);
+ DECREF(alist);
if (value == NULL)
goto Fail_1;
}