Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-42918: Improve build-in function compile() in mode 'single' (GH-29934) 

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
This commit is contained in:
Weipeng Hong 2021-12-11 07:44:26 +08:00 committed by GitHub
parent 98e506ae8a
commit 28179aac79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_compile.py
View File

@ -504,6 +504,7 @@ if 1:
self.compile_single("if x:\n f(x)")
self.compile_single("if x:\n f(x)\nelse:\n g(x)")
self.compile_single("class T:\n pass")
self.compile_single("c = '''\na=1\nb=2\nc=3\n'''")
def test_bad_single_statement(self):
self.assertInvalidSingle('1\n2')
@ -514,6 +515,7 @@ if 1:
self.assertInvalidSingle('f()\n# blah\nblah()')
self.assertInvalidSingle('f()\nxy # blah\nblah()')
self.assertInvalidSingle('x = 5 # comment\nx = 6\n')
self.assertInvalidSingle("c = '''\nd=1\n'''\na = 1\n\nb = 2\n")
def test_particularly_evil_undecodable(self):
# Issue 24022

3
Misc/NEWS.d/next/Core and Builtins/2021-12-06-15-32-12.bpo-42918.Czpgtg.rst Normal file
View File

@ -0,0 +1,3 @@
Fix bug where the built-in :func:`compile` function did not always raise a
:exc:`SyntaxError` when passed multiple statements in 'single' mode. Patch by
Weipeng Hong.

20
Parser/pegen.c
View File

@ -675,31 +675,13 @@ _PyPegen_number_token(Parser *p)
t->end_col_offset, p->arena);
}
static int // bool
newline_in_string(Parser *p, const char *cur)
{
for (const char *c = cur; c >= p->tok->buf; c--) {
if (*c == '\'' || *c == '"') {
return 1;
}
}
return 0;
}
/* Check that the source for a single input statement really is a single
statement by looking at what is left in the buffer after parsing.
Trailing whitespace and comments are OK. */
static int // bool
bad_single_statement(Parser *p)
{
const char *cur = strchr(p->tok->buf, '\n');
/* Newlines are allowed if preceded by a line continuation character
or if they appear inside a string. */
if (!cur || (cur != p->tok->buf && *(cur - 1) == '\\')
|| newline_in_string(p, cur)) {
return 0;
}
char *cur = p->tok->cur;
char c = *cur;
for (;;) {