Mercurial > cpython-lru_cache-weakref

diff Python/ast.c @ 64184:c18eeb969102

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add tests for r84209 (crashes in the Ast builder) Also remove one tab, and move a check closer to the possible failure.
author Amaury Forgeot d'Arc <amauryfa@gmail.com>
date Thu, 19 Aug 2010 21:32:38 +0000
parents 5fd26f452600
children 861c35cef7aa
line wrap: on
line diff
--- a/Python/ast.c	Thu Aug 19 19:17:41 2010 +0000
+++ b/Python/ast.c	Thu Aug 19 21:32:38 2010 +0000
@@ -689,7 +689,7 @@
                 if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
                     expression = ast_for_expr(c, CHILD(n, i + 2));
                     if (!expression)
-		      goto error;
+                        goto error;
                     asdl_seq_SET(kwdefaults, j, expression);
                     i += 2; /* '=' and test */
                 }
@@ -892,14 +892,14 @@
                 ch = CHILD(n, i+1);  /* tfpdef */
                 assert(TYPE(ch) == tfpdef || TYPE(ch) == vfpdef);
                 kwarg = NEW_IDENTIFIER(CHILD(ch, 0));
+                if (!kwarg)
+                    return NULL;
                 if (NCH(ch) > 1) {
                     /* there is an annotation on the kwarg */
                     kwargannotation = ast_for_expr(c, CHILD(ch, 2));
                     if (!kwargannotation)
                         return NULL;
                 }
-                if (!kwarg)
-                    return NULL;
                 if (forbidden_name(kwarg, CHILD(ch, 0), 0))
                     return NULL;
                 i += 3;