fix isx usage

Technologicat · Technologicat · commit 8f3dd7e72499 · 2019-02-25T11:40:02.000+02:00
diff --git a/unpythonic/syntax/tailtools.py b/unpythonic/syntax/tailtools.py
@@ -20,7 +20,7 @@
 from macropy.core.hquotes import macros, hq
 from macropy.core.walkers import Walker
 
-from .util import isx, isec, \
+from .util import isx, make_isxpred, isec, \
                   detect_callec, detect_lambda, \
                   has_tco, sort_lambda_decorators, \
                   suggest_decorator_index
@@ -29,7 +29,7 @@
 
 from ..dynassign import dyn
 from ..it import uniqify
-from ..fun import identity
+from ..fun import identity, orf
 from ..tco import trampolined, jump
 from ..lazyutil import mark_lazy
 
@@ -557,6 +557,7 @@ def _tco_transform_lambda(tree, *, preproc_cb, userlambdas, known_ecs, transform
 
 # Tail-position analysis for a return-value expression (also the body of a lambda).
 # Here we need to be very, very selective about where to recurse so this is not a Walker.
+_isjump = orf(make_isxpred("jump"), make_isxpred("loop"))
 def _transform_retexpr(tree, known_ecs, call_cb=None, data_cb=None):
     """Analyze and TCO a return-value expression or a lambda body.
 
@@ -607,7 +608,7 @@ def transform(tree):
             #     - Hence, transform_return() calls us on the content of
             #       all ec nodes directly. ec(...) is like return; the
             #       argument is the retexpr.
-            if not (isx(tree.func, "jump") or isx(tree.func, "loop") or isec(tree, known_ecs)):
+            if not (isx(tree.func, _isjump) or isec(tree, known_ecs)):
                 tree.args = [tree.func] + tree.args
                 tree.func = hq[jump]
                 tree = transform_call(tree)
diff --git a/unpythonic/syntax/util.py b/unpythonic/syntax/util.py
@@ -103,7 +103,7 @@ def g(ec):           # <-- should grab from here
     fallbacks = ["ec", "brk"]
     for x in fallbacks:
         collect(x)
-    iscallec = partial(isx, x="call_ec")
+    iscallec = partial(isx, make_isxpred("call_ec"))
     # TODO: add support for general use of call_ec as a function (difficult)
     if type(tree) in (FunctionDef, AsyncFunctionDef) and any(iscallec(deco) for deco in tree.decorator_list):
         fdef = tree
@@ -142,6 +142,8 @@ def detect_lambda(tree, *, collect, stop, **kw):
 def is_decorator(tree, fname):
     """Test tree whether it is the decorator ``fname``.
 
+    ``fname`` may be ``str`` or a predicate, see ``isx``.
+
     References of the forms ``f``, ``foo.f`` and ``hq[f]`` are supported.
 
      We detect:
