mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

bpo-45408: Don't override previous tokenizer errors in the second parser pass (GH-28812)

Browse source
This commit is contained in:
Pablo Galindo Salgado 2021-10-07 22:33:05 +01:00 • committed by GitHub
parent 6811fdaec8
commit 0219017df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Parser/pegen.c
View file

@ -1342,13 +1342,16 @@ _PyPegen_run_parser(Parser *p)
{
void *res = _PyPegen_parse(p);
if (res == NULL) {
if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_SyntaxError)) {
return NULL;
}
Token *last_token = p->tokens[p->fill - 1];
reset_parser_state(p);
_PyPegen_parse(p);
if (PyErr_Occurred()) {
// 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)) {
if (p->tok->done == E_DONE && PyErr_ExceptionMatches(PyExc_SyntaxError)) {
_PyPegen_check_tokenizer_errors(p);
}
return NULL;