fix "invalid assignment location" macro hygiene regression (JuliaLang…

…#37534)
tekverkp · Sep 12, 2020 · a83166a · a83166a
1 parent 9d41eb3
commit a83166a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/macroexpand.scm b/src/macroexpand.scm
@@ -285,6 +285,7 @@
  (cond ((atom? e) `(tuple ,e))
  ((eq? (car e) 'where) `(where ,(tuple-wrap-arrow-arglist (cadr e)) ,@(cddr e)))
  ((eq? (car e) 'tuple) e)
+ ((eq? (car e) 'escape) `(escape ,(tuple-wrap-arrow-sig (cadr e))))
  (else `(tuple ,e))))
 
 (define (new-expansion-env-for x env (outermost #f))

diff --git a/test/syntax.jl b/test/syntax.jl
@@ -2296,6 +2296,11 @@ end
 @test @m37134()(1) == 62
 @test_throws MethodError @m37134()(1.0) == 62
 
+macro n37134()
+ :($(esc(Expr(:tuple, Expr(:..., :x))))->$(esc(:x)))
+end
+@test @n37134()(2,1) === (2,1)
+
 @testset "unary ± and ∓" begin
  @test Meta.parse("±x") == Expr(:call, :±, :x)
  @test Meta.parse("∓x") == Expr(:call, :∓, :x)