fix spammage in detect_callec

Technologicat · Technologicat · commit b507d5295670 · 2019-02-25T11:44:17.000+02:00
diff --git a/unpythonic/syntax/tailtools.py b/unpythonic/syntax/tailtools.py
@@ -72,7 +72,7 @@ def transform_tailstmt(tree):
 def tco(block_body):
     # first pass, outside-in
     userlambdas = detect_lambda.collect(block_body)
-    known_ecs = list(uniqify(detect_callec.collect(block_body)))
+    known_ecs = list(uniqify(detect_callec(block_body)))
     block_body = yield block_body
 
     # second pass, inside-out
@@ -163,7 +163,7 @@ def continuations(block_body):
 
     # first pass, outside-in
     userlambdas = detect_lambda.collect(block_body)
-    known_ecs = list(uniqify(detect_callec.collect(block_body)))
+    known_ecs = list(uniqify(detect_callec(block_body)))
     block_body = yield block_body
 
     # second pass, inside-out
diff --git a/unpythonic/syntax/util.py b/unpythonic/syntax/util.py
@@ -78,8 +78,7 @@ def isec(tree, known_ecs):
     """
     return type(tree) is Call and type(tree.func) is Name and tree.func.id in known_ecs
 
-@Walker
-def detect_callec(tree, *, collect, **kw):
+def detect_callec(tree):
     """Collect names of escape continuations from call_ec invocations in tree.
 
     Currently supported and unsupported cases::
@@ -101,18 +100,19 @@ def g(ec):           # <-- should grab from here
     # literal function names that are always interpreted as an ec.
     # "brk" is needed to combo with unpythonic.fploop.breakably_looped.
     fallbacks = ["ec", "brk"]
-    for x in fallbacks:
-        collect(x)
     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
-        collect(fdef.args.args[0].arg)  # FunctionDef.arguments.(list of arg objects).arg
-    elif is_decorated_lambda(tree, mode="any"):
-        decorator_list, thelambda = destructure_decorated_lambda(tree)
-        if any(iscallec(decocall.func) for decocall in decorator_list):
-            collect(thelambda.args.args[0].arg)  # we assume it's the first arg, as that's what call_ec expects.
-    return tree
+    @Walker
+    def detect(tree, *, collect, **kw):
+        # 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
+            collect(fdef.args.args[0].arg)  # FunctionDef.arguments.(list of arg objects).arg
+        elif is_decorated_lambda(tree, mode="any"):
+            decorator_list, thelambda = destructure_decorated_lambda(tree)
+            if any(iscallec(decocall.func) for decocall in decorator_list):
+                collect(thelambda.args.args[0].arg)  # we assume it's the first arg, as that's what call_ec expects.
+        return tree
+    return fallbacks + detect.collect(tree)
 
 @Walker
 def detect_lambda(tree, *, collect, stop, **kw):
