Merge pull request #563 from TheBB/setindex

Fix setindex with vector indices

Author: andyferris

src/indexing.jl

@@ -157,7 +157,7 @@ end
 end
 
 @generated function _setindex!(a::StaticArray, v::AbstractArray, ::Length{L}, inds::StaticVector{<:Any, Int}) where {L}
-    exprs = [:(a[$i] = v[$i]) for i = 1:L]
+    exprs = [:(a[inds[$i]] = v[$i]) for i = 1:L]
     return quote
         @_propagate_inbounds_meta
         if length(v) != L
@@ -168,7 +168,7 @@ end
 end
 
 @generated function _setindex!(a::StaticArray, v::StaticArray, ::Length{L}, inds::StaticVector{<:Any, Int}) where {L}
-    exprs = [:(a[$i] = v[$i]) for i = 1:L]
+    exprs = [:(a[inds[$i]] = v[$i]) for i = 1:L]
     return quote
         @_propagate_inbounds_meta
         if Length(typeof(v)) != L

test/indexing.jl

@@ -33,6 +33,12 @@ using StaticArrays, Test
         @test (mv[SVector(1,2,3,4)] = [4, 5, 6, 7]; (@inferred getindex(mv, SVector(4,3,2,1)))::MVector{4,Int} == MVector((7,6,5,4)))
         @test (mv[SVector(1,2,3,4)] = 2; (@inferred getindex(mv, SVector(4,3,2,1)))::MVector{4,Int} == MVector((2,2,2,2)))
 
+        mv = MVector(0,0,0)
+        @test (mv[SVector(1,3)] = [4, 5]; (@inferred mv == MVector(4,0,5)))
+
+        mv = MVector(0,0,0)
+        @test (mv[SVector(1,3)] = SVector(4, 5); (@inferred mv == MVector(4,0,5)))
+
         # Colon
         mv = MVector{4,Int}(undef)
         @test (mv[:] = vec; (@inferred getindex(mv, :))::MVector{4,Int} == MVector((4,5,6,7)))