[Python-checkins] gh-92597: Improve error message for AST nodes with invalid ranges (GH-93398)
pablogsal
webhook-mailer at python.org
Wed Jun 1 08:51:35 EDT 2022
https://github.com/python/cpython/commit/8a221a853787c18d5acaf46f5c449d28339cde21
commit: 8a221a853787c18d5acaf46f5c449d28339cde21
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-06-01T13:51:17+01:00
summary:
gh-92597: Improve error message for AST nodes with invalid ranges (GH-93398)
files:
M Python/ast.c
diff --git a/Python/ast.c b/Python/ast.c
index 0885fe7798fa5..a0321b58ba8cf 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -25,15 +25,15 @@ static int validate_pattern(struct validator *, pattern_ty, int);
#define VALIDATE_POSITIONS(node) \
if (node->lineno > node->end_lineno) { \
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); \
return 0; \
} \
if ((node->lineno < 0 && node->end_lineno != node->lineno) || \
(node->col_offset < 0 && node->col_offset != node->end_col_offset)) { \
PyErr_Format(PyExc_ValueError, \
- "line %d-%d, column %d-%d is not a valid range", \
- node->lineno, node->end_lineno, node->col_offset, node->end_col_offset); \
+ "AST node column range (%d, %d) for line range (%d, %d) is not valid", \
+ node->col_offset, node->end_col_offset, node->lineno, node->end_lineno); \
return 0; \
} \
if (node->lineno == node->end_lineno && node->col_offset > node->end_col_offset) { \
More information about the Python-checkins
mailing list