Fix JuliaLang#18176 (broadcast over mixtures of arrays and numeric sc…

…alars)
pabloferz · Aug 26, 2016 · b9ba1e0 · b9ba1e0
1 parent ad73afa
commit b9ba1e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -1662,6 +1662,7 @@ promote_eltype_op{T}(op, ::AbstractArray{T}) = (@_pure_meta; promote_op(op, T))
 promote_eltype_op{T}(op, ::AbstractArray{T}, A) = (@_pure_meta; promote_op(op, T, eltype(A)))
 promote_eltype_op{T}(op, A, ::AbstractArray{T}) = (@_pure_meta; promote_op(op, eltype(A), T))
 promote_eltype_op{R,S}(op, ::AbstractArray{R}, ::AbstractArray{S}) = (@_pure_meta; promote_op(op, R, S))
+promote_eltype_op(op, A, B) = (@_pure_meta; promote_op(op, eltype(A), eltype(B)))
 promote_eltype_op(op, A, B, C, D...) = (@_pure_meta; promote_eltype_op(op, promote_eltype_op(op, A, B), C, D...))
 
 ## 1 argument

diff --git a/test/broadcast.jl b/test/broadcast.jl
@@ -317,3 +317,8 @@ let io = IOBuffer()
     broadcast(x->print(io,x), 1:5) # broadcast with side effects
     @test takebuf_array(io) == [0x31,0x32,0x33,0x34,0x35]
 end
+
+# Issue 18176
+let f18176(a, b, c) = a + b + c
+    @test f18176.(1.0:2, 3, 4) == f18176.(3.0, 1.0:2, 4.0) == broadcast(f18176, 3, 4, 1.0:2)
+end