Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Added a fix for nested decorators. Fixes #752

Browse Source
This commit is contained in:
Matthías Páll Gissurarson 2015-01-14 19:42:02 +00:00
parent 19b55384f8
commit 1d5b455491
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hy/compiler.py
View File

@ -1295,7 +1295,7 @@ class HyASTCompiler(object):
isinstance(fn.stmts[-1], ast.ClassDef)): isinstance(fn.stmts[-1], ast.ClassDef)):
raise HyTypeError(expr, "Decorated a non-function") raise HyTypeError(expr, "Decorated a non-function")
decorators, ret, _ = self._compile_collect(expr) decorators, ret, _ = self._compile_collect(expr)
fn.stmts[-1].decorator_list = decorators fn.stmts[-1].decorator_list = decorators + fn.stmts[-1].decorator_list
return ret + fn return ret + fn
@builds("with*") @builds("with*")

9
tests/native_tests/with_decorator.hy
View File

@ -15,6 +15,15 @@
(defclass cls [] (defclass cls []
[[my_attr 456]])) [[my_attr 456]]))
(defn test-decorator-clobbing []
"NATIVE: Tests whether nested decorators work"
(do
(defn dec1 [f] (defn k [] (+ (f) 1)))
(defn dec2 [f] (defn k [] (+ (f) 2)))
(with-decorator dec1
(with-decorator dec2
(defn f [] 1)))
(assert (= (f) 4))))
(defn test-decorators [] (defn test-decorators []
"NATIVE: test decorators." "NATIVE: test decorators."