Fix macro hygiene when calling the macro in the same module.

Closes #14893
JuliaLang · Apr 12, 2016 · 5be65b9 · 5be65b9
1 parent 17a293a
commit 5be65b9
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 16 deletions.
diff --git a/base/linalg/factorization.jl b/base/linalg/factorization.jl
@@ -9,11 +9,11 @@ transpose(F::Factorization) = error("transpose not implemented for $(typeof(F))"
 ctranspose(F::Factorization) = error("ctranspose not implemented for $(typeof(F))")
 
 macro assertposdef(A, info)
-   :(($info)==0 ? $A : throw(PosDefException($info)))
+   :($(esc(info)) == 0 ? $(esc(A)) : throw(PosDefException($(esc(info)))))
 end
 
 macro assertnonsingular(A, info)
-   :(($info)==0 ? $A : throw(SingularException($info)))
+   :($(esc(info)) == 0 ? $(esc(A)) : throw(SingularException($(esc(info)))))
 end
 
 

diff --git a/base/sparse/cholmod_h.jl b/base/sparse/cholmod_h.jl
@@ -75,5 +75,5 @@ type CHOLMODException <: Exception
 end
 
 macro isok(A)
-    :($A == TRUE || throw(CHOLMODException("")))
+    :($(esc(A)) == TRUE || throw(CHOLMODException("")))
 end
diff --git a/base/sparse/umfpack.jl b/base/sparse/umfpack.jl
@@ -54,7 +54,7 @@ function umferror(status::Integer)
 end
 
 macro isok(A)
-    :(umferror($A))
+    :(umferror($(esc(A))))
 end
 
 # check the size of SuiteSparse_long

diff --git a/src/ast.c b/src/ast.c
@@ -168,14 +168,15 @@ value_t fl_invoke_julia_macro(fl_context_t *fl_ctx, value_t *args, uint32_t narg
     fl_gc_handle(fl_ctx, &scm);
     value_t scmresult;
     jl_module_t *defmod = jl_gf_mtable(f)->module;
-    if (defmod == NULL || defmod == jl_current_module) {
-        scmresult = fl_cons(fl_ctx, scm, fl_ctx->F);
-    }
-    else {
-        value_t opaque = cvalue(fl_ctx, jl_ast_ctx(fl_ctx)->jvtype, sizeof(void*));
-        *(jl_value_t**)cv_data((cvalue_t*)ptr(opaque)) = (jl_value_t*)defmod;
-        scmresult = fl_cons(fl_ctx, scm, opaque);
-    }
+    assert(defmod);
+    /* if (defmod == NULL) { */
+    /*     scmresult = fl_cons(fl_ctx, scm, fl_ctx->F); */
+    /* } */
+    /* else { */
+    value_t opaque = cvalue(fl_ctx, jl_ast_ctx(fl_ctx)->jvtype, sizeof(void*));
+    *(jl_value_t**)cv_data((cvalue_t*)ptr(opaque)) = (jl_value_t*)defmod;
+    scmresult = fl_cons(fl_ctx, scm, opaque);
+    /* } */
     fl_free_gc_handles(fl_ctx, 1);
 
     JL_GC_POP();

diff --git a/src/macroexpand.scm b/src/macroexpand.scm
@@ -421,7 +421,7 @@
                (error (cadr form)))
            (let ((form (car form))
                  (m    (cdr form)))
-             ;; m is the macro's def module, or #f if def env === use env
+             ;; m is the macro's def module
              (rename-symbolic-labels
               (julia-expand-macros
                (resolve-expansion-vars form m))))))

diff --git a/test/core.jl b/test/core.jl
@@ -3320,7 +3320,7 @@ end
 
 # issue 13855
 macro m13855()
-    Expr(:localize, :(() -> x))
+    Expr(:localize, :(() -> $(esc(:x))))
 end
 @noinline function foo13855(x)
     @m13855()
@@ -3464,11 +3464,11 @@ module TestMacroGlobalFunction
 macro makefn(f,g)
     quote
         global $(f)
-        function $(f)(x)
+        function $(esc(f))(x)
             x+1
         end
         global $(g)
-        $(g)(x) = x+2
+        $(esc(g))(x) = x+2
     end
 end
 @makefn ff gg
@@ -3757,3 +3757,22 @@ function f15809()
 end
 f15809()
 @test g15809(2) === Int
+
+# issue
+module M14893
+x = 14893
+macro m14893()
+    :x
+end
+function f14893()
+    x = 1
+    @m14893
+end
+end
+function f14893()
+    x = 2
+    M14893.@m14893
+end
+
+@test f14893() == 14893
+@test M14893.f14893() == 14893