fix #2378

JuliaLang · Feb 24, 2013 · 4076e2b · 4076e2b
1 parent 18a9e5c
commit 4076e2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/base/client.jl b/base/client.jl
@@ -58,6 +58,7 @@ function eval_user_input(ast::ANY, show_value)
                 println()
                 iserr, lasterr = false, ()
             else
+                ast = expand(ast)
                 value = eval(Main,ast)
                 global ans = value
                 if !is(value,nothing) && show_value

diff --git a/src/jlfrontend.scm b/src/jlfrontend.scm
@@ -135,7 +135,10 @@
   (parser-wrap (lambda ()
 		 (let* ((inp  (make-token-stream (open-input-string s)))
 			(expr (julia-parse inp)))
-		   (expand-toplevel-expr expr)))))
+		   ;; delay expansion so macros run in the Task executing
+		   ;; the input, not the task parsing it (issue #2378)
+		   expr
+		   #;(expand-toplevel-expr expr)))))
 
 ;; parse file-in-a-string
 (define (jl-parse-string-stream str)