diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-05-07 11:01:27 (GMT) |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-05-07 11:01:27 (GMT) |
| commit | cf360b92099d3ebcd31f637e45df501f393ff0b0 (patch) | |
| tree | 5d4d5de0c1669e26852f7ab73590438414892820 | |
| parent | 640335c61f8939a98667203aee8c0123da47b55d (diff) | |
| download | cpython-cf360b92099d3ebcd31f637e45df501f393ff0b0.zip cpython-cf360b92099d3ebcd31f637e45df501f393ff0b0.tar.gz cpython-cf360b92099d3ebcd31f637e45df501f393ff0b0.tar.bz2 | |
Issue #14701: Add missing support for 'raise ... from' in parser module.
| -rw-r--r-- | Lib/test/test_parser.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/parsermodule.c | 23 |
3 files changed, 21 insertions, 12 deletions
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py index f6105fc..edd1a09 100644 --- a/Lib/test/test_parser.py +++ b/Lib/test/test_parser.py @@ -297,6 +297,14 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase): self.check_suite("[*a, *b] = y") self.check_suite("for [*x, b] in x: pass") + def test_raise_statement(self): + self.check_suite("raise\n") + self.check_suite("raise e\n") + self.check_suite("try:\n" + " suite\n" + "except Exception as e:\n" + " raise ValueError from e\n") + # # Second, we take *invalid* trees and make sure we get ParserError @@ -61,6 +61,8 @@ Core and Builtins Library ------- +- Issue #14701: Fix missing support for 'raise ... from' in parser module. + - Issue #13183: Fix pdb skipping frames after hitting a breakpoint and running step. Patch by Xavier de Gaye. diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 99e476d..89ad978 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -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); } |