Merge pull request #1388 from Kodiologist/macroexpand-named-import

Un-xfail a passing test of `macroexpand`
This commit is contained in:
Kodi Arfer 2017-08-25 15:34:06 -07:00 committed by GitHub
commit d03b1be686
2 changed files with 2 additions and 2 deletions

1
NEWS
View File

@ -30,6 +30,7 @@ Changes from 0.13.0
* `exec` now works under Python 2 * `exec` now works under Python 2
* No TypeError from multi-arity defn returning values evaluating to None * No TypeError from multi-arity defn returning values evaluating to None
* try form now possible in defmacro/deftag * try form now possible in defmacro/deftag
* Fixed a crash when `macroexpand`ing a macro with a named import
* Fixed a crash when `with` suppresses an exception. `with` now returns * Fixed a crash when `with` suppresses an exception. `with` now returns
`None` in this case. `None` in this case.
* `assoc` now evaluates its arguments only once each * `assoc` now evaluates its arguments only once each

View File

@ -1425,13 +1425,12 @@
(assert (= (macroexpand '(-> (a b) (-> (c d) (e f)))) (assert (= (macroexpand '(-> (a b) (-> (c d) (e f))))
'(e (c (a b) d) f)))) '(e (c (a b) d) f))))
#@(pytest.mark.xfail
(defn test-macroexpand-with-named-import [] (defn test-macroexpand-with-named-import []
; https://github.com/hylang/hy/issues/1207 ; https://github.com/hylang/hy/issues/1207
(defmacro m-with-named-import [] (defmacro m-with-named-import []
(import [math [pow]]) (import [math [pow]])
(pow 2 3)) (pow 2 3))
(assert (= (macroexpand '(m-with-named-import)) (** 2 3))))) (assert (= (macroexpand '(m-with-named-import)) (** 2 3))))
(defn test-macroexpand-1 [] (defn test-macroexpand-1 []
"Test macroexpand-1 on ->" "Test macroexpand-1 on ->"