Additionally fix #198 by using Base.promote_op

JuliaArrays · Aug 8, 2017 · e45d995 · e45d995
1 parent 3a49b3a
commit e45d995
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/broadcast.jl b/src/broadcast.jl
@@ -103,7 +103,7 @@ end
     end
 
     eltype_exprs = [t <: AbstractArray ? :($(eltype(t))) : :($t) for t ∈ a]
-    newtype_expr = :(Core.Inference.return_type(f, Tuple{$(eltype_exprs...)}))
+    newtype_expr = prod(newsize) > 0 ? :(Base.promote_op(f, $(eltype_exprs...))) : :(Union{})
 
     return quote
         @_inline_meta

diff --git a/src/mapreduce.jl b/src/mapreduce.jl
@@ -17,7 +17,7 @@ end
         exprs[i] = :(f($(tmp...)))
     end
     eltypes = [eltype(a[j]) for j ∈ 1:length(a)] # presumably, `eltype` is "hyperpure"?
-    newT = :(Core.Inference.return_type(f, Tuple{$(eltypes...)}))
+    newT = :(Base.promote_op(f, $(eltypes...)))
     return quote
         @_inline_meta
         @inbounds return similar_type(typeof(_first(a...)), $newT, Size(S))(tuple($(exprs...)))

diff --git a/test/broadcast.jl b/test/broadcast.jl
@@ -136,22 +136,22 @@ end
     @testset "eltype after broadcast" begin
         # test cases issue #198
         let a = SVector{4, Number}(2, 2.0, 4//2, 2+0im)
-            @test_broken eltype(a + 2) == Number
-            @test_broken eltype(a - 2) == Number
-            @test_broken eltype(a * 2) == Number
-            @test_broken eltype(a / 2) == Number
+            @test eltype(a + 2) == Number
+            @test eltype(a - 2) == Number
+            @test eltype(a * 2) == Number
+            @test eltype(a / 2) == Number
         end
         let a = SVector{3, Real}(2, 2.0, 4//2)
-            @test_broken eltype(a + 2) == Real
-            @test_broken eltype(a - 2) == Real
-            @test_broken eltype(a * 2) == Real
-            @test_broken eltype(a / 2) == Real
+            @test eltype(a + 2) == Real
+            @test eltype(a - 2) == Real
+            @test eltype(a * 2) == Real
+            @test eltype(a / 2) == Real
         end
         let a = SVector{3, Real}(2, 2.0, 4//2)
-            @test_broken eltype(a + 2.0) == Float64
-            @test_broken eltype(a - 2.0) == Float64
-            @test_broken eltype(a * 2.0) == Float64
-            @test_broken eltype(a / 2.0) == Float64
+            @test eltype(a + 2.0) == Real
+            @test eltype(a - 2.0) == Real
+            @test eltype(a * 2.0) == Real
+            @test eltype(a / 2.0) == Real
         end
         let a = broadcast(Float32, SVector(3, 4, 5))
             @test eltype(a) == Float32