Merged revisions 55328-55341 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines
Implement the removal of tuple parameter unpacking (PEP 3113).
Thanks, Tony Lownds for the patch.
........
r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line
Update to use Python 3.0
........
r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines
Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch.
........
r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line
Fix exception printing (no more exceptions module)
........
r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line
Remove popen* functions from os
........
r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line
Get rid of most of popen. There are still some uses I need to cleanup.
........
r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line
Remove a few more remnants of the compiler package
........
r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line
Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long)
........
diff --git a/Python/compile.c b/Python/compile.c
index 1ddec2c..fb8fb52 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1283,54 +1283,6 @@
}
static int
-compiler_unpack_nested(struct compiler *c, asdl_seq *args) {
- int i, len;
- len = asdl_seq_LEN(args);
- ADDOP_I(c, UNPACK_SEQUENCE, len);
- for (i = 0; i < len; i++) {
- arg_ty elt = (arg_ty)asdl_seq_GET(args, i);
- switch (elt->kind) {
- case SimpleArg_kind:
- if (!compiler_nameop(c, elt->v.SimpleArg.arg, Store))
- return 0;
- break;
- case NestedArgs_kind:
- if (!compiler_unpack_nested(c, elt->v.NestedArgs.args))
- return 0;
- break;
- default:
- return 0;
- }
- }
- return 1;
-}
-
-static int
-compiler_arguments(struct compiler *c, arguments_ty args)
-{
- int i;
- int n = asdl_seq_LEN(args->args);
-
- for (i = 0; i < n; i++) {
- arg_ty arg = (arg_ty)asdl_seq_GET(args->args, i);
- if (arg->kind == NestedArgs_kind) {
- PyObject *id = PyString_FromFormat(".%d", i);
- if (id == NULL) {
- return 0;
- }
- if (!compiler_nameop(c, id, Load)) {
- Py_DECREF(id);
- return 0;
- }
- Py_DECREF(id);
- if (!compiler_unpack_nested(c, arg->v.NestedArgs.args))
- return 0;
- }
- }
- return 1;
-}
-
-static int
compiler_visit_kwonlydefaults(struct compiler *c, asdl_seq *kwonlyargs,
asdl_seq *kw_defaults)
{
@@ -1339,7 +1291,7 @@
arg_ty arg = asdl_seq_GET(kwonlyargs, i);
expr_ty default_ = asdl_seq_GET(kw_defaults, i);
if (default_) {
- ADDOP_O(c, LOAD_CONST, arg->v.SimpleArg.arg, consts);
+ ADDOP_O(c, LOAD_CONST, arg->arg, consts);
if (!compiler_visit_expr(c, default_)) {
return -1;
}
@@ -1368,17 +1320,11 @@
int i, error;
for (i = 0; i < asdl_seq_LEN(args); i++) {
arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
- if (arg->kind == NestedArgs_kind)
- error = compiler_visit_argannotations(
- c,
- arg->v.NestedArgs.args,
- names);
- else
- error = compiler_visit_argannotation(
- c,
- arg->v.SimpleArg.arg,
- arg->v.SimpleArg.annotation,
- names);
+ error = compiler_visit_argannotation(
+ c,
+ arg->arg,
+ arg->annotation,
+ names);
if (error)
return error;
}
@@ -1498,9 +1444,6 @@
return 0;
}
- /* unpack nested arguments */
- compiler_arguments(c, args);
-
c->u->u_argcount = asdl_seq_LEN(args->args);
c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
n = asdl_seq_LEN(s->v.FunctionDef.body);
@@ -1690,9 +1633,6 @@
if (!compiler_enter_scope(c, name, (void *)e, e->lineno))
return 0;
- /* unpack nested arguments */
- compiler_arguments(c, args);
-
c->u->u_argcount = asdl_seq_LEN(args->args);
c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
VISIT_IN_SCOPE(c, expr, e->v.Lambda.body);