From: Pablo Galindo Salgado Date: Wed, 1 Jun 2022 12:51:17 +0000 (+0100) Subject: gh-92597: Improve error message for AST nodes with invalid ranges (GH-93398) X-Git-Tag: v3.12.0a1~1377 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F93420%2Fhead;p=thirdparty%2FPython%2Fcpython.git gh-92597: Improve error message for AST nodes with invalid ranges (GH-93398) --- diff --git a/Python/ast.c b/Python/ast.c index 0885fe7798fa..a0321b58ba8c 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) { \