remove unpythonic.syntax.util.splice, use mcpyrate.splicing.splice_expression

Technologicat · Technologicat · commit 5372a66df088 · 2021-04-21T20:30:48.000+03:00
diff --git a/unpythonic/syntax/forall.py b/unpythonic/syntax/forall.py
@@ -5,7 +5,8 @@
 
 from mcpyrate.quotes import macros, q, u, n, a, h  # noqa: F401
 
-from .util import splice
+from mcpyrate.splicing import splice_expression
+
 from .letdoutil import isenvassign, UnexpandedEnvAssignView
 from ..amb import monadify
 from ..amb import insist, deny  # for re-export only  # noqa: F401
@@ -47,7 +48,7 @@ def build(lines, tree):
         else:
             body = Mv
         if tree:
-            newtree = splice(tree, body, "_here_")
+            newtree = splice_expression(body, tree, "_here_")
         else:
             newtree = body
         return build(rest, newtree)
diff --git a/unpythonic/syntax/lambdatools.py b/unpythonic/syntax/lambdatools.py
@@ -13,6 +13,7 @@
 from macropy.quick_lambda import f, _  # _ for re-export only  # noqa: F401
 
 from mcpyrate import gensym
+from mcpyrate.splicing import splice_expression
 
 from ..dynassign import dyn
 from ..misc import namelambda
@@ -23,7 +24,7 @@
 from .letdo import do
 from .letdoutil import islet, isenvassign, UnexpandedLetView, UnexpandedEnvAssignView, ExpandedDoView
 from .util import (is_decorated_lambda, isx, make_isxpred, has_deco,
-                   destructure_decorated_lambda, detect_lambda, splice)
+                   destructure_decorated_lambda, detect_lambda)
 
 def multilambda(block_body):
     @Walker
@@ -263,7 +264,7 @@ def isourupdate(thecall):
                     theupdate = Attribute(value=q[n[ename]], attr="update")
                     thecall = q[a[theupdate]()]
                     thecall.keywords = kws
-                    tree.body = splice(tree.body, thecall, "_here_")  # TODO: mcpyrate.splicing.splice_expression
+                    tree.body = splice_expression(thecall, tree.body, "_here_")
                 newbindings.update({k: Attribute(value=q[n[ename]], attr=k) for k in argnames})  # "x" --> e.x
                 set_ctx(enames=enames + [ename])
                 set_ctx(bindings=newbindings)
diff --git a/unpythonic/syntax/test/test_util.py b/unpythonic/syntax/test/test_util.py
@@ -14,7 +14,7 @@
                             is_lambda_decorator, is_decorated_lambda,
                             destructure_decorated_lambda, sort_lambda_decorators,
                             transform_statements, eliminate_ifones,
-                            splice, wrapwith, ismarker)
+                            wrapwith, ismarker)
 
 from ast import Call, Name, Constant, Expr, With, withitem
 
@@ -258,14 +258,6 @@ def ishello(tree):
         result = eliminate_ifones(eliminate_ifones_testdata8)
         test[len(result) == 1 and ishello(result[0])]
 
-    with testset("splice"):
-        with q as splice_testdata:
-            n["_here_"]
-            n["_here_"]
-        test[all(stmt.value.id == "_here_" for stmt in splice_testdata)]
-        splice(splice_testdata, q[n["replacement"]], "_here_")
-        test[all(stmt.value.id == "replacement" for stmt in splice_testdata)]
-
     with testset("wrapwith"):
         with q as wrapwith_testdata:
             42  # pragma: no cover
diff --git a/unpythonic/syntax/util.py b/unpythonic/syntax/util.py
@@ -2,9 +2,8 @@
 """Utilities for working with syntax."""
 
 from functools import partial
-from copy import deepcopy
 
-from ast import (Call, Name, Lambda, FunctionDef, AsyncFunctionDef,
+from ast import (Call, Lambda, FunctionDef, AsyncFunctionDef,
                  If, With, withitem, stmt, NodeTransformer)
 
 from macropy.core.walkers import Walker
@@ -393,26 +392,6 @@ def visit(self, node):
             return node
     return StatementTransformer().visit(body)
 
-def splice(tree, rep, tag):  # TODO: obsolete, replace with `mcpyrate.splicing.splice_expression`
-    """Splice in a tree into another tree.
-
-    Walk ``tree``, replacing all occurrences of a ``Name(id=tag)`` with
-    the tree ``rep``.
-
-    This is convenient for first building a skeleton with a marker such as
-    ``q[n["_here_"]]``, and then splicing in ``rep`` later. See ``forall``
-    and ``envify`` for usage examples.
-    """
-    @Walker
-    def doit(tree, *, stop, **kw):
-        if type(tree) is Name and tree.id == tag:
-            stop()
-            # Copy just to be on the safe side. Different instances may be
-            # edited differently by other macros expanded later.
-            return deepcopy(rep)
-        return tree
-    return doit.recurse(tree)
-
 def wrapwith(item, body, locref=None):
     """Wrap ``body`` with a single-item ``with`` block, using ``item``.
 
