commit b1bd16c2528295b8b28395827f6b589dccea0624
author Pablo Galindo Salgado <Pablogsal@gmail.com> Thu Aug 05 19:00:19 2021 +0100
committer GitHub <noreply@github.com> Thu Aug 05 11:00:19 2021 -0700
tree 8198211ed8809166651cb01ce705dfef9c8d3f9d
parent 536e35ae6a2555a01f4b51a68ad71dbf7923536d

[3.10] bpo-44838: Refine the custom syntax errors for invalid 'if' expressions (GH-27615). (GH-27616)



…

(cherry picked from commit f5cbea6b1b5fc39cca377c6cc93f222916015fc4)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>

Automerge-Triggered-By: GH:lysnikolaou

Grammar/python.gram

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 3e7475a..decc578 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -859,7 +859,7 @@
     # Soft keywords need to also be ignored because they can be parsed as NAME NAME
    | !(NAME STRING | SOFT_KEYWORD) a=disjunction b=expression_without_invalid {
         RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Perhaps you forgot a comma?") }
-   | a=disjunction 'if' b=disjunction !'else' { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
+   | a=disjunction 'if' b=disjunction !('else'|':') { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }
 
 invalid_named_expression:
     | a=expression ':=' expression {