FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-145239: Accept unary plus literal pattern (#148566) · python/cpython@448d7b9 · GitHub

  1. python
  2. cpython

Repository navigation

Commit 448d7b9

Browse files
johnslavik
authored
gh-145239: Accept unary plus literal pattern (#148566)
Add '+' alternatives to signed_number and signed_real_number grammar rules, mirroring how unary minus is already handled for pattern matching. Unary plus is a no-op on numbers so the value is returned directly without wrapping in a UnaryOp node.
1 parent 4629c22 commit 448d7b9

7 files changed

Lines changed: 187 additions & 4 deletions

File tree

‎Doc/reference/compound_stmts.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ A literal pattern corresponds to most
858858
: | "None"
859859
: | "True"
860860
: | "False"
861-
signed_number: ["-"] NUMBER
861+
signed_number: ["+" | "-"] NUMBER
862862

863863
The rule ``strings`` and the token ``NUMBER`` are defined in the
864864
:doc:`standard Python grammar <./grammar>`. Triple-quoted strings are

‎Doc/whatsnew/3.15.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,10 @@ Other language changes
645645
* Allow the *count* argument of :meth:`bytes.replace` to be a keyword.
646646
(Contributed by Stan Ulbrych in :gh:`147856`.)
647647

648+
* Unary plus is now accepted in :keyword:`match` literal patterns, mirroring
649+
the existing support for unary minus.
650+
(Contributed by Bartosz Sławecki in :gh:`145239`.)
651+
648652

649653
New modules
650654
===========

‎Grammar/python.gram‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,17 +554,20 @@ complex_number[expr_ty]:
554554

555555
signed_number[expr_ty]:
556556
| NUMBER
557+
| '+' number=NUMBER { number }
557558
| '-' number=NUMBER { _PyAST_UnaryOp(USub, number, EXTRA) }
558559

559560
signed_real_number[expr_ty]:
560561
| real_number
562+
| '+' real=real_number { real }
561563
| '-' real=real_number { _PyAST_UnaryOp(USub, real, EXTRA) }
562564

563565
real_number[expr_ty]:
564566
| real=NUMBER { _PyPegen_ensure_real(p, real) }
565567

566568
imaginary_number[expr_ty]:
567569
| imag=NUMBER { _PyPegen_ensure_imaginary(p, imag) }
570+
| '+' imag=NUMBER { _PyPegen_ensure_imaginary(p, imag) }
568571

569572
capture_pattern[pattern_ty]:
570573
| target=pattern_capture_target { _PyAST_MatchAs(NULL, target->v.Name.id, EXTRA) }

‎Lib/test/.ruff.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ extend-exclude = [
1818
"test_lazy_import/__init__.py",
1919
"test_lazy_import/data/*.py",
2020
"test_lazy_import/data/**/*.py",
21+
# Unary plus literal pattern is not yet supported by Ruff (GH-145239)
22+
"test_patma.py",
2123
]
2224

2325
[lint]

‎Lib/test/test_patma.py‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2762,6 +2762,96 @@ def test_patma_255(self):
27622762
self.assertEqual(y, 1)
27632763
self.assertIs(z, x)
27642764

2765+
def test_patma_256(self):
2766+
x = 0
2767+
match x:
2768+
case +0:
2769+
y = 0
2770+
self.assertEqual(x, 0)
2771+
self.assertEqual(y, 0)
2772+
2773+
def test_patma_257(self):
2774+
x = 0
2775+
match x:
2776+
case +0.0:
2777+
y = 0
2778+
self.assertEqual(x, 0)
2779+
self.assertEqual(y, 0)
2780+
2781+
def test_patma_258(self):
2782+
x = 0
2783+
match x:
2784+
case +0j:
2785+
y = 0
2786+
self.assertEqual(x, 0)
2787+
self.assertEqual(y, 0)
2788+
2789+
def test_patma_259(self):
2790+
x = 0
2791+
match x:
2792+
case +0.0j:
2793+
y = 0
2794+
self.assertEqual(x, 0)
2795+
self.assertEqual(y, 0)
2796+
2797+
def test_patma_260(self):
2798+
x = 1
2799+
match x:
2800+
case +1:
2801+
y = 0
2802+
self.assertEqual(x, 1)
2803+
self.assertEqual(y, 0)
2804+
2805+
def test_patma_261(self):
2806+
x = 1.5
2807+
match x:
2808+
case +1.5:
2809+
y = 0
2810+
self.assertEqual(x, 1.5)
2811+
self.assertEqual(y, 0)
2812+
2813+
def test_patma_262(self):
2814+
x = 1j
2815+
match x:
2816+
case +1j:
2817+
y = 0
2818+
self.assertEqual(x, 1j)
2819+
self.assertEqual(y, 0)
2820+
2821+
def test_patma_263(self):
2822+
x = 1.5j
2823+
match x:
2824+
case +1.5j:
2825+
y = 0
2826+
self.assertEqual(x, 1.5j)
2827+
self.assertEqual(y, 0)
2828+
2829+
def test_patma_264(self):
2830+
x = 0.25 + 1.75j
2831+
match x:
2832+
case +0.25 + 1.75j:
2833+
y = 0
2834+
self.assertEqual(x, 0.25 + 1.75j)
2835+
self.assertEqual(y, 0)
2836+
2837+
def test_patma_265(self):
2838+
x = 0.25 - 1.75j
2839+
match x:
2840+
case 0.25 - +1.75j:
2841+
y = 0
2842+
self.assertEqual(x, 0.25 - 1.75j)
2843+
self.assertEqual(y, 0)
2844+
2845+
def test_patma_266(self):
2846+
x = 0
2847+
match x:
2848+
case +1e1000:
2849+
y = 0
2850+
case 0:
2851+
y = 1
2852+
self.assertEqual(x, 0)
2853+
self.assertEqual(y, 1)
2854+
27652855
def test_patma_runtime_checkable_protocol(self):
27662856
# Runtime-checkable protocol
27672857
from typing import Protocol, runtime_checkable

‎Misc/NEWS.d/next/Core_and_Builtins/2026-04-13-23-21-45.gh-issue-145239.pL8qRt.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Unary plus is now accepted in :keyword:`match` literal patterns, mirroring
2+
the existing support for unary minus.
3+
Patch by Bartosz Sławecki.

‎Parser/parser.c‎

Lines changed: 84 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL