Merge pull request #14 from rdeits/rd/eval-in-jsexpr

expand macros in JSExpr instead of current_module()
JuliaGizmos · Jul 31, 2018 · 015f45b · 015f45b
2 parents 1494934 + d04d5af
commit 015f45b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/JSExpr.jl b/src/JSExpr.jl
@@ -176,7 +176,7 @@ function jsexpr(x::Expr)
         a_[] => obs_get_expr(a)
         a_[i__] => ref_expr(a, i...)
         [xs__] => vect_expr(xs)
-        (@m_ xs__) => jsexpr(macroexpand(current_module(), x))
+        (@m_ xs__) => jsexpr(macroexpand(JSExpr, x))
         (for i_ = start_ : to_
             body__
         end) => for_expr(i, start, to, body)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -81,3 +81,17 @@ end
         @test @js($ob[] = 1) == js"WebIO.setval({\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"},1)"
     end
 end
+
+# https://github.com/JuliaGizmos/JSExpr.jl/issues/13
+module OuterWrapper
+    module InnerWrapper
+        import JSExpr: jsexpr
+        f() = jsexpr(:(@new(1)))
+    end
+
+    using Base.Test
+    @testset "Issue 13" begin
+        InnerWrapper.f()
+    end
+end
+