bpo-45408: Don't override previous tokenizer errors in the second parser pass #28812
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pablogsal
commented
Oct 7, 2021
| 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)) { |
There was a problem hiding this comment.
This is basically where the error was: we were overriding existing tokenizer errors that are different from E_ERROR. In this case we had E_LINECONT.
isidentical
approved these changes
Oct 7, 2021
ammaraskar
approved these changes
Oct 7, 2021
|
Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10. |
|
Sorry, @pablogsal, I could not cleanly backport this to |
pablogsal
added a commit
to pablogsal/cpython
that referenced
this pull request
Oct 7, 2021
…ond parser pass (pythonGH-28812). (cherry picked from commit 0219017) Co-authored-by: Pablo Galindo Salgado <[email protected]>
|
GH-28813 is a backport of this pull request to the 3.10 branch. |
pablogsal
added a commit
that referenced
this pull request
Oct 7, 2021
…ond parser pass (GH-28812). (GH-28813) (cherry picked from commit 0219017) Co-authored-by: Pablo Galindo Salgado <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://bugs.python.org/issue45408