mangles kthxbye

hy/core/__init__.py

@@ -25,7 +25,6 @@ import hy.mangle
 
 MACROS = [
     "hy.core.bootstrap",
-    "hy.core.mangles",
 ]
 
 

hy/core/mangles.py

@@ -1,120 +0,0 @@
-# Copyright (c) 2013 Paul Tagliamonte <paultag@debian.org>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-from hy.models.expression import HyExpression
-from hy.models.symbol import HySymbol
-from hy.models.list import HyList
-
-import hy.mangle
-
-
-class HoistableMangle(hy.mangle.Mangle):
-    """
-    superclass for all the mangles down below -- this contains a bunch
-    of the core logic on when we should hoist things out.
-    """
-
-    def should_hoist(self):
-        """
-        If the stack is:
-
-            - unquoted
-            - not at the top-level of the "scope" (code branch)
-            - not ignorable (something that factors out during AST render)
-
-        then we return True, otherwise, we return False.
-        """
-        for frame in self.stack:
-            if (isinstance(frame, HyExpression) and
-                    frame and frame[0] == "quote"):
-                return False
-
-        for frame in self.stack:
-            if frame is self.scope:
-                return False
-
-            if isinstance(frame, HyExpression) and frame != []:
-                call = frame[0]
-                if call in self.ignore:
-                    continue
-            return True
-        return False
-
-
-class FunctionMangle(HoistableMangle):
-    """
-    This will hoist function defs out of an inner expression (such as invoking
-    an anon function "((fn [] ...))", or using it as an arg in a call)
-    """
-
-    ignore = ["def", "with_decorator", "setf", "setv", "foreach", "do"]
-    # ^^ these guys don't affect us, really.
-
-    def __init__(self):
-        self.series = 0
-
-    def unique_name(self):
-        self.series += 1
-        return "_hy_hoisted_fn_%s" % (self.series)
-
-    def visit(self, tree):
-        """
-        Visit all the nodes in the Hy code tree.
-        """
-        if isinstance(tree, HyExpression) and tree != []:
-            call = tree[0]
-            if call == "fn" and self.should_hoist():
-                # if we have a Function and we should hoist it --
-                new_name = HySymbol(self.unique_name())
-                new_name.replace(tree)
-                fn_def = HyExpression([HySymbol("def"),
-                                       new_name,
-                                       tree])
-                fn_def.replace(tree)
-                self.hoist(fn_def)
-                return new_name
-
-
-class IfMangle(HoistableMangle):
-    """
-    This will mangle an `if' statement that's nested inside something (meaning
-    we need some sort of return statement from the (if)), we should
-    special-case the code to give us some juju.
-    """
-
-    ignore = ["foreach", "do"]
-
-    def __init__(self):
-        self.series = 0
-
-    def visit(self, tree):
-        if isinstance(tree, HyExpression) and tree != []:
-            call = tree[0]
-            if call == "if" and self.should_hoist():
-                # If we've got a hoistable if statement
-                fn = HyExpression([HyExpression([HySymbol("fn"),
-                                   HyList([]),
-                                   tree])])
-                fn.replace(tree)
-                return fn
-
-
-hy.mangle.MANGLES.append(IfMangle)
-hy.mangle.MANGLES.append(FunctionMangle)