Fix goto/label in macros invoked from another module.

tknopp · Aug 7, 2014 · 78cca5b · 78cca5b
1 parent 3ddbaa1
commit 78cca5b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -3262,9 +3262,10 @@ So far only the second case can actually occur.
  ((escape) (cadr e))
  ((using import importall export) (map unescape e))
  ((macrocall)
+ (if (or (eq? (cadr e) '@label) (eq? (cadr e) '@goto)) e
  `(macrocall ,.(map (lambda (x)
  (resolve-expansion-vars- x env m inarg))
- (cdr e))))
+ (cdr e)))))
  ((symboliclabel) e)
  ((symbolicgoto) e)
  ((type)

diff --git a/test/goto.jl b/test/goto.jl
@@ -87,4 +87,16 @@ end
 
 @test goto_test7(false) == nothing
 
+module GotoMacroTest
+ macro goto_test8_macro()
+ quote
+ function $(esc(:goto_test8))()
+ @label a
+ @goto a
+ end
+ end
+ end
+end
+
+GotoMacroTest.@goto_test8_macro