Add tests for r84209 (crashes in the Ast builder)

Also remove one tab, and move a check closer to the possible failure.

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index be2a0a28e9c7c7290aa8e673dae763e0fecf2b14..7117ef3d8d76560088b3b43a6023c1af6e370ee3 100644 (file)
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -484,6 +484,34 @@ SyntaxError: can't delete ()
 Traceback (most recent call last):
 SyntaxError: can't assign to literal
 
+Corner-cases that used to fail to raise the correct error:
+
+    >>> def f(*, x=lambda __debug__:0): pass
+    Traceback (most recent call last):
+    SyntaxError: assignment to keyword
+
+    >>> def f(*args:(lambda __debug__:0)): pass
+    Traceback (most recent call last):
+    SyntaxError: assignment to keyword
+
+    >>> def f(**kwargs:(lambda __debug__:0)): pass
+    Traceback (most recent call last):
+    SyntaxError: assignment to keyword
+
+    >>> with (lambda *:0): pass
+    Traceback (most recent call last):
+    SyntaxError: named arguments must follow bare *
+
+Corner-cases that used to crash:
+
+    >>> def f(**__debug__): pass
+    Traceback (most recent call last):
+    SyntaxError: assignment to keyword
+
+    >>> def f(*xx, __debug__): pass
+    Traceback (most recent call last):
+    SyntaxError: assignment to keyword
+
 """
 
 import re

diff --git a/Python/ast.c b/Python/ast.c
index 6ea830b8aff009c341de5b90044322c09500a5cc..9f6b7eaa8a28c2a0105076099c902e7665d163b1 100644 (file)
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -689,7 +689,7 @@ handle_keywordonly_args(struct compiling *c, const node *n, int start,
                 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 @@ ast_for_arguments(struct compiling *c, const node *n)
                 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;