diff options
| author | Georg Brandl <georg@python.org> | 2009-05-25 21:02:56 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-05-25 21:02:56 +0000 |
| commit | 6e42e254b0c2a567b0099fc1f1446ee4a898dc0f (patch) | |
| tree | ae8d17822eb5722f03ecf6379dc16a07c3cf2415 /Modules/parsermodule.c | |
| parent | 4e1bc96a1042b37c54a7525555d11c1c32daa3a9 (diff) | |
| download | cpython-6e42e254b0c2a567b0099fc1f1446ee4a898dc0f.tar.gz | |
Allow multiple context managers in one with statement, as proposed
in http://codereview.appspot.com/53094 and accepted by Guido.
The construct is transformed into multiple With AST nodes so that
there should be no problems with the semantics.
Diffstat (limited to 'Modules/parsermodule.c')
| -rw-r--r-- | Modules/parsermodule.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index a4a641662f..42989b7b8e 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -2618,36 +2618,39 @@ validate_decorators(node *tree) return ok; } -/* with_var -with_var: 'as' expr +/* with_item: + * test ['as' expr] */ static int -validate_with_var(node *tree) +validate_with_item(node *tree) { int nch = NCH(tree); - int ok = (validate_ntype(tree, with_var) - && (nch == 2) - && validate_name(CHILD(tree, 0), "as") - && validate_expr(CHILD(tree, 1))); - return ok; + int ok = (validate_ntype(tree, with_item) + && (nch == 1 || nch == 3) + && validate_test(CHILD(tree, 0))); + if (ok && nch == 3) + ok = (validate_name(CHILD(tree, 1), "as") + && validate_expr(CHILD(tree, 2))); + return ok; } -/* with_stmt - * 0 1 2 -2 -1 -with_stmt: 'with' test [ with_var ] ':' suite +/* with_stmt: + * 0 1 ... -2 -1 + * 'with' with_item (',' with_item)* ':' suite */ static int validate_with_stmt(node *tree) { + int i; int nch = NCH(tree); int ok = (validate_ntype(tree, with_stmt) - && ((nch == 4) || (nch == 5)) + && (nch % 2 == 0) && validate_name(CHILD(tree, 0), "with") - && validate_test(CHILD(tree, 1)) - && (nch == 4 || validate_with_var(CHILD(tree, 2))) && validate_colon(RCHILD(tree, -2)) && validate_suite(RCHILD(tree, -1))); - return ok; + for (i = 1; ok && i < nch - 2; i += 2) + ok = validate_with_item(CHILD(tree, i)); + return ok; } /* funcdef: |