improve lazify support in some function composition utilities

Technologicat · Technologicat · commit 1bae38831c1d · 2021-05-28T01:13:25.000+03:00
diff --git a/unpythonic/fun.py b/unpythonic/fun.py
@@ -687,15 +687,14 @@ def andf(*fs):  # Racket: conjoin
         assert andf(lambda x: isinstance(x, int), lambda x: x % 2 == 0)(42) is True
         assert andf(lambda x: isinstance(x, int), lambda x: x % 2 == 0)(43) is False
     """
+    @passthrough_lazy_args
     def conjoined(*args, **kwargs):
         b = True
         for f in fs:
             b = b and maybe_force_args(f, *args, **kwargs)
             if not b:
                 return False
         return b
-    if all(islazy(f) for f in fs):
-        conjoined = passthrough_lazy_args(conjoined)
     return conjoined
 
 def orf(*fs):  # Racket: disjoin
@@ -715,15 +714,14 @@ def orf(*fs):  # Racket: disjoin
         assert orf(isstr, iseven)("foo") is True
         assert orf(isstr, iseven)(None) is False  # neither condition holds
     """
+    @passthrough_lazy_args
     def disjoined(*args, **kwargs):
         b = False
         for f in fs:
             b = b or maybe_force_args(f, *args, **kwargs)
             if b:
                 return b
         return False
-    if all(islazy(f) for f in fs):
-        disjoined = passthrough_lazy_args(disjoined)
     return disjoined
 
 def _make_compose1(direction):
@@ -769,8 +767,7 @@ def compose1(fs):
         #  - if fs is empty, we output None
         #  - if fs contains only one item, we output it as-is
         composed = reducel(compose1_two, fs)  # op(elt, acc)
-        if all(islazy(f) for f in fs):
-            composed = passthrough_lazy_args(composed)
+        composed = passthrough_lazy_args(composed)
         return composed
     return compose1
 
@@ -858,8 +855,7 @@ def compose(fs):
         """
         fs = force(fs)
         composed = reducel(compose_two, fs)  # op(elt, acc)
-        if all(islazy(f) for f in fs):
-            composed = passthrough_lazy_args(composed)
+        composed = passthrough_lazy_args(composed)
         return composed
     return compose
 
