mirror of
https://github.com/python/cpython
synced 2024-09-05 16:38:56 +00:00
bpo-44335: Fix a regression when identifying invalid characters in syntax errors (GH-26589)
This commit is contained in:
parent
6d518bb3a1
commit
d334c73b56
|
@ -211,6 +211,7 @@ def testSyntaxErrorOffset(self):
|
||||||
check('lambda x: x = 2', 1, 1)
|
check('lambda x: x = 2', 1, 1)
|
||||||
check('f{a + b + c}', 1, 2)
|
check('f{a + b + c}', 1, 2)
|
||||||
check('[file for str(file) in []\n])', 2, 2)
|
check('[file for str(file) in []\n])', 2, 2)
|
||||||
|
check('a = « hello » « world »', 1, 5)
|
||||||
check('[\nfile\nfor str(file)\nin\n[]\n]', 3, 5)
|
check('[\nfile\nfor str(file)\nin\n[]\n]', 3, 5)
|
||||||
check('[file for\n str(file) in []]', 2, 2)
|
check('[file for\n str(file) in []]', 2, 2)
|
||||||
check("ages = {'Alice'=22, 'Bob'=23}", 1, 16)
|
check("ages = {'Alice'=22, 'Bob'=23}", 1, 16)
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Fix a regression when identifying incorrect characters in syntax errors.
|
||||||
|
Patch by Pablo Galindo
|
|
@ -1288,7 +1288,9 @@ _PyPegen_run_parser(Parser *p)
|
||||||
reset_parser_state(p);
|
reset_parser_state(p);
|
||||||
_PyPegen_parse(p);
|
_PyPegen_parse(p);
|
||||||
if (PyErr_Occurred()) {
|
if (PyErr_Occurred()) {
|
||||||
if (PyErr_ExceptionMatches(PyExc_SyntaxError)) {
|
// Prioritize tokenizer errors to custom syntax errors raised
|
||||||
|
// on the second phase only if the errors come from the parser.
|
||||||
|
if (p->tok->done != E_ERROR && PyErr_ExceptionMatches(PyExc_SyntaxError)) {
|
||||||
_PyPegen_check_tokenizer_errors(p);
|
_PyPegen_check_tokenizer_errors(p);
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in a new issue