summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_syntax.py30
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst2
-rw-r--r--Python/compile.c6
3 files changed, 23 insertions, 15 deletions
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index cb284195..f236535 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -1957,9 +1957,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")
@@ -1988,20 +1985,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",
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst b/Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst
new file mode 100644
index 0000000..f3dd783
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-01-30-08-59-47.gh-issue-101400.Di_ZFm.rst
@@ -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.
diff --git a/Python/compile.c b/Python/compile.c
index c31f08c..70d05af 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3246,11 +3246,12 @@ static int
compiler_break(struct compiler *c, location loc)
{
struct fblockinfo *loop = NULL;
+ location origin_loc = loc;
/* Emit instruction with line number */
ADDOP(c, loc, NOP);
RETURN_IF_ERROR(compiler_unwind_fblock_stack(c, &loc, 0, &loop));
if (loop == NULL) {
- return compiler_error(c, loc, "'break' outside loop");
+ return compiler_error(c, origin_loc, "'break' outside loop");
}
RETURN_IF_ERROR(compiler_unwind_fblock(c, &loc, loop, 0));
ADDOP_JUMP(c, loc, JUMP, loop->fb_exit);
@@ -3261,11 +3262,12 @@ static int
compiler_continue(struct compiler *c, location loc)
{
struct fblockinfo *loop = NULL;
+ location origin_loc = loc;
/* Emit instruction with line number */
ADDOP(c, loc, NOP);
RETURN_IF_ERROR(compiler_unwind_fblock_stack(c, &loc, 0, &loop));
if (loop == NULL) {
- return compiler_error(c, loc, "'continue' not properly in loop");
+ return compiler_error(c, origin_loc, "'continue' not properly in loop");
}
ADDOP_JUMP(c, loc, JUMP, loop->fb_block);
return SUCCESS;