Fixed some subtyping issues

Author: Andy Ferris

src/MArray.jl

@@ -17,7 +17,7 @@ Construct a statically-sized, mutable array of dimensions `S` (expressed as a `T
 using the data from `a`. The `S` parameter is mandatory since the size of `a` is unknown to
 the compiler (the element type may optionally also be specified).
 """
-type MArray{S, T, N, L} <: StaticArray{S, T, N}
+type MArray{S <: Tuple, T, N, L} <: StaticArray{S, T, N}
     data::NTuple{L,T}
 
     function (::Type{MArray{S,T,N,L}}){S,T,N,L}(x::NTuple{L,T})
@@ -91,14 +91,14 @@ function getindex(v::MArray, i::Int)
     v.data[i]
 end
 
-@propagate_inbounds setindex!{S,T}(v::MArray{S,T}, val, i::Int) = setindex!(v, convert(T, val), i)
-@inline function setindex!{S,T}(v::MArray{S,T}, val::T, i::Int)
+@inline function setindex!(v::MArray, val, i::Int)
     @boundscheck if i < 1 || i > length(v)
         throw(BoundsError())
     end
 
+    T = eltype(v)
     if isbits(T)
-        unsafe_store!(Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(v)), val, i)
+        unsafe_store!(Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(v)), convert(T, val), i)
     else
         # This one is unsafe (#27)
         # unsafe_store!(Base.unsafe_convert(Ptr{Ptr{Void}}, Base.data_pointer_from_objref(v.data)), Base.data_pointer_from_objref(val), i)

src/SArray.jl

@@ -15,7 +15,7 @@ Construct a statically-sized array of dimensions `S` (expressed as a `Tuple{...}
 the data from `a`. The `S` parameter is mandatory since the size of `a` is unknown to the
 compiler (the element type may optionally also be specified).
 """
-immutable SArray{S, T, N, L} <: StaticArray{S, T, N}
+immutable SArray{S <: Tuple, T, N, L} <: StaticArray{S, T, N}
     data::NTuple{L,T}
 
     function (::Type{SArray{S, T, N, L}}){S, T, N, L}(x::NTuple{L,T})

src/SizedArray.jl

@@ -9,18 +9,18 @@ array may be reshaped.
 
 (Also, `Size(dims...)(array)` acheives the same thing)
 """
-immutable SizedArray{S,T,N,M} <: StaticArray{S,T,N}
-    data::Array{T,M}
+immutable SizedArray{S <: Tuple, T, N, M} <: StaticArray{S, T, N}
+    data::Array{T, M}
 
-    function (::Type{SizedArray{S,T,N,M}}){S,T,N,M}(a::Array)
+    function (::Type{SizedArray{S, T, N, M}}){S, T, N, M}(a::Array)
         if length(a) != tuple_prod(S)
             error("Dimensions $(size(a)) don't match static size $S")
         end
         new{S,T,N,M}(a)
     end
 
-    function (::Type{SizedArray{S,T,N,M}}){S,T,N,M}()
-        new{S,T,N,M}(Array{T,M}(S))
+    function (::Type{SizedArray{S, T, N, M}}){S, T, N, M}()
+        new{S, T, N, M}(Array{T, M}(S))
     end
 end
 

test/abstractarray.jl

@@ -62,7 +62,7 @@
 
     @testset "reshape" begin
         @test @inferred(reshape(SVector(1,2,3,4), Size(2,2))) === SMatrix{2,2}(1,2,3,4)
-        @test @inferred(reshape([1,2,3,4], Size(2,2)))::SizedArray{(2,2),Int,2,1} == [1 3; 2 4]
+        @test @inferred(reshape([1,2,3,4], Size(2,2)))::SizedArray{Tuple{2,2},Int,2,1} == [1 3; 2 4]
 
         @test @inferred(vec(SMatrix{2, 2}([1 2; 3 4])))::SVector{4,Int} == [1, 3, 2, 4]
     end