grammar: accept open sequences on match subject (GH-2639)

* grammar: accept open sequences on match subject
* give an example about the fixed match subject

diff --git a/CHANGES.md b/CHANGES.md
index db519ac6bbc9a636fc1dd90de43f04f53c5f1ee5..94d1c69259a413e2af37ee1d453c4a16f19b69ff 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@
 ### _Black_
 
 - Fixed Python 3.10 support on platforms without ProcessPoolExecutor (#2631)
+- Fixed `match` statements with open sequence subjects, like `match a, b:` (#2639)
 
 ## 21.11b1
 

diff --git a/src/blib2to3/Grammar.txt b/src/blib2to3/Grammar.txt
index c2a62543abb41cdd5e3427804468809389e7da63..de9a6a2283fe3a26bde755cbd765a989b0b47180 100644 (file)
--- a/src/blib2to3/Grammar.txt
+++ b/src/blib2to3/Grammar.txt
@@ -238,7 +238,7 @@ yield_arg: 'from' test | testlist_star_expr
 # to reformat them.
 
 match_stmt: "match" subject_expr ':' NEWLINE INDENT case_block+ DEDENT
-subject_expr: namedexpr_test
+subject_expr: namedexpr_test (',' namedexpr_test)* [',']
 
 # cases
 case_block: "case" patterns [guard] ':' suite

diff --git a/tests/data/pattern_matching_extras.py b/tests/data/pattern_matching_extras.py
index 614e66aebe65ee3039eb4df24d7a746bf56a107a..d4bba38ee7cd35f21f086c4c89936a8039a6bc60 100644 (file)
--- a/tests/data/pattern_matching_extras.py
+++ b/tests/data/pattern_matching_extras.py
@@ -27,3 +27,19 @@ def func(match: case, case: match) -> case:
             ...
         case func(match, case):
             ...
+
+
+match maybe, multiple:
+    case perhaps, 5:
+        pass
+    case perhaps, 6,:
+        pass
+
+
+match more := (than, one), indeed,:
+    case _, (5, 6):
+        pass
+    case [[5], (6)], [7],:
+        pass
+    case _:
+        pass