Add test for macroexpand-all with require.

hylang · Jul 25, 2018 · 285dde1 · 285dde1
1 parent 1aadc90
commit 285dde1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/hy/contrib/walk.hy b/hy/contrib/walk.hy
@@ -66,7 +66,8 @@
               [(= (first form) 'quote) form]
               [(= (first form) 'quasiquote) (+quote)]
               [(= (first form) (HySymbol "require"))
-                 (ast-compiler.compile form)]
+               (ast-compiler.compile form)
+               (return)]
               [True (traverse (mexpand form ast-compiler))])
         (if (coll? form)
             (traverse form)

diff --git a/tests/native_tests/contrib/expand_module.hy b/tests/native_tests/contrib/expand_module.hy
@@ -0,0 +1,2 @@
+(defmacro test-macro []
+  '(setv blah 1))
diff --git a/tests/native_tests/contrib/walk.hy b/tests/native_tests/contrib/walk.hy
@@ -56,7 +56,15 @@
                 (do '(with [b 2])
                     `(with [c 3]
                        ~(with* [d 4] (do))
-                       ~@[(with* [e 5] (do))]))))))
+                       ~@[(with* [e 5] (do))])))))
+
+  (defmacro require-macro []
+    `(do
+       (require [tests.native_tests.contrib.expand_module [test-macro :as my-test-macro]])
+       (my-test-macro)))
+
+  (assert (= (macroexpand-all '(require-macro))
+             `(do ~None (setv blah 1)))))
 
 (defn test-let-basic []
   (assert (zero? (let [a 0] a)))