From dccc750ba3004d6403fd92c6866fe7af0a39b2a7 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Tue, 10 Jun 2025 14:19:03 +0100 Subject: [PATCH] [3.13] gh-130077: Properly match full soft keywords in the parser (GH-135317) (cherry picked from commit ff2b5f40c2bf5c71255caac8a743c09ba0758c02) Co-authored-by: Pablo Galindo Salgado --- Lib/test/test_syntax.py | 7 +++++++ .../2025-06-09-23-57-37.gh-issue-130077.MHknDB.rst | 2 ++ Parser/pegen.c | 2 ++ 3 files changed, 11 insertions(+) create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2025-06-09-23-57-37.gh-issue-130077.MHknDB.rst diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 68dceac97b53dc..b035883cf883b9 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -352,6 +352,13 @@ Traceback (most recent call last): SyntaxError: invalid syntax +# But prefixes of soft keywords should +# still raise specialized errors + +>>> (mat x) +Traceback (most recent call last): +SyntaxError: invalid syntax. Perhaps you forgot a comma? + From compiler_complex_args(): >>> def f(None=1): diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-06-09-23-57-37.gh-issue-130077.MHknDB.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-06-09-23-57-37.gh-issue-130077.MHknDB.rst new file mode 100644 index 00000000000000..a7d02426b6fc13 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-06-09-23-57-37.gh-issue-130077.MHknDB.rst @@ -0,0 +1,2 @@ +Properly raise custom syntax errors when incorrect syntax containing names +that are prefixes of soft keywords is encountered. Patch by Pablo Galindo. diff --git a/Parser/pegen.c b/Parser/pegen.c index 656c42b348a96b..02c4cb4dd24c58 100644 --- a/Parser/pegen.c +++ b/Parser/pegen.c @@ -609,6 +609,8 @@ expr_ty _PyPegen_soft_keyword_token(Parser *p) { Py_ssize_t size; PyBytes_AsStringAndSize(t->bytes, &the_token, &size); for (char **keyword = p->soft_keywords; *keyword != NULL; keyword++) { + if (strlen(*keyword) == (size_t)size && + strncmp(*keyword, the_token, (size_t)size) == 0) { if (strncmp(*keyword, the_token, size) == 0) { return _PyPegen_name_from_token(p, t); }