From 516636b44e7fb092a097e59335f1ff0217cb73c0 Mon Sep 17 00:00:00 2001
From: liubo <liubo1@xfusion.com>
Date: Thu, 23 Nov 2023 14:21:49 +0800
Subject: [PATCH] add support for match statement

Signed-off-by: liubo <liubo1@xfusion.com>
---
 ...-add-support-for-match-statement-630.patch | 139 ++++++++++++++++++
 pyflakes.spec                                 |   6 +-
 2 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 0001-add-support-for-match-statement-630.patch

diff --git a/0001-add-support-for-match-statement-630.patch b/0001-add-support-for-match-statement-630.patch
new file mode 100644
index 0000000..389a796
--- /dev/null
+++ b/0001-add-support-for-match-statement-630.patch
@@ -0,0 +1,139 @@
+From cf75971656d9a04faa1b5aeaeb776da3567b8041 Mon Sep 17 00:00:00 2001
+From: Anthony Sottile <asottile@umich.edu>
+Date: Tue, 5 Oct 2021 15:37:44 -0700
+Subject: [PATCH] add support for match statement (#630)
+
+---
+ pyflakes/checker.py         | 14 ++++++-
+ pyflakes/test/test_match.py | 83 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 96 insertions(+), 1 deletion(-)
+ create mode 100644 pyflakes/test/test_match.py
+
+diff --git a/pyflakes/checker.py b/pyflakes/checker.py
+index 135ad33..6fafe89 100644
+--- a/pyflakes/checker.py
++++ b/pyflakes/checker.py
+@@ -275,7 +275,8 @@ def iter_child_nodes(node, omit=None, _fields_order=_FieldsOrder()):
+             yield field
+         elif isinstance(field, list):
+             for item in field:
+-                yield item
++                if isinstance(item, ast.AST):
++                    yield item
+ 
+ 
+ def convert_to_value(item):
+@@ -691,6 +692,8 @@ def getNodeName(node):
+         return node.id
+     if hasattr(node, 'name'):   # an ExceptHandler node
+         return node.name
++    if hasattr(node, 'rest'):   # a MatchMapping node
++        return node.rest
+ 
+ 
+ TYPING_MODULES = frozenset(('typing', 'typing_extensions'))
+@@ -2378,3 +2381,12 @@ class Checker(object):
+             left = right
+ 
+         self.handleChildren(node)
++
++    MATCH = MATCH_CASE = MATCHCLASS = MATCHOR = MATCHSEQUENCE = handleChildren
++    MATCHSINGLETON = MATCHVALUE = handleChildren
++
++    def _match_target(self, node):
++        self.handleNodeStore(node)
++        self.handleChildren(node)
++
++    MATCHAS = MATCHMAPPING = MATCHSTAR = _match_target
+diff --git a/pyflakes/test/test_match.py b/pyflakes/test/test_match.py
+new file mode 100644
+index 0000000..89826e3
+--- /dev/null
++++ b/pyflakes/test/test_match.py
+@@ -0,0 +1,83 @@
++from sys import version_info
++
++from pyflakes.test.harness import TestCase, skipIf
++
++
++@skipIf(version_info < (3, 10), "Python >= 3.10 only")
++class TestMatch(TestCase):
++    def test_match_bindings(self):
++        self.flakes('''
++            def f():
++                x = 1
++                match x:
++                    case 1 as y:
++                        print(f'matched as {y}')
++        ''')
++        self.flakes('''
++            def f():
++                x = [1, 2, 3]
++                match x:
++                    case [1, y, 3]:
++                        print(f'matched {y}')
++        ''')
++        self.flakes('''
++            def f():
++                x = {'foo': 1}
++                match x:
++                    case {'foo': y}:
++                        print(f'matched {y}')
++        ''')
++
++    def test_match_pattern_matched_class(self):
++        self.flakes('''
++            from a import B
++
++            match 1:
++                case B(x=1) as y:
++                    print(f'matched {y}')
++        ''')
++        self.flakes('''
++            from a import B
++
++            match 1:
++                case B(a, x=z) as y:
++                    print(f'matched {y} {a} {z}')
++        ''')
++
++    def test_match_placeholder(self):
++        self.flakes('''
++            def f():
++                match 1:
++                    case _:
++                        print('catchall!')
++        ''')
++
++    def test_match_singleton(self):
++        self.flakes('''
++            match 1:
++                case True:
++                    print('true')
++        ''')
++
++    def test_match_or_pattern(self):
++        self.flakes('''
++            match 1:
++                case 1 | 2:
++                    print('one or two')
++        ''')
++
++    def test_match_star(self):
++        self.flakes('''
++            x = [1, 2, 3]
++            match x:
++                case [1, *y]:
++                    print(f'captured: {y}')
++        ''')
++
++    def test_match_double_star(self):
++        self.flakes('''
++            x = {'foo': 'bar', 'baz': 'womp'}
++            match x:
++                case {'foo': k1, **rest}:
++                    print(f'{k1=} {rest=}')
++        ''')
+-- 
+2.42.0.windows.2
+
diff --git a/pyflakes.spec b/pyflakes.spec
index d20b10c..ee8350a 100644
--- a/pyflakes.spec
+++ b/pyflakes.spec
@@ -1,6 +1,6 @@
 Name:           pyflakes
 Version:        2.3.1
-Release:        2
+Release:        3
 Summary:        A simple program which checks Python source files for errors
 License:        MIT
 URL:            https://github.com/PyCQA/pyflakes
@@ -9,6 +9,7 @@ BuildArch:      noarch
 BuildRequires:  python2-devel >= 2.7 python2-setuptools
 
 Patch0001:      0001-remove-old-and-unused-tracing-code-625.patch
+Patch0002:      0001-add-support-for-match-statement-630.patch
 
 %description
 This is a safe program which analyze programs and detects various errors.\
@@ -92,6 +93,9 @@ ln -s pyflakes-3.1 %{buildroot}%{_mandir}/man1/pyflakes.1
 
 
 %changelog
+* Thu Nov 23 2023 liubo <liubo1@xfusion.com> - 2.3.1-3
+- add support for match statement
+
 * Wed Nov 22 2023 liubo <liubo1@xfusion.com> - 2.3.1-2
 - remove old and unused "tracing"