Issue #9128: Validate class decorator syntax correctly in parser module.

This commit is contained in:
Mark Dickinson 2010-07-04 16:23:54 +00:00
parent 96c4df4532
commit a7ee59b3d3
3 changed files with 18 additions and 8 deletions

View file

@ -2682,14 +2682,15 @@ validate_funcdef(node *tree)
static int
validate_decorated(node *tree)
{
int nch = NCH(tree);
int ok = (validate_ntype(tree, decorated)
&& (nch == 2)
&& validate_decorators(RCHILD(tree, -2))
&& (validate_funcdef(RCHILD(tree, -1))
|| validate_class(RCHILD(tree, -1)))
);
return ok;
int nch = NCH(tree);
int ok = (validate_ntype(tree, decorated)
&& (nch == 2)
&& validate_decorators(RCHILD(tree, -2)));
if (TYPE(RCHILD(tree, -1)) == funcdef)
ok = ok && validate_funcdef(RCHILD(tree, -1));
else
ok = ok && validate_class(RCHILD(tree, -1));
return ok;
}
static int