]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Support as-expressions on dict items (GH-2686)
authorBatuhan Taskaya <isidentical@gmail.com>
Sun, 12 Dec 2021 21:10:22 +0000 (00:10 +0300)
committerGitHub <noreply@github.com>
Sun, 12 Dec 2021 21:10:22 +0000 (16:10 -0500)
CHANGES.md
src/blib2to3/Grammar.txt
tests/data/pattern_matching_extras.py

index 3724820275031dc25052108b50a1935f3c9dae73..0dcf35ea199932b8f22d678d537351440c1a6634 100644 (file)
@@ -5,6 +5,8 @@
 ### _Black_
 
 - Improve error message for invalid regular expression (#2678)
 ### _Black_
 
 - Improve error message for invalid regular expression (#2678)
+- Fix mapping cases that contain as-expressions, like `case {"key": 1 | 2 as password}`
+  (#2686)
 
 ## 21.12b0
 
 
 ## 21.12b0
 
index c3001e810652f7c28ed78f679854d3aeb6d9f15b..600712ce2f072e2b23c34f3312d5c34b7caca38f 100644 (file)
@@ -168,8 +168,8 @@ subscript: test [':=' test] | [test] ':' [test] [sliceop]
 sliceop: ':' [test]
 exprlist: (expr|star_expr) (',' (expr|star_expr))* [',']
 testlist: test (',' test)* [',']
 sliceop: ':' [test]
 exprlist: (expr|star_expr) (',' (expr|star_expr))* [',']
 testlist: test (',' test)* [',']
-dictsetmaker: ( ((test ':' test | '**' expr)
-                 (comp_for | (',' (test ':' test | '**' expr))* [','])) |
+dictsetmaker: ( ((test ':' asexpr_test | '**' expr)
+                 (comp_for | (',' (test ':' asexpr_test | '**' expr))* [','])) |
                 ((test [':=' test] | star_expr)
                 (comp_for | (',' (test [':=' test] | star_expr))* [','])) )
 
                 ((test [':=' test] | star_expr)
                 (comp_for | (',' (test [':=' test] | star_expr))* [','])) )
 
index 60ad8a3d81b3a3d7468b42c627f2c9227319caee..c00585e928523e56da6c63caa903173fb9421f90 100644 (file)
@@ -82,3 +82,13 @@ match match:
 match a, *b(), c:
     case d, *f, g:
         pass
 match a, *b(), c:
     case d, *f, g:
         pass
+
+
+match something:
+    case {
+        "key": key as key_1,
+        "password": PASS.ONE | PASS.TWO | PASS.THREE as password,
+    }:
+        pass
+    case {"maybe": something(complicated as this) as that}:
+        pass