Visitar URL original
More Pattern matching implementation mapping + class by youknowone · Pull Request #6110 · RustPython/RustPython · GitHub
Skip to content

More Pattern matching implementation mapping + class #6110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 8 commits into from
Aug 28, 2025
Merged

More Pattern matching implementation mapping + class #6110

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
50c5574
more match pattern
youknowone Aug 8, 2025
8ae2dc7
MATCH_SELF
youknowone Aug 26, 2025
a109a59
Import test_patma from CPython 3.13.7
Aug 26, 2025
4b63801
Add failing test markers
youknowone Aug 26, 2025
21fb4aa
apply review
youknowone Aug 26, 2025
b807bc7
Fix patma guard
youknowone Aug 26, 2025
be54bc0
Fix multiple inheritance
youknowone Aug 26, 2025
f4543f5
Fix defaultdict
youknowone Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add failing test markers
  • Loading branch information
@youknowone
youknowone committed Aug 26, 2025
commit 4b638011bb3c6e7198c5eab2ed725b2172b25d89
51 changes: 43 additions & 8 deletions Lib/test/test_patma.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def check_mapping_then_sequence(x):
case [*_]:
return "seq"

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_multiple_inheritance_mapping(self):
class C:
pass
Expand All @@ -62,6 +63,7 @@ class M4(dict, collections.abc.Sequence, C):
self.assertEqual(self.check_mapping_then_sequence(M3()), "map")
self.assertEqual(self.check_mapping_then_sequence(M4()), "map")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_multiple_inheritance_sequence(self):
class C:
pass
Expand All @@ -82,6 +84,7 @@ class S4(collections.UserList, dict, C):
self.assertEqual(self.check_mapping_then_sequence(S3()), "seq")
self.assertEqual(self.check_mapping_then_sequence(S4()), "seq")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_late_registration_mapping(self):
class Parent:
pass
Expand All @@ -105,6 +108,7 @@ class GrandchildPost(ChildPost):
self.assertEqual(self.check_mapping_then_sequence(ChildPost()), "map")
self.assertEqual(self.check_mapping_then_sequence(GrandchildPost()), "map")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_late_registration_sequence(self):
class Parent:
pass
Expand Down Expand Up @@ -582,6 +586,7 @@ def test_patma_051(self):
self.assertEqual(y, 1)
self.assertEqual(z, 0)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_052(self):
x = [1, 0]
match x:
Expand Down Expand Up @@ -1335,6 +1340,7 @@ def test_patma_132(self):
self.assertEqual(x, [0, 1, 2])
self.assertEqual(y, 0)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_133(self):
x = collections.defaultdict(int, {0: 1})
match x:
Expand All @@ -1347,6 +1353,7 @@ def test_patma_133(self):
self.assertEqual(x, {0: 1})
self.assertEqual(y, 2)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_134(self):
x = collections.defaultdict(int, {0: 1})
match x:
Expand All @@ -1360,6 +1367,7 @@ def test_patma_134(self):
self.assertEqual(y, 2)
self.assertEqual(z, {0: 1})

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_135(self):
x = collections.defaultdict(int, {0: 1})
match x:
Expand Down Expand Up @@ -1896,6 +1904,7 @@ def whereis(points):
self.assertEqual(whereis([Point(0, 0), Point(0, 0), Point(0, 0)]), "Something else")
self.assertEqual(whereis([Point(0, 1), Point(0, 1), Point(0, 1)]), "Something else")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_183(self):
def whereis(point):
match point:
Expand Down Expand Up @@ -2244,6 +2253,7 @@ def f(w):
self.assertEqual(f(None), {})
self.assertEqual(f((1, 2)), {})

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_210(self):
def f(w):
match w:
Expand Down Expand Up @@ -2563,14 +2573,15 @@ def test_patma_240(self):
self.assertEqual(y, 0)
self.assertEqual(z, {0: 1})

def test_patma_241(self):
x = [[{0: 0}]]
match x:
case list([({-0-0j: int(real=0+0j, imag=0-0j) | (1) as z},)]):
y = 0
self.assertEqual(x, [[{0: 0}]])
self.assertEqual(y, 0)
self.assertEqual(z, 0)
# TODO: RUSTPYTHON
# def test_patma_241(self):
# x = [[{0: 0}]]
# match x:
# case list([({-0-0j: int(real=0+0j, imag=0-0j) | (1) as z},)]):
# y = 0
# self.assertEqual(x, [[{0: 0}]])
# self.assertEqual(y, 0)
# self.assertEqual(z, 0)

def test_patma_242(self):
x = range(3)
Expand Down Expand Up @@ -2684,6 +2695,7 @@ def f(self, x):
setattr(c, "__attr", "spam") # setattr is needed because we're in a class scope
self.assertEqual(Outer().f(c), "spam")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_250(self):
def f(x):
match x:
Expand All @@ -2695,6 +2707,7 @@ def f(x):
self.assertIs(f({"foo": 1}), True)
self.assertIs(f({"foo": -1}), False)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_251(self):
def f(v, x):
match v:
Expand All @@ -2713,6 +2726,7 @@ def __init__(self, attr):
self.assertIs(f(-1, X(-1)), False)
self.assertIs(f(1, X(-1)), None)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_252(self):
# Side effects must be possible in guards:
effects = []
Expand Down Expand Up @@ -2750,6 +2764,7 @@ def f(v):
self.assertEqual(f(1), 1)
self.assertEqual(f({"x": 1}), 1)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patma_255(self):
x = []
match x:
Expand Down Expand Up @@ -2951,6 +2966,7 @@ def test_invalid_syntax_2(self):
pass
""")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_invalid_syntax_3(self):
self.assert_syntax_error("""
match ...:
Expand Down Expand Up @@ -3070,13 +3086,15 @@ def test_name_capture_makes_remaining_patterns_unreachable_4(self):
pass
""")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patterns_may_only_match_literals_and_attribute_lookups_0(self):
self.assert_syntax_error("""
match ...:
case f"":
pass
""")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_patterns_may_only_match_literals_and_attribute_lookups_1(self):
self.assert_syntax_error("""
match ...:
Expand Down Expand Up @@ -3119,6 +3137,7 @@ def test_real_number_multiple_ops(self):
pass
""")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_real_number_wrong_ops(self):
for op in ["*", "/", "@", "**", "%", "//"]:
with self.subTest(op=op):
Expand Down Expand Up @@ -3187,20 +3206,23 @@ def test_wildcard_makes_remaining_patterns_unreachable_5(self):
pass
""")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_mapping_pattern_duplicate_key(self):
self.assert_syntax_error("""
match ...:
case {"a": _, "a": _}:
pass
""")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_mapping_pattern_duplicate_key_edge_case0(self):
self.assert_syntax_error("""
match ...:
case {0: _, False: _}:
pass
""")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_mapping_pattern_duplicate_key_edge_case1(self):
self.assert_syntax_error("""
match ...:
Expand All @@ -3215,6 +3237,8 @@ def test_mapping_pattern_duplicate_key_edge_case2(self):
pass
""")


@unittest.expectedFailure # TODO: RUSTPYTHON
def test_mapping_pattern_duplicate_key_edge_case3(self):
self.assert_syntax_error("""
match ...:
Expand All @@ -3236,6 +3260,7 @@ class Class:
self.assertIs(y, None)
self.assertIs(z, None)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_accepts_positional_subpatterns_1(self):
x = range(10)
y = None
Expand All @@ -3246,6 +3271,7 @@ def test_accepts_positional_subpatterns_1(self):
self.assertEqual(x, range(10))
self.assertIs(y, None)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_got_multiple_subpatterns_for_attribute_0(self):
class Class:
__match_args__ = ("a", "a")
Expand All @@ -3260,6 +3286,7 @@ class Class:
self.assertIs(y, None)
self.assertIs(z, None)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_got_multiple_subpatterns_for_attribute_1(self):
class Class:
__match_args__ = ("a",)
Expand Down Expand Up @@ -3365,6 +3392,7 @@ class A:

class TestValueErrors(unittest.TestCase):

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_mapping_pattern_checks_duplicate_key_1(self):
class Keys:
KEY = "a"
Expand All @@ -3379,6 +3407,7 @@ class Keys:
self.assertIs(z, None)

class TestSourceLocations(unittest.TestCase):
@unittest.expectedFailure # TODO: RUSTPYTHON
def test_jump_threading(self):
# See gh-123048
def f():
Expand Down Expand Up @@ -3418,6 +3447,7 @@ def trace(frame, event, arg):
sys.settrace(old_trace)
return actual_linenos

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_default_wildcard(self):
def f(command): # 0
match command.split(): # 1
Expand All @@ -3432,6 +3462,7 @@ def f(command): # 0
self.assertListEqual(self._trace(f, "go x"), [1, 2, 4, 5])
self.assertListEqual(self._trace(f, "spam"), [1, 2, 4, 6, 7])

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_default_capture(self):
def f(command): # 0
match command.split(): # 1
Expand All @@ -3446,6 +3477,7 @@ def f(command): # 0
self.assertListEqual(self._trace(f, "go x"), [1, 2, 4, 5])
self.assertListEqual(self._trace(f, "spam"), [1, 2, 4, 6, 7])

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_no_default(self):
def f(command): # 0
match command.split(): # 1
Expand All @@ -3458,6 +3490,7 @@ def f(command): # 0
self.assertListEqual(self._trace(f, "go x"), [1, 2, 4, 5])
self.assertListEqual(self._trace(f, "spam"), [1, 2, 4])

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_only_default_wildcard(self):
def f(command): # 0
match command.split(): # 1
Expand All @@ -3468,6 +3501,7 @@ def f(command): # 0
self.assertListEqual(self._trace(f, "go x"), [1, 2, 3])
self.assertListEqual(self._trace(f, "spam"), [1, 2, 3])

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_only_default_capture(self):
def f(command): # 0
match command.split(): # 1
Expand All @@ -3478,6 +3512,7 @@ def f(command): # 0
self.assertListEqual(self._trace(f, "go x"), [1, 2, 3])
self.assertListEqual(self._trace(f, "spam"), [1, 2, 3])

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_unreachable_code(self):
def f(command): # 0
match command: # 1
Expand Down