Skip to content
Snippets Groups Projects
Unverified Commit 90f9b8b9 authored by Miss Islington (bot)'s avatar Miss Islington (bot) Committed by GitHub
Browse files

gh-92597: Improve error message for AST nodes with invalid ranges (GH-93398) (GH-93414)


(cherry picked from commit 8a221a85)

Co-authored-by: default avatarPablo Galindo Salgado <Pablogsal@gmail.com>
parent d779e5d1
No related branches found
No related tags found
No related merge requests found
...@@ -25,15 +25,15 @@ static int validate_pattern(struct validator *, pattern_ty, int); ...@@ -25,15 +25,15 @@ static int validate_pattern(struct validator *, pattern_ty, int);
#define VALIDATE_POSITIONS(node) \ #define VALIDATE_POSITIONS(node) \
if (node->lineno > node->end_lineno) { \ if (node->lineno > node->end_lineno) { \
PyErr_Format(PyExc_ValueError, \ PyErr_Format(PyExc_ValueError, \
"line %d-%d is not a valid range", \ "AST node line range (%d, %d) is not valid", \
node->lineno, node->end_lineno); \ node->lineno, node->end_lineno); \
return 0; \ return 0; \
} \ } \
if ((node->lineno < 0 && node->end_lineno != node->lineno) || \ if ((node->lineno < 0 && node->end_lineno != node->lineno) || \
(node->col_offset < 0 && node->col_offset != node->end_col_offset)) { \ (node->col_offset < 0 && node->col_offset != node->end_col_offset)) { \
PyErr_Format(PyExc_ValueError, \ PyErr_Format(PyExc_ValueError, \
"line %d-%d, column %d-%d is not a valid range", \ "AST node column range (%d, %d) for line range (%d, %d) is not valid", \
node->lineno, node->end_lineno, node->col_offset, node->end_col_offset); \ node->col_offset, node->end_col_offset, node->lineno, node->end_lineno); \
return 0; \ return 0; \
} \ } \
if (node->lineno == node->end_lineno && node->col_offset > node->end_col_offset) { \ if (node->lineno == node->end_lineno && node->col_offset > node->end_col_offset) { \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment