Fix addition of complex-valued Fill and ranges (#164)

JuliaArrays · Oct 11, 2021 · aeb0aef · aeb0aef · dlfivefifty · Oct 11, 2021
1 parent a8bffd3
commit aeb0aef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "FillArrays"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "0.12.6"
+version = "0.12.7"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

diff --git a/src/FillArrays.jl b/src/FillArrays.jl
@@ -204,12 +204,7 @@ end
 function +(a::Fill{T, 1}, b::AbstractRange) where {T}
     size(a) ≠ size(b) && throw(DimensionMismatch("dimensions must match."))
     Tout = promote_type(T, eltype(b))
-    return (a.value + first(b)):convert(Tout, step(b)):(a.value + last(b))
-end
-function +(a::Fill{T, 1}, b::UnitRange) where {T}
-    size(a) ≠ size(b) && throw(DimensionMismatch("dimensions must match."))
-    Tout = promote_type(T, eltype(b))
-    return (a.value + first(b)):(a.value + last(b))
+    return a.value .+ b
 end
 +(a::AbstractRange, b::AbstractFill) = b + a
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -694,6 +694,14 @@ end
         @test_throws DimensionMismatch rnge .+ Zeros(5)
         @test_throws DimensionMismatch rnge .- Zeros(5)
         @test_throws DimensionMismatch Zeros(5) .+ rnge
+
+        @test Fill(2,10) + (1:10) isa UnitRange
+        @test (1:10) + Fill(2,10) isa UnitRange
+
+        f = Fill(1+im,10)
+        @test f + rnge isa AbstractRange
+        @test f + rnge == rnge + f
+        @test f + (1:10) isa AbstractRange
     end
 
     @testset "Special Zeros/Ones" begin