broadcasting with tuples (fixes #485)

Author: mateuszbaran

src/broadcast.jl

@@ -55,6 +55,7 @@ broadcast_indices(A::StaticArray) = indices(A)
 @inline broadcast_sizes() = ()
 @inline broadcast_size(a) = Size()
 @inline broadcast_size(a::AbstractArray) = Size(a)
+@inline broadcast_size(a::NTuple{N}) where N = Size(N)
 
 function broadcasted_index(oldsize, newindex)
     index = ones(Int, length(oldsize))
@@ -110,7 +111,7 @@ scalar_getindex(x::Tuple{<: Any}) = x[1]
     exprs = similar(indices, Expr)
     for (j, current_ind) ∈ enumerate(indices)
         exprs_vals = [
-            (!(a[i] <: AbstractArray) ? :(scalar_getindex(a[$i])) : :(a[$i][$(broadcasted_index(sizes[i], current_ind))]))
+            (!(a[i] <: AbstractArray || a[i] <: Tuple) ? :(scalar_getindex(a[$i])) : :(a[$i][$(broadcasted_index(sizes[i], current_ind))]))
             for i = 1:length(sizes)
         ]
         exprs[j] = :(f($(exprs_vals...)))
@@ -139,7 +140,7 @@ end
     exprs = similar(indices, Expr)
     for (j, current_ind) ∈ enumerate(indices)
         exprs_vals = [
-            (!(as[i] <: AbstractArray) ? :(as[$i][]) : :(as[$i][$(broadcasted_index(sizes[i], current_ind))]))
+            (!(as[i] <: AbstractArray || as[i] <: Tuple) ? :(as[$i][]) : :(as[$i][$(broadcasted_index(sizes[i], current_ind))]))
             for i = 1:length(sizes)
         ]
         exprs[j] = :(dest[$j] = f($(exprs_vals...)))

test/broadcast.jl

@@ -213,4 +213,18 @@ end
         foo493(X) = normalize.(X)
         @test foo493(X) isa Core.Compiler.return_type(foo493, Tuple{typeof(X)})
     end
+
+    @testset "broadcasting with tuples" begin
+        # issue 485
+        v = SVector(1,2,3)
+        @test v .+ (10, 20, 30) == SVector(11, 22, 33)
+        vm = MVector(1,2,3)
+        vm .+= (10, 20, 30)
+        @test vm == SVector(11, 22, 33)
+        @test (1,2) .+ (@SMatrix [10 20; 30 40]) == @SMatrix [11 21; 32 42]
+        @test (@SMatrix [10 20; 30 40]) .+ (1,2) == @SMatrix [11 21; 32 42]
+        mm = @MMatrix [10 20; 30 40]
+        mm .+= (1,2)
+        @test mm == @SMatrix [11 21; 32 42]
+    end
 end