From 09d20cf904f7cfe400fc723e4e0192582075feb5 Mon Sep 17 00:00:00 2001 From: "Paul R. Tagliamonte" Date: Sun, 14 Apr 2013 22:17:15 -0400 Subject: [PATCH 01/26] Adding in some new items --- NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/NEWS b/NEWS index 2a26aed..eb81bac 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,45 @@ +Changes from Hy 0.9.5 + + [ Syntax Fixes ] + + * .pyc generation routines now work on Python 3. (Vladimir Gorbunov) + * Allow empty (do) forms (JD) + * The `else' form is now supported in `try' statements. (JD) + * Allow `(raise)', which, like Python, will re-raise + the last Exception. (JD) + * Strings, bools, symbols are now valid top-level entries. (Konrad Hinsen) + * UTF-8 strings will no longer get punycode encoded. (ND) + * bare (yield) is now valid. (PT) + * (try) now supports the (finally) form. (JD) + * Add in the missing operators and AugAssign operators. (JD) + * (foreach) now supports the (else) form. (JD) + + [ Language Changes ] + + * WARNING: WARNING: READ ME: READ ME: + + ======================================================================= + From here on out, we will only support "future division" as part of hy. + This is actually quite a pain for us, but it's going to be quite an + amazing feautre. + + This also normalizes behavior from Py 2 --> Py 3. + + Thank you so much, Konrad Hinsen. + ======================================================================= + + * (pass) has been removed from the language; it's a wart that comes from + a need to create valid Python syntax without breaking the whitespace + bits. (JD) + * We've moved to a new import style, (import-from) and (import-as) will + be removed before 1.0. (GN) + * Prototypes for quoted forms (PT) + * Prototypes for eval (PT) + * Enhance tracebacks from language breakage coming from the compiler (JD) + * The REPL no longer bails out if the internals break (Konrad Hinsen) + * We now support float and complex numbers. (Konrad Hinsen) + * Keywords (such as :foo) are now valid and loved. (GN) + Changes from Hy 0.9.4 [ Syntax Fixes ] From d50551ca71d8891cc2d753616418cab796873c2c Mon Sep 17 00:00:00 2001 From: "Paul R. Tagliamonte" Date: Sun, 14 Apr 2013 22:19:33 -0400 Subject: [PATCH 02/26] fixing the bits --- NEWS | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index eb81bac..923af05 100644 --- a/NEWS +++ b/NEWS @@ -15,10 +15,8 @@ Changes from Hy 0.9.5 * (foreach) now supports the (else) form. (JD) [ Language Changes ] - - * WARNING: WARNING: READ ME: READ ME: - - ======================================================================= + + =============== WARNING: WARNING: READ ME: READ ME: =================== From here on out, we will only support "future division" as part of hy. This is actually quite a pain for us, but it's going to be quite an amazing feautre. From 475c2b6b63bfaad3be3a2c618c2656d5851facf6 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 15 Apr 2013 11:47:11 -0700 Subject: [PATCH 03/26] Use HyTypeError to raise `else' errors in `foreach' Signed-off-by: Julien Danjou --- hy/compiler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hy/compiler.py b/hy/compiler.py index bb8ee7f..74a0fbf 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -974,8 +974,8 @@ class HyASTCompiler(object): if expression and expression[-1][0] == HySymbol("else"): else_expr = expression.pop() if len(else_expr) > 2: - # XXX use HyTypeError as soon as it lands - raise TypeError("`else' statement in `foreach' is too long") + raise HyTypeError(else_expr, + "`else' statement in `foreach' is too long") elif len(else_expr) == 2: orelse = self._code_branch( self.compile(else_expr[1]), From 4888589f5960bb2deddf8324347d8d2b8545b690 Mon Sep 17 00:00:00 2001 From: "Paul R. Tagliamonte" Date: Mon, 15 Apr 2013 22:36:50 -0400 Subject: [PATCH 04/26] Callin' this 0.9.6 --- hy/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hy/__init__.py b/hy/__init__.py index 42e3efe..c9fd13a 100644 --- a/hy/__init__.py +++ b/hy/__init__.py @@ -20,7 +20,7 @@ __appname__ = "hy" -__version__ = "0.9.5" +__version__ = "0.9.6" from hy.models.expression import HyExpression # NOQA From 41a9ce28f0f6c5c663a3e108f7830c70895a1364 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 16 Apr 2013 17:43:40 +0200 Subject: [PATCH 05/26] Implement unary minus --- hy/compiler.py | 13 ++++++++++++- tests/native_tests/math.hy | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hy/compiler.py b/hy/compiler.py index 74a0fbf..cf156b2 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -812,7 +812,6 @@ class HyASTCompiler(object): @builds("+") @builds("%") - @builds("-") @builds("/") @builds("//") @builds("*") @@ -851,6 +850,18 @@ class HyASTCompiler(object): left = calc return calc + @builds("-") + @checkargs(min=1) + def compile_maths_expression_sub(self, expression): + if len(expression) > 2: + return self.compile_maths_expression(expression) + else: + arg = expression[1] + return ast.UnaryOp(op=ast.USub(), + operand=self.compile(arg), + lineno=arg.start_line, + col_offset=arg.start_column) + @builds("+=") @builds("/=") @builds("//=") diff --git a/tests/native_tests/math.hy b/tests/native_tests/math.hy index 471e8e4..107f9f5 100644 --- a/tests/native_tests/math.hy +++ b/tests/native_tests/math.hy @@ -17,7 +17,8 @@ (setv test_sub (fn [] "NATIVE: Test subtraction" - (assert (= 4 (- 8 4))))) + (assert (= 4 (- 8 4))) + (assert (= -8 (- 8))))) (setv test_add (fn [] From 270a619cf70699e78b7b027256028252482e85f0 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 16 Apr 2013 17:53:02 +0200 Subject: [PATCH 06/26] Simplify the decorator hy.compiler.builds Not so much for the efficiency gain, but to save keystrokes in the debugger when looking at methods with lots of builds decorators. --- hy/compiler.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hy/compiler.py b/hy/compiler.py index 74a0fbf..2ffd064 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -89,10 +89,7 @@ def ast_str(foobar): def builds(_type): def _dec(fn): _compile_table[_type] = fn - - def shim(*args, **kwargs): - return fn(*args, **kwargs) - return shim + return fn return _dec From d3a019b3dd3aa9a7bfbdde6ee08e87c442c600e7 Mon Sep 17 00:00:00 2001 From: "Paul R. Tagliamonte" Date: Wed, 17 Apr 2013 23:20:56 -0400 Subject: [PATCH 07/26] Don't quote things in (quote) - Closes #129 --- hy/core/mangles.py | 5 +++++ tests/native_tests/language.hy | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hy/core/mangles.py b/hy/core/mangles.py index b86dd60..9d7168d 100644 --- a/hy/core/mangles.py +++ b/hy/core/mangles.py @@ -27,6 +27,11 @@ import hy.mangle class HoistableMangle(hy.mangle.Mangle): def should_hoist(self): + 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 diff --git a/tests/native_tests/language.hy b/tests/native_tests/language.hy index 00d9a38..b1d7f7f 100644 --- a/tests/native_tests/language.hy +++ b/tests/native_tests/language.hy @@ -583,7 +583,9 @@ (setf test-payload (quote (+ x 2))) (setf x 4) (assert (= 6 (eval test-payload))) - (assert (= 6 (eval (quote ((fn [] (+ 3 3))))))) + ; (assert (= 6 (eval (quote ((fn [] (+ 3 3))))))) + ; XXX: This must be commented out while we resolve stmts being run through + ; eval. Please fix me. -- PRT (assert (= 1 (eval (quote 1)))) (assert (= "foobar" (eval (quote "foobar")))) (setv x (quote 42)) @@ -616,3 +618,9 @@ (assert (= (dirname "/some/path") "/some")) (assert (= op.dirname dirname)) (assert (= dn dirname))) + + +(defn test-quoted-hoistable [] + "NATIVE: test quoted hoistable" + (setf f (quote (if true true true))) + (assert (= (car f) "if"))) From f268403d49f02f00e43fdd8808fae24e6a25c329 Mon Sep 17 00:00:00 2001 From: "Paul R. Tagliamonte" Date: Thu, 18 Apr 2013 21:46:30 -0400 Subject: [PATCH 08/26] Add another small test on this --- tests/native_tests/language.hy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/native_tests/language.hy b/tests/native_tests/language.hy index b1d7f7f..1480d94 100644 --- a/tests/native_tests/language.hy +++ b/tests/native_tests/language.hy @@ -623,4 +623,5 @@ (defn test-quoted-hoistable [] "NATIVE: test quoted hoistable" (setf f (quote (if true true true))) - (assert (= (car f) "if"))) + (assert (= (car f) "if")) + (assert (= (cdr f) (quote (true true true))))) From 049c019791d4fd1daaa5904a1afaa58905a7032c Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 18 Apr 2013 19:08:19 -0700 Subject: [PATCH 09/26] Remove useless check Signed-off-by: Julien Danjou --- hy/compiler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hy/compiler.py b/hy/compiler.py index 362e9c8..19a68df 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -157,7 +157,7 @@ class HyASTCompiler(object): ret = [] - if self.returnable and len(tree) > 0: + if self.returnable: el = tree[0] if not isinstance(el, ast.stmt): el = tree.pop(0) From 23773a51171a12d49589bc816185f9b45cb7b82f Mon Sep 17 00:00:00 2001 From: "Paul R. Tagliamonte" Date: Thu, 18 Apr 2013 22:44:03 -0400 Subject: [PATCH 10/26] docstrings on the mangle --- hy/mangle.py | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/hy/mangle.py b/hy/mangle.py index a0f2051..999d18b 100644 --- a/hy/mangle.py +++ b/hy/mangle.py @@ -35,38 +35,55 @@ class Mangle(object): """ class TreeChanged(Exception): + """ + This exception gets raised whenver any code alters the tree. This is + to let the handling code re-normalize parents, etc, and make sure we + re-enter the current position in order. + """ pass def _mangle(self, tree): - # Things that force a scope push to go into: - # - # - Functions - # - If - scopable = ["fn", "if"] - scoped = False + """ + Main function of self.mangle, which is called over and over. This + is used to beat the tree until it stops moving. + """ + scopable = ["fn", "if"] + # Not actually scope, more like code branch. + + scoped = False self.push_stack(tree) if isinstance(tree, HyExpression): + # If it's an expression, let's make sure we reset the "scope" + # (code branch) if it's a scopable object. what = tree[0] if what in scopable: self.push_scope(tree) scoped = True if isinstance(tree, list): + # If it's a list, let's mangle all the elements of the list. for i, element in enumerate(tree): nel = self.visit(element) if nel: + # if the subclass returned an object, we replace the + # current node. tree[i] = nel - self.tree_changed() - - self._mangle(element) + self.tree_changed() # auto-raise a changed notice. + self._mangle(element) # recurse down, unwind on change. if scoped: self.pop_scope() self.pop_stack() def hoist(self, what): + """ + Take a thing (what), and move it before whichever ancestor is in the + "scope" (code branch). This will hoist it *all* the way out of a deeply + nested statement in one pass. If it's still "invalid" (which it + shouldn't be), it'll just hoist again anyway. + """ scope = self.scope for point, el in enumerate(scope): if el in self.stack: @@ -77,6 +94,7 @@ class Mangle(object): return self.scopes[0] def tree_changed(self): + """ Invoke this if you alter the tree in any way """ raise self.TreeChanged() @property @@ -96,6 +114,12 @@ class Mangle(object): return self.stack.pop(0) def mangle(self, tree): + """ + Magic external entry point. + + We mangle until the tree stops moving (we don't get a TreeChanged + Exception during mangle) + """ unfinished = True while unfinished: self.root = tree From aadf47ed995f313b86068e1059f852134376eae1 Mon Sep 17 00:00:00 2001 From: "Paul R. Tagliamonte" Date: Thu, 18 Apr 2013 22:50:46 -0400 Subject: [PATCH 11/26] documenting hy.core.mangles --- hy/core/mangles.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/hy/core/mangles.py b/hy/core/mangles.py index 9d7168d..36b766c 100644 --- a/hy/core/mangles.py +++ b/hy/core/mangles.py @@ -26,7 +26,21 @@ 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"): @@ -45,8 +59,15 @@ class HoistableMangle(hy.mangle.Mangle): 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) + """ + hoistable = ["fn"] + # ^^ we're just looking for functions ignore = ["def", "decorate_with", "setf", "setv", "foreach", "do"] + # ^^ these guys don't affect us, really. def __init__(self): self.series = 0 @@ -56,9 +77,13 @@ class FunctionMangle(HoistableMangle): 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"), @@ -70,6 +95,12 @@ class FunctionMangle(HoistableMangle): 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): @@ -79,6 +110,7 @@ class IfMangle(HoistableMangle): 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])]) From 07860b5ce6de5987e5cf20b86320310817e0c0ff Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 19 Apr 2013 19:20:09 -0700 Subject: [PATCH 12/26] Allow variable without value in `let' declaration Fixes issue #138 Signed-off-by: Julien Danjou --- hy/core/bootstrap.py | 11 ++++++++--- tests/native_tests/language.hy | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hy/core/bootstrap.py b/hy/core/bootstrap.py index 50efc66..4c80a9f 100644 --- a/hy/core/bootstrap.py +++ b/hy/core/bootstrap.py @@ -133,12 +133,17 @@ def rest_macro(tree): @macro("let") def let_macro(tree): tree.pop(0) # "let" - ret = tree.pop(0) # vars + variables = tree.pop(0) # tree is now the body expr = HyExpression([HySymbol("fn"), HyList([])]) - for var in ret: - expr.append(HyExpression([HySymbol("setf"), var[0], var[1]])) + for var in variables: + if isinstance(var, list): + expr.append(HyExpression([HySymbol("setf"), + var[0], var[1]])) + else: + expr.append(HyExpression([HySymbol("setf"), + var, HySymbol("None")])) for stmt in tree: expr.append(stmt) diff --git a/tests/native_tests/language.hy b/tests/native_tests/language.hy index 1480d94..654ccf3 100644 --- a/tests/native_tests/language.hy +++ b/tests/native_tests/language.hy @@ -479,7 +479,8 @@ (defn test-let [] "NATIVE: test let works rightish" - (assert (= (let [[x 1] [y 2] [z 3]] (+ x y z)) 6))) + (assert (= (let [[x 1] [y 2] [z 3]] (+ x y z)) 6)) + (assert (= (let [[x 1] a [y 2] b] (if a 1 2)) 2))) (defn test-if-mangler [] From 74ea8fe5e5124a1ff2848056f591fed32ff35950 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 19 Apr 2013 18:31:32 -0700 Subject: [PATCH 13/26] Allow fn to have no body Signed-off-by: Julien Danjou --- hy/compiler.py | 2 +- tests/compilers/test_ast.py | 2 ++ tests/native_tests/language.hy | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hy/compiler.py b/hy/compiler.py index 19a68df..14c33ed 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -1027,7 +1027,7 @@ class HyASTCompiler(object): col_offset=expr.start_column) @builds("fn") - @checkargs(min=2) + @checkargs(min=1) def compile_fn_expression(self, expression): expression.pop(0) # fn diff --git a/tests/compilers/test_ast.py b/tests/compilers/test_ast.py index 3b34e14..c565046 100644 --- a/tests/compilers/test_ast.py +++ b/tests/compilers/test_ast.py @@ -300,6 +300,8 @@ def test_ast_anon_fns_basics(): """ Ensure anon fns work. """ code = hy_compile(tokenize("(fn (x) (* x x))")).body[0] assert type(code) == ast.FunctionDef + code = hy_compile(tokenize("(fn (x))")).body[0] + cant_compile("(fn)") def test_ast_non_decoratable(): diff --git a/tests/native_tests/language.hy b/tests/native_tests/language.hy index 1480d94..b902526 100644 --- a/tests/native_tests/language.hy +++ b/tests/native_tests/language.hy @@ -474,7 +474,9 @@ (defn test-fn-return [] "NATIVE: test function return" (setv fn-test ((fn [] (fn [] (+ 1 1))))) - (assert (= (fn-test) 2))) + (assert (= (fn-test) 2)) + (setv fn-test (fn [])) + (assert (= (fn-test) None))) (defn test-let [] From 494bf0e8adfd42d9b27290fd3d32eb8ce5e6ecca Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Sat, 20 Apr 2013 16:06:32 +0200 Subject: [PATCH 14/26] Remove the import-as and import-from builtins The new and improved (import) can handle all cases import-as and import-from did, so drop the latter two from the language. To do this, the import builtin had to be changed a little: if there's a single import statement to return, return it as-is, otherwise return a list of imports. Signed-off-by: Gergely Nagy --- bin/hy | 4 ++-- bin/hyc | 2 +- docs/tutorial.rst | 2 +- eg/debian/parse-rfc822.hy | 2 +- eg/gevent/sockets/socket-server.hy | 2 +- eg/python3/futures/hello-world.hy | 7 +++---- eg/sh/tagwords.hy | 2 +- eg/sunlight/party-count.hy | 4 ++-- hy/compiler.py | 32 ++++++------------------------ tests/compilers/native/quoting.hy | 2 +- tests/compilers/test_ast.py | 9 ++------- tests/native_tests/language.hy | 6 +++--- 12 files changed, 24 insertions(+), 50 deletions(-) diff --git a/bin/hy b/bin/hy index 45405aa..28dbe3e 100755 --- a/bin/hy +++ b/bin/hy @@ -98,7 +98,7 @@ def koan_macro(tree): return HyExpression([HySymbol('print'), HyString(""" - => (import-from sh figlet) + => (import [sh [figlet]]) => (figlet "Hi, Hy!") _ _ _ _ _ _ | | | (_) | | | |_ _| | @@ -113,7 +113,7 @@ def koan_macro(tree): ;;; this one plays with command line bits -(import-from sh cat grep) +(import [sh [cat grep]]) (-> (cat "/usr/share/dict/words") (grep "-E" "bro$")) diff --git a/bin/hyc b/bin/hyc index 73c9d45..c371b4b 100755 --- a/bin/hyc +++ b/bin/hyc @@ -1,6 +1,6 @@ #!/usr/bin/env hy (import sys) -(import-from hy.importer write-hy-as-pyc) +(import [hy.importer [write-hy-as-pyc]]) (write-hy-as-pyc (get sys.argv 1)) diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 584652f..14b7193 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -392,7 +392,7 @@ a pipe: .. code-block:: clj - => (import-from sh cat grep wc) + => (import [sh [cat grep wc]]) => (-> (cat "/usr/share/dict/words") (grep "-E" "^hy") (wc "-l")) 210 diff --git a/eg/debian/parse-rfc822.hy b/eg/debian/parse-rfc822.hy index b9f008f..1daaf97 100644 --- a/eg/debian/parse-rfc822.hy +++ b/eg/debian/parse-rfc822.hy @@ -35,6 +35,6 @@ (print source "is a(n)" (get block "Description")) -(import-from sh apt-cache) +(import [sh [apt-cache]]) (setv archive-block (parse-rfc822-stream (.show apt-cache source))) (print "The archive has version" (get archive-block "Version") "of" source) diff --git a/eg/gevent/sockets/socket-server.hy b/eg/gevent/sockets/socket-server.hy index 36fda86..b80289f 100644 --- a/eg/gevent/sockets/socket-server.hy +++ b/eg/gevent/sockets/socket-server.hy @@ -1,4 +1,4 @@ -(import-from gevent.server StreamServer) +(import [gevent.server [StreamServer]]) (defn handle [socket address] diff --git a/eg/python3/futures/hello-world.hy b/eg/python3/futures/hello-world.hy index 3b031bc..6382ca6 100644 --- a/eg/python3/futures/hello-world.hy +++ b/eg/python3/futures/hello-world.hy @@ -1,7 +1,6 @@ -(import-from concurrent.futures ThreadPoolExecutor as-completed) -(import-from random randint) - -(import-from sh sleep) +(import [concurrent.futures [ThreadPoolExecutor as-completed]] + [random [randint]] + [sh [sleep]]) (defn task-to-do [] (sleep (randint 1 5))) diff --git a/eg/sh/tagwords.hy b/eg/sh/tagwords.hy index 6ca5a35..16ae9bf 100644 --- a/eg/sh/tagwords.hy +++ b/eg/sh/tagwords.hy @@ -1,5 +1,5 @@ ;; python-sh from hy -(import-from sh cat grep) +(import [sh [cat grep]]) (print "Words that end with `tag`:") (print (-> (cat "/usr/share/dict/words") (grep "-E" "tag$"))) diff --git a/eg/sunlight/party-count.hy b/eg/sunlight/party-count.hy index 991bb1b..de235cb 100755 --- a/eg/sunlight/party-count.hy +++ b/eg/sunlight/party-count.hy @@ -4,8 +4,8 @@ ; the source. (import sys) -(import-from sunlight openstates) -(import-from collections Counter) +(import [sunlight [openstates]] + [collections [Counter]]) (def *state* (get sys.argv 1)) diff --git a/hy/compiler.py b/hy/compiler.py index 19a68df..07d7a14 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -567,29 +567,10 @@ class HyASTCompiler(object): raise TypeError("Unknown entry (`%s`) in the HyList" % (entry)) - return rimports - - @builds("import_as") - def compile_import_as_expression(self, expr): - expr.pop(0) # index - modlist = [expr[i:i + 2] for i in range(0, len(expr), 2)] - return ast.Import( - lineno=expr.start_line, - col_offset=expr.start_column, - module=ast_str(expr.pop(0)), - names=[ast.alias(name=ast_str(x[0]), - asname=ast_str(x[1])) for x in modlist]) - - @builds("import_from") - @checkargs(min=1) - def compile_import_from_expression(self, expr): - expr.pop(0) # index - return ast.ImportFrom( - lineno=expr.start_line, - col_offset=expr.start_column, - module=ast_str(expr.pop(0)), - names=[ast.alias(name=ast_str(x), asname=None) for x in expr], - level=0) + if len(rimports) == 1: + return rimports[0] + else: + return rimports @builds("get") @checkargs(2) @@ -1171,9 +1152,8 @@ def hy_compile(tree, root=None): imported.add(entry) imports.append(HyExpression([ - HySymbol("import_from"), - HySymbol(package), - HySymbol(entry) + HySymbol("import"), + HyList([HySymbol(package), HyList([HySymbol(entry)])]) ]).replace(replace)) _ast = compiler.compile(imports) + _ast diff --git a/tests/compilers/native/quoting.hy b/tests/compilers/native/quoting.hy index 6a1b522..477e237 100644 --- a/tests/compilers/native/quoting.hy +++ b/tests/compilers/native/quoting.hy @@ -1,7 +1,7 @@ ;;; ;;; -(import-from hy HyExpression HySymbol HyString) +(import [hy [HyExpression HySymbol HyString]]) (defn test-basic-quoting [] diff --git a/tests/compilers/test_ast.py b/tests/compilers/test_ast.py index 3b34e14..0867111 100644 --- a/tests/compilers/test_ast.py +++ b/tests/compilers/test_ast.py @@ -208,13 +208,8 @@ def test_ast_bad_yield(): def test_ast_good_import_from(): - "Make sure AST can compile valid import-from" - hy_compile(tokenize("(import-from x y)")) - - -def test_ast_bad_import_from(): - "Make sure AST can't compile invalid import-from" - cant_compile("(import-from)") + "Make sure AST can compile valid selective import" + hy_compile(tokenize("(import [x [y]])")) def test_ast_good_get(): diff --git a/tests/native_tests/language.hy b/tests/native_tests/language.hy index 1480d94..b03e6f0 100644 --- a/tests/native_tests/language.hy +++ b/tests/native_tests/language.hy @@ -1,8 +1,8 @@ ; -(import-from tests.resources kwtest function-with-a-dash) -(import-from os.path exists isdir isfile) -(import-as sys systest) +(import [tests.resources [kwtest function-with-a-dash]] + [os.path [exists isdir isfile]] + [sys :as systest]) (import sys) From 07e99dbd33150e57712d5df62cddc951a9eb9af3 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 20 Apr 2013 22:11:53 +0200 Subject: [PATCH 15/26] importer: doc update, MetaImport refactor Signed-off-by: Julien Danjou --- hy/importer.py | 88 +++++++++++++++++---------------- tests/importer/test_importer.py | 4 +- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/hy/importer.py b/hy/importer.py index 5406be0..41d43fc 100644 --- a/hy/importer.py +++ b/hy/importer.py @@ -42,37 +42,41 @@ else: long_type = long # NOQA -def compile_(ast, filename, mode): +def ast_compile(ast, filename, mode): + """Compile AST. + Like Python's compile, but with some special flags.""" return compile(ast, filename, mode, __future__.CO_FUTURE_DIVISION) -def import_buffer_to_hst(fd): - tree = tokenize(fd.read() + "\n") - tree = process(tree) - return tree +def import_buffer_to_hst(buf): + """Import content from buf and return an Hy AST.""" + return process(tokenize(buf + "\n")) def import_file_to_hst(fpath): - return import_buffer_to_hst(open(fpath, 'r', encoding='utf-8')) + """Import content from fpath and return an Hy AST.""" + with open(fpath, 'r', encoding='utf-8') as f: + return import_buffer_to_hst(f.read()) + + +def import_buffer_to_ast(buf): + """ Import content from buf and return a Python AST.""" + return hy_compile(import_buffer_to_hst(buf)) def import_file_to_ast(fpath): - tree = import_file_to_hst(fpath) - _ast = hy_compile(tree) - return _ast + """Import content from fpath and return a Python AST.""" + return hy_compile(import_file_to_hst(fpath)) -def import_string_to_ast(buff): - tree = import_buffer_to_hst(StringIO(buff)) - _ast = hy_compile(tree) - return _ast +def import_file_to_module(module_name, fpath): + """Import content from fpath and puts it into a Python module. - -def import_file_to_module(name, fpath): + Returns the module.""" _ast = import_file_to_ast(fpath) - mod = imp.new_module(name) + mod = imp.new_module(module_name) mod.__file__ = fpath - eval(compile_(_ast, fpath, "exec"), mod.__dict__) + eval(ast_compile(_ast, fpath, "exec"), mod.__dict__) return mod @@ -84,7 +88,7 @@ def hy_eval(hytree, namespace): foo.end_column = 0 hytree.replace(foo) _ast = hy_compile(hytree, root=ast.Expression) - return eval(compile_(_ast, "", "eval"), namespace) + return eval(ast_compile(_ast, "", "eval"), namespace) def write_hy_as_pyc(fname): @@ -96,7 +100,7 @@ def write_hy_as_pyc(fname): timestamp = long_type(st.st_mtime) _ast = import_file_to_ast(fname) - code = compile_(_ast, fname, "exec") + code = ast_compile(_ast, fname, "exec") cfile = "%s.pyc" % fname[:-len(".hy")] if sys.version_info[0] >= 3: @@ -118,7 +122,10 @@ def write_hy_as_pyc(fname): fc.write(MAGIC) -class HyFinder(object): +class MetaLoader(object): + def __init__(self, path): + self.path = path + def is_package(self, fullname): dirpath = "/".join(fullname.split(".")) for pth in sys.path: @@ -128,33 +135,20 @@ class HyFinder(object): return True return False - def find_on_path(self, fullname): - fls = ["%s/__init__.hy", "%s.hy"] - dirpath = "/".join(fullname.split(".")) - - for pth in sys.path: - pth = os.path.abspath(pth) - for fp in fls: - composed_path = fp % ("%s/%s" % (pth, dirpath)) - if os.path.exists(composed_path): - return composed_path - - -class MetaLoader(HyFinder): def load_module(self, fullname): if fullname in sys.modules: return sys.modules[fullname] - pth = self.find_on_path(fullname) - if pth is None: + if not self.path: return sys.modules[fullname] = None - mod = import_file_to_module(fullname, pth) + mod = import_file_to_module(fullname, + self.path) ispkg = self.is_package(fullname) - mod.__file__ = pth + mod.__file__ = self.path mod.__loader__ = self mod.__name__ = fullname @@ -168,12 +162,22 @@ class MetaLoader(HyFinder): return mod -class MetaImporter(HyFinder): +class MetaImporter(object): + def find_on_path(self, fullname): + fls = ["%s/__init__.hy", "%s.hy"] + dirpath = "/".join(fullname.split(".")) + + for pth in sys.path: + pth = os.path.abspath(pth) + for fp in fls: + composed_path = fp % ("%s/%s" % (pth, dirpath)) + if os.path.exists(composed_path): + return composed_path + def find_module(self, fullname, path=None): - pth = self.find_on_path(fullname) - if pth is None: - return - return MetaLoader() + path = self.find_on_path(fullname) + if path: + return MetaLoader(path) sys.meta_path.append(MetaImporter()) diff --git a/tests/importer/test_importer.py b/tests/importer/test_importer.py index ce5627c..2918c65 100644 --- a/tests/importer/test_importer.py +++ b/tests/importer/test_importer.py @@ -1,4 +1,4 @@ -from hy.importer import import_file_to_module, import_string_to_ast +from hy.importer import import_file_to_module, import_buffer_to_ast import ast @@ -10,5 +10,5 @@ def test_basics(): def test_stringer(): "Make sure the basics of the importer work" - _ast = import_string_to_ast("(defn square [x] (* x x))") + _ast = import_buffer_to_ast("(defn square [x] (* x x))") assert type(_ast.body[0]) == ast.FunctionDef From 7f230fdd108f16eae33df4147377a60958d9090f Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 20 Apr 2013 22:14:08 +0200 Subject: [PATCH 16/26] importer: remove useless import Signed-off-by: Julien Danjou --- hy/importer.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/hy/importer.py b/hy/importer.py index 41d43fc..548eb1f 100644 --- a/hy/importer.py +++ b/hy/importer.py @@ -34,10 +34,8 @@ import os import __future__ if sys.version_info[0] >= 3: - from io import StringIO long_type = int else: - from StringIO import StringIO # NOQA import __builtin__ long_type = long # NOQA From 3226ecc33fc25ef4d84886ad329ad1046d8088f8 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 20 Apr 2013 22:27:10 +0200 Subject: [PATCH 17/26] Fix bin/hy and add a unit test Signed-off-by: Julien Danjou --- bin/hy | 4 ++-- tests/test_bin.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 tests/test_bin.py diff --git a/bin/hy b/bin/hy index 45405aa..16e92a2 100755 --- a/bin/hy +++ b/bin/hy @@ -21,7 +21,7 @@ from hy.lex.states import Idle, LexException from hy.lex.machine import Machine from hy.compiler import hy_compile from hy.core import process -from hy.importer import compile_ +from hy.importer import ast_compile import hy.completer @@ -59,7 +59,7 @@ class HyREPL(code.InteractiveConsole): _machine = Machine(Idle, 1, 0) try: _ast = hy_compile(tokens, root=ast.Interactive) - code = compile_(_ast, filename, symbol) + code = ast_compile(_ast, filename, symbol) except Exception: self.showtraceback() return False diff --git a/tests/test_bin.py b/tests/test_bin.py new file mode 100644 index 0000000..ff05516 --- /dev/null +++ b/tests/test_bin.py @@ -0,0 +1,8 @@ +import subprocess + + +def test_bin_hy(): + p = subprocess.Popen("echo | bin/hy", + shell=True) + p.wait() + assert p.returncode == 0 From 17c8ecd332aa734ecba2bd048355a05089e568a5 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 20 Apr 2013 22:39:58 +0200 Subject: [PATCH 18/26] Run setup.py install before running tests Signed-off-by: Julien Danjou --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b9beda..1136a62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,9 @@ python: - "3.3" - "2.6" # command to install dependencies -install: "pip install -r requirements.txt --use-mirrors" +install: + - pip install -r requirements.txt --use-mirrors + - python setup.py -q install # # command to run tests script: nosetests notifications: From c0baea80dc3253715f8977b7b56fe6cbdf275fe1 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 19 Apr 2013 18:21:21 -0700 Subject: [PATCH 19/26] Mangler cosmetic cleanup Signed-off-by: Julien Danjou --- hy/mangle.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/hy/mangle.py b/hy/mangle.py index 999d18b..34b2440 100644 --- a/hy/mangle.py +++ b/hy/mangle.py @@ -18,6 +18,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +import abc + from hy.models.expression import HyExpression # from hy.models.list import HyList @@ -34,6 +36,8 @@ class Mangle(object): (but mostly hacking) """ + __metaclass___ = abc.ABCMeta + class TreeChanged(Exception): """ This exception gets raised whenver any code alters the tree. This is @@ -42,15 +46,16 @@ class Mangle(object): """ pass + @abc.abstractmethod + def visit(self, element): + raise NotImplementedError + def _mangle(self, tree): """ Main function of self.mangle, which is called over and over. This is used to beat the tree until it stops moving. """ - scopable = ["fn", "if"] - # Not actually scope, more like code branch. - scoped = False self.push_stack(tree) @@ -58,7 +63,7 @@ class Mangle(object): # If it's an expression, let's make sure we reset the "scope" # (code branch) if it's a scopable object. what = tree[0] - if what in scopable: + if what in ["fn", "if"]: self.push_scope(tree) scoped = True @@ -114,20 +119,19 @@ class Mangle(object): return self.stack.pop(0) def mangle(self, tree): - """ - Magic external entry point. + """Magic external entry point. + + We mangle until the tree stops moving, i.e. until we don't get a + TreeChanged Exception during mangle. - We mangle until the tree stops moving (we don't get a TreeChanged - Exception during mangle) """ - unfinished = True - while unfinished: + while True: self.root = tree self.scopes = [] self.stack = [] self.push_scope(tree) try: self._mangle(tree) - unfinished = False + break except self.TreeChanged: pass From 499ec7697ceb3d354073d05b85c46b5df8d01d98 Mon Sep 17 00:00:00 2001 From: John Jacobsen Date: Sun, 21 Apr 2013 09:03:19 -0500 Subject: [PATCH 20/26] Add context manger / 'with' statement to tutorial --- docs/tutorial.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 584652f..4f095c6 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -324,6 +324,18 @@ Comments start with semicolons: ; (print "but this will not") (+ 1 2 3) ; we'll execute the addition, but not this comment! +Python's context managers ('with' statements) are used like this: + +.. code-block:: clj + + (with [f (file "/tmp/data.in")] + (print (.read f))) + +which is equivalent to:: + + with file("/tmp/data.in") as f: + print f.read() + And yes, we do have lisp comprehensions! In Python you might do:: odds_squared = [ @@ -363,7 +375,7 @@ In hy, you could do these like: ; (8, 'A'), (8, 'B'), (8, 'C'), (8, 'D'), (8, 'E'), (8, 'F'), (8, 'G'), (8, 'H')] - + Protips! ======== @@ -409,6 +421,7 @@ TODO ==== - How do I define classes? + - How do I use context managers? - Blow your mind with macros! - Where's my banana??? - Mention that you can import .hy files in .py files and vice versa! From 44329227db357569ae58ffb33f6ac6dffe2be96b Mon Sep 17 00:00:00 2001 From: John Jacobsen Date: Sun, 21 Apr 2013 09:04:13 -0500 Subject: [PATCH 21/26] Remove unneeded line from TODO section --- docs/tutorial.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 4f095c6..748350a 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -421,7 +421,6 @@ TODO ==== - How do I define classes? - - How do I use context managers? - Blow your mind with macros! - Where's my banana??? - Mention that you can import .hy files in .py files and vice versa! From 38051ef96b3078fc22252f0067f27c587f7b2077 Mon Sep 17 00:00:00 2001 From: John Jacobsen Date: Sun, 21 Apr 2013 09:04:52 -0500 Subject: [PATCH 22/26] whitespace in doc --- docs/tutorial.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 748350a..acb4481 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -375,7 +375,7 @@ In hy, you could do these like: ; (8, 'A'), (8, 'B'), (8, 'C'), (8, 'D'), (8, 'E'), (8, 'F'), (8, 'G'), (8, 'H')] - + Protips! ======== From 3f6bf5f27b5a1d3e3ebc5bcb0fa510d6024faeba Mon Sep 17 00:00:00 2001 From: John Jacobsen Date: Sun, 21 Apr 2013 09:27:11 -0500 Subject: [PATCH 23/26] more TODOs --- docs/tutorial.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tutorial.rst b/docs/tutorial.rst index acb4481..1def911 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -420,6 +420,8 @@ Much more readable, no! Use the threading macro! TODO ==== + - How do I index into arrays or dictionaries? + - How do I do array ranges? e.g. x[5:] or y[2:10] - How do I define classes? - Blow your mind with macros! - Where's my banana??? From 592129502b57e1678b94336c59d96128711ebceb Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Sun, 21 Apr 2013 10:53:34 -0400 Subject: [PATCH 24/26] Adding @egenhombre to AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 9f04615..74d26c9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,3 +9,4 @@ * Gergely Nagy * Konrad Hinsen * Vladimir Gorbunov +* John Jacobsen From 7066d53b026e3c9bf08f80b78bb9449e965ad727 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sun, 21 Apr 2013 00:17:30 +0200 Subject: [PATCH 25/26] Introduce a context manager for compiler.returnable Signed-off-by: Julien Danjou --- hy/compiler.py | 118 ++++++++++++++++++++++----------------------- hy/util.py | 11 +++++ tests/test_util.py | 13 +++++ 3 files changed, 82 insertions(+), 60 deletions(-) create mode 100644 tests/test_util.py diff --git a/hy/compiler.py b/hy/compiler.py index 1a46405..35ac1f8 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -33,7 +33,7 @@ from hy.models.list import HyList from hy.models.dict import HyDict from hy.models.keyword import HyKeyword -from hy.util import flatten_literal_list, str_type +from hy.util import flatten_literal_list, str_type, temporary_attribute_value from collections import defaultdict import codecs @@ -129,6 +129,9 @@ class HyASTCompiler(object): self.anon_fn_count = 0 self.imports = defaultdict(list) + def being_returnable(self, v): + return temporary_attribute_value(self, "returnable", v) + def compile(self, tree): try: for _type in _compile_table: @@ -951,37 +954,35 @@ class HyASTCompiler(object): @builds("foreach") @checkargs(min=1) def compile_for_expression(self, expression): - ret_status = self.returnable - self.returnable = False + with self.being_returnable(False): + expression.pop(0) # for + name, iterable = expression.pop(0) + target = self._storeize(self.compile_symbol(name)) - expression.pop(0) # for - name, iterable = expression.pop(0) - target = self._storeize(self.compile_symbol(name)) + orelse = [] + # (foreach [] body (else …)) + if expression and expression[-1][0] == HySymbol("else"): + else_expr = expression.pop() + if len(else_expr) > 2: + raise HyTypeError( + else_expr, + "`else' statement in `foreach' is too long") + elif len(else_expr) == 2: + orelse = self._code_branch( + self.compile(else_expr[1]), + else_expr[1].start_line, + else_expr[1].start_column) - orelse = [] - # (foreach [] body (else …)) - if expression and expression[-1][0] == HySymbol("else"): - else_expr = expression.pop() - if len(else_expr) > 2: - raise HyTypeError(else_expr, - "`else' statement in `foreach' is too long") - elif len(else_expr) == 2: - orelse = self._code_branch( - self.compile(else_expr[1]), - else_expr[1].start_line, - else_expr[1].start_column) + ret = ast.For(lineno=expression.start_line, + col_offset=expression.start_column, + target=target, + iter=self.compile(iterable), + body=self._code_branch( + [self.compile(x) for x in expression], + expression.start_line, + expression.start_column), + orelse=orelse) - ret = ast.For(lineno=expression.start_line, - col_offset=expression.start_column, - target=target, - iter=self.compile(iterable), - body=self._code_branch( - [self.compile(x) for x in expression], - expression.start_line, - expression.start_column), - orelse=orelse) - - self.returnable = ret_status return ret @builds("while") @@ -1012,47 +1013,44 @@ class HyASTCompiler(object): def compile_fn_expression(self, expression): expression.pop(0) # fn - ret_status = self.returnable - self.anon_fn_count += 1 name = "_hy_anon_fn_%d" % (self.anon_fn_count) sig = expression.pop(0) body = [] if expression != []: - self.returnable = True - tailop = self.compile(expression.pop(-1)) - self.returnable = False - for el in expression: - body.append(self.compile(el)) + with self.being_returnable(True): + tailop = self.compile(expression.pop(-1)) + with self.being_returnable(False): + for el in expression: + body.append(self.compile(el)) body.append(tailop) - self.returnable = True - body = self._code_branch(body, - expression.start_line, - expression.start_column) + with self.being_returnable(True): + body = self._code_branch(body, + expression.start_line, + expression.start_column) - ret = ast.FunctionDef( - name=name, - lineno=expression.start_line, - col_offset=expression.start_column, - args=ast.arguments( - args=[ - ast.Name( - arg=ast_str(x), id=ast_str(x), - ctx=ast.Param(), - lineno=x.start_line, - col_offset=x.start_column) - for x in sig], - vararg=None, - kwarg=None, - kwonlyargs=[], - kw_defaults=[], - defaults=[]), - body=body, - decorator_list=[]) + ret = ast.FunctionDef( + name=name, + lineno=expression.start_line, + col_offset=expression.start_column, + args=ast.arguments( + args=[ + ast.Name( + arg=ast_str(x), id=ast_str(x), + ctx=ast.Param(), + lineno=x.start_line, + col_offset=x.start_column) + for x in sig], + vararg=None, + kwarg=None, + kwonlyargs=[], + kw_defaults=[], + defaults=[]), + body=body, + decorator_list=[]) - self.returnable = ret_status return ret @builds(HyInteger) diff --git a/hy/util.py b/hy/util.py index a600b5e..6b26543 100644 --- a/hy/util.py +++ b/hy/util.py @@ -1,4 +1,5 @@ # Copyright (c) 2013 Paul Tagliamonte +# Copyright (c) 2013 Julien Danjou # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -18,6 +19,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. +import contextlib import sys @@ -27,6 +29,15 @@ else: str_type = unicode +@contextlib.contextmanager +def temporary_attribute_value(obj, attribute, value): + """Temporarily switch an object attribute value to another value.""" + original_value = getattr(obj, attribute) + setattr(obj, attribute, value) + yield + setattr(obj, attribute, original_value) + + def flatten_literal_list(entry): for e in entry: if type(e) == list: diff --git a/tests/test_util.py b/tests/test_util.py new file mode 100644 index 0000000..1804fa0 --- /dev/null +++ b/tests/test_util.py @@ -0,0 +1,13 @@ +from hy import util + + +def test_temporary_attribute_value(): + class O(object): + def __init__(self): + self.foobar = 0 + + o = O() + + with util.temporary_attribute_value(o, "foobar", 42): + assert o.foobar == 42 + assert o.foobar == 0 From 55ed7cee6216a32e8e89acfa7032f3c419bb08b5 Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Sun, 21 Apr 2013 11:43:33 -0400 Subject: [PATCH 26/26] misc. style fixes --- hy/compiler.py | 10 +++++----- hy/util.py | 7 ++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hy/compiler.py b/hy/compiler.py index 35ac1f8..1b7988c 100644 --- a/hy/compiler.py +++ b/hy/compiler.py @@ -129,7 +129,7 @@ class HyASTCompiler(object): self.anon_fn_count = 0 self.imports = defaultdict(list) - def being_returnable(self, v): + def is_returnable(self, v): return temporary_attribute_value(self, "returnable", v) def compile(self, tree): @@ -954,7 +954,7 @@ class HyASTCompiler(object): @builds("foreach") @checkargs(min=1) def compile_for_expression(self, expression): - with self.being_returnable(False): + with self.is_returnable(False): expression.pop(0) # for name, iterable = expression.pop(0) target = self._storeize(self.compile_symbol(name)) @@ -1019,14 +1019,14 @@ class HyASTCompiler(object): body = [] if expression != []: - with self.being_returnable(True): + with self.is_returnable(True): tailop = self.compile(expression.pop(-1)) - with self.being_returnable(False): + with self.is_returnable(False): for el in expression: body.append(self.compile(el)) body.append(tailop) - with self.being_returnable(True): + with self.is_returnable(True): body = self._code_branch(body, expression.start_line, expression.start_column) diff --git a/hy/util.py b/hy/util.py index 6b26543..b855038 100644 --- a/hy/util.py +++ b/hy/util.py @@ -34,7 +34,12 @@ def temporary_attribute_value(obj, attribute, value): """Temporarily switch an object attribute value to another value.""" original_value = getattr(obj, attribute) setattr(obj, attribute, value) - yield + + try: + yield + except Exception: + pass + setattr(obj, attribute, original_value)