Binary broadcast test

Author: jishnub

src/fillbroadcast.jl

@@ -143,15 +143,18 @@ function broadcast_preserving_0d(f, As...)
     r = copy(bc)
     length(axes(bc)) == 0 ? Fill(r) : r
 end
-for f in (:real, :imag, :conj)
+for f in (:real, :imag)
     @eval ($f)(A::AbstractFill) = broadcast_preserving_0d($f, A)
-    @eval ($f)(A::AbstractZeros) = A
-end
-for T in (:AbstractOnes, :(AbstractFill{<:Real}))
-    @eval real(A::$T) = A
-    @eval imag(A::$T) = Zeros{eltype(A)}(axes(A))
-    @eval conj(A::$T) = A
+    @eval ($f)(A::AbstractZeros) = Zeros{real(eltype(A))}(axes(A))
 end
+conj(A::AbstractFill) = broadcast_preserving_0d(conj, A)
+conj(A::AbstractZeros) = A
+real(A::AbstractOnes) = Ones{real(eltype(A))}(axes(A))
+imag(A::AbstractOnes) = Zeros{real(eltype(A))}(axes(A))
+conj(A::AbstractOnes) = A
+real(A::AbstractFill{<:Real}) = A
+imag(A::AbstractFill{<:Real}) = Zeros{eltype(A)}(axes(A))
+conj(A::AbstractFill{<:Real}) = A
 
 ### Binary broadcasting
 

test/runtests.jl

@@ -1199,26 +1199,41 @@ end
     end
 
     @testset "preserve 0d" begin
-        for f in (real, imag, conj),
-            (F, A) in ((Fill(4 + 5im), fill(4 + 5im)),
-                            (Zeros{ComplexF64}(), zeros(ComplexF64)),
-                            (Zeros(), zeros()),
-                            (Ones(), ones()),
-                            (Ones{ComplexF64}(), ones(ComplexF64)),
-                            )
+        @testset for f in (real, imag, conj), (F, A) in (
+                    (Fill(4), fill(4)),
+                    (Fill(4 + 5im), fill(4 + 5im)),
+                    (Fill(SMatrix{2,2,ComplexF64,4}(fill(4 + 5im, 4))), fill(SMatrix{2,2,ComplexF64,4}(fill(4 + 5im, 4)))),
+                    (Zeros{ComplexF64}(), zeros(ComplexF64)),
+                    (Zeros(), zeros()),
+                    (Ones(), ones()),
+                    (Ones{ComplexF64}(), ones(ComplexF64)),
+                    )
             x = f(F)
             y = f(A)
             @test x == y
+            @test eltype(x) == eltype(y)
             @test x isa FillArrays.AbstractFill
-            if F[] isa Real
+            if F isa Ones
                 if f === imag
                     @test x isa Zeros
                 else
-                    @test x isa typeof(F)
+                    @test x isa Ones
+                end
+            end
+            if F[] isa Real
+                if f === imag
+                    @test x isa Zeros
                 end
             end
         end
     end
+
+    @testset "issue #40" begin
+        f(x) = x
+        g(x, y) = x
+        F = Fill(1, 2)
+        @test g.(F, "a") === f.(F)
+    end
 end
 
 @testset "map" begin