mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

[3.11] gh-101400: Fix incorrect lineno in exception message on contin… (gh-101447)

Browse source
This commit is contained in:
Dong-hee Na 2023-01-31 23:53:14 +09:00 • committed by GitHub
parent 43af2dbb54
commit 0c37ea9aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/test/test_syntax.py
View file

@ -1907,9 +1907,6 @@ class SyntaxTestCase(unittest.TestCase):
"""
self._check_error(source, "parameter and nonlocal", lineno=3)
def test_break_outside_loop(self):
self._check_error("break", "outside loop")
def test_yield_outside_function(self):
self._check_error("if 0: yield", "outside function")
self._check_error("if 0: yield\nelse: x=1", "outside function")
@ -1938,20 +1935,27 @@ class SyntaxTestCase(unittest.TestCase):
"outside function")
def test_break_outside_loop(self):
self._check_error("if 0: break", "outside loop")
self._check_error("if 0: break\nelse: x=1", "outside loop")
self._check_error("if 1: pass\nelse: break", "outside loop")
self._check_error("class C:\n if 0: break", "outside loop")
msg = "outside loop"
self._check_error("break", msg, lineno=1)
self._check_error("if 0: break", msg, lineno=1)
self._check_error("if 0: break\nelse: x=1", msg, lineno=1)
self._check_error("if 1: pass\nelse: break", msg, lineno=2)
self._check_error("class C:\n if 0: break", msg, lineno=2)
self._check_error("class C:\n if 1: pass\n else: break",
"outside loop")
msg, lineno=3)
self._check_error("with object() as obj:\n break",
msg, lineno=2)
def test_continue_outside_loop(self):
self._check_error("if 0: continue", "not properly in loop")
self._check_error("if 0: continue\nelse: x=1", "not properly in loop")
self._check_error("if 1: pass\nelse: continue", "not properly in loop")
self._check_error("class C:\n if 0: continue", "not properly in loop")
msg = "not properly in loop"
self._check_error("if 0: continue", msg, lineno=1)
self._check_error("if 0: continue\nelse: x=1", msg, lineno=1)
self._check_error("if 1: pass\nelse: continue", msg, lineno=2)
self._check_error("class C:\n if 0: continue", msg, lineno=2)
self._check_error("class C:\n if 1: pass\n else: continue",
"not properly in loop")
msg, lineno=3)
self._check_error("with object() as obj:\n continue",
msg, lineno=2)
def test_unexpected_indent(self):
self._check_error("foo()\n bar()\n", "unexpected indent",

2
Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst Normal file
View file

@ -0,0 +1,2 @@
Fix wrong lineno in exception message on :keyword:`continue` or
:keyword:`break` which are not in a loop. Patch by Dong-hee Na.

16
Python/compile.c
View file

@ -3259,12 +3259,20 @@ static int
compiler_break(struct compiler *c)
{
struct fblockinfo *loop = NULL;
int u_lineno = c->u->u_lineno;
int u_col_offset = c->u->u_col_offset;
int u_end_lineno = c->u->u_end_lineno;
int u_end_col_offset = c->u->u_end_col_offset;
/* Emit instruction with line number */
ADDOP(c, NOP);
if (!compiler_unwind_fblock_stack(c, 0, &loop)) {
return 0;
}
if (loop == NULL) {
c->u->u_lineno = u_lineno;
c->u->u_col_offset = u_col_offset;
c->u->u_end_lineno = u_end_lineno;
c->u->u_end_col_offset = u_end_col_offset;
return compiler_error(c, "'break' outside loop");
}
if (!compiler_unwind_fblock(c, loop, 0)) {
@ -3278,12 +3286,20 @@ static int
compiler_continue(struct compiler *c)
{
struct fblockinfo *loop = NULL;
int u_lineno = c->u->u_lineno;
int u_col_offset = c->u->u_col_offset;
int u_end_lineno = c->u->u_end_lineno;
int u_end_col_offset = c->u->u_end_col_offset;
/* Emit instruction with line number */
ADDOP(c, NOP);
if (!compiler_unwind_fblock_stack(c, 0, &loop)) {
return 0;
}
if (loop == NULL) {
c->u->u_lineno = u_lineno;
c->u->u_col_offset = u_col_offset;
c->u->u_end_lineno = u_end_lineno;
c->u->u_end_col_offset = u_end_col_offset;
return compiler_error(c, "'continue' not properly in loop");
}
ADDOP_JUMP(c, JUMP, loop->fb_block);