Kaydet (Commit) 6c4fa70d authored tarafından Benjamin Peterson's avatar Benjamin Peterson

make too many nested blocks be a SyntaxError instead of a SystemError (closes #27514)

Patch by Ammar Askar.
üst 65e0d8ca
...@@ -371,7 +371,9 @@ isn't, there should be a syntax error. ...@@ -371,7 +371,9 @@ isn't, there should be a syntax error.
File "<doctest test.test_syntax[42]>", line 3 File "<doctest test.test_syntax[42]>", line 3
SyntaxError: 'break' outside loop SyntaxError: 'break' outside loop
This should probably raise a better error than a SystemError (or none at all). This raises a SyntaxError, it used to raise a SystemError.
Context for this change can be found on issue #27514
In 2.5 there was a missing exception and an assert was triggered in a debug In 2.5 there was a missing exception and an assert was triggered in a debug
build. The number of blocks must be greater than CO_MAXBLOCKS. SF #1565514 build. The number of blocks must be greater than CO_MAXBLOCKS. SF #1565514
...@@ -399,7 +401,7 @@ build. The number of blocks must be greater than CO_MAXBLOCKS. SF #1565514 ...@@ -399,7 +401,7 @@ build. The number of blocks must be greater than CO_MAXBLOCKS. SF #1565514
... break ... break
Traceback (most recent call last): Traceback (most recent call last):
... ...
SystemError: too many statically nested blocks SyntaxError: too many statically nested blocks
This tests assignment-context; there was a bug in Python 2.5 where compiling This tests assignment-context; there was a bug in Python 2.5 where compiling
a complex 'if' (one with 'elif') would fail to notice an invalid suite, a complex 'if' (one with 'elif') would fail to notice an invalid suite,
......
...@@ -17,6 +17,9 @@ Core and Builtins ...@@ -17,6 +17,9 @@ Core and Builtins
unicode paths with embedded null character on Windows instead of silently unicode paths with embedded null character on Windows instead of silently
truncating them. truncating them.
- Issue #27514: Make having too many statically nested blocks a SyntaxError
instead of SystemError.
Library Library
------- -------
......
...@@ -3147,7 +3147,7 @@ compiler_push_fblock(struct compiler *c, enum fblocktype t, basicblock *b) ...@@ -3147,7 +3147,7 @@ compiler_push_fblock(struct compiler *c, enum fblocktype t, basicblock *b)
{ {
struct fblockinfo *f; struct fblockinfo *f;
if (c->u->u_nfblocks >= CO_MAXBLOCKS) { if (c->u->u_nfblocks >= CO_MAXBLOCKS) {
PyErr_SetString(PyExc_SystemError, PyErr_SetString(PyExc_SyntaxError,
"too many statically nested blocks"); "too many statically nested blocks");
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment