Expand macros first in @!

JuliaFolds · Aug 29, 2019 · da5a9aa · da5a9aa
1 parent 994e66b
commit da5a9aa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/macro.jl b/src/macro.jl
@@ -26,7 +26,7 @@ julia> @! y .= 2 .* y
 ```
 """
 macro !(expr)
-    foldexpr(expr) do x
+    foldexpr(macroexpand(__module__, expr)) do x
         if Meta.isexpr(x, :call)
             isdotoperator(x.args[1]) && return x
             return Expr(:call, Expr(:call, _maybb, x.args[1]), x.args[2:end]...)

diff --git a/test/test_macro.jl b/test/test_macro.jl
@@ -32,4 +32,29 @@ end
     end
 end
 
+@testset "@." begin
+    @test !@isdefined y
+    @test begin
+        x = SVector(1, 2)
+        @! @. y = x * 2
+    end === SVector(2, 4)
+
+    @test !@isdefined y
+    @test begin
+        x = SVector(1, 2)
+        y = SVector(0, 0)
+        @! @. y = x * 2
+    end === SVector(2, 4)
+
+    let x = [1, 2]
+        y = [0, 0]
+        @test (@! @. y = x * 2)::Vector{Int} == [2, 4]
+    end
+
+    let x = [1, 2]
+        y = SVector(0, 0)
+        @test (@! @. y = x * 2)::Vector{Int} == [2, 4]
+    end
+end
+
 end  # module