mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #14701: Add missing support for 'raise ... from' in parser module.

Browse source
This commit is contained in:
Mark Dickinson 2012-05-07 12:01:27 +01:00
parent 640335c61f
commit cf360b9209
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modules/parsermodule.c
View file

@ -1608,31 +1608,30 @@ validate_return_stmt(node *tree)
}
/*
* raise_stmt:
*
* 'raise' [test ['from' test]]
*/
static int
validate_raise_stmt(node *tree)
{
int nch = NCH(tree);
int res = (validate_ntype(tree, raise_stmt)
&& ((nch == 1) || (nch == 2) || (nch == 4) || (nch == 6)));
&& ((nch == 1) || (nch == 2) || (nch == 4)));
if (!res && !PyErr_Occurred())
(void) validate_numnodes(tree, 2, "raise");
if (res) {
res = validate_name(CHILD(tree, 0), "raise");
if (res && (nch >= 2))
res = validate_test(CHILD(tree, 1));
if (res && nch > 2) {
res = (validate_comma(CHILD(tree, 2))
if (res && (nch == 4)) {
res = (validate_name(CHILD(tree, 2), "from")
&& validate_test(CHILD(tree, 3)));
if (res && (nch > 4))
res = (validate_comma(CHILD(tree, 4))
&& validate_test(CHILD(tree, 5)));
}
}
else
(void) validate_numnodes(tree, 2, "raise");
if (res && (nch == 4))
res = (validate_comma(CHILD(tree, 2))
&& validate_test(CHILD(tree, 3)));
return (res);
}