Merge branch 'for-filter' of https://github.com/BobTheBuidler/mypy into for-filter

Author: BobTheBuidler

mypyc/irbuild/for_helpers.py

@@ -1164,13 +1164,15 @@ class ForFilter(ForGenerator):
     """Generate optimized IR for a for loop over filter(f, iterable)."""
 
     def need_cleanup(self) -> bool:
-        # The wrapped for loops might need cleanup. We might generate a
-        # redundant cleanup block, but that's okay.
-        return True
+        return self.gen.need_cleanup()
 
     def init(self, index: Lvalue, func: Expression, iterable: Expression) -> None:
         self.filter_func_def = func
-        if isinstance(func, NameExpr) and isinstance(func.node, Var) and func.node.fullname == "builtins.None":
+        if (
+            isinstance(func, NameExpr)
+            and isinstance(func.node, Var)
+            and func.node.fullname == "builtins.None"
+        ):
             self.filter_func_val = None
         else:
             self.filter_func_val = self.builder.accept(func)

mypyc/test-data/run-loops.test

@@ -604,6 +604,36 @@ print(f([0, 1, 2, 3, 4, 5, 6]))
 [out]
 6
 
+[case testRunForFilterNative]
+def f(x: int) -> int:
+    return x % 2
+def g(a: list[int]) -> int:
+    c = 0
+    for x in filter(f, a):
+        c += 1
+    return c
+
+[file driver.py]
+from native import g
+print(g([0, 1, 2, 3, 4, 5, 6]))
+
+[out]
+3
+
+[case testRunForFilterPrimitiveOp]
+def f(a: list[list[int]]) -> int:
+    c = 0
+    for x in filter(len, a):
+        c += 1
+    return c
+
+[file driver.py]
+from native import f
+print(f([[], [0, 1], [], [], [2, 3, 4], [5, 6]]))
+
+[out]
+3
+
 [case testRunForFilterEdgeCases]
 def f(a: list[int]) -> int:
     s = 0