Merge pull request #275 from JuliaArrays/ksh/testagain

Fix reshape bug and add tests

Author: kshyatt

src/abstractarray.jl

@@ -100,12 +100,12 @@ similar{A<:Array,T,S}(::Type{A},::Type{T},s::Size{S}) = sizedarray_similar_type(
 
 
 @inline reshape(a::StaticArray, s::Size) = similar_type(a, s)(Tuple(a))
-@inline reshape(a::AbstractArray, s::Size) = _reshape(s, IndexStyle(a), a)
+@inline reshape(a::AbstractArray, s::Size) = _reshape(a, IndexStyle(a), s)
 @generated function _reshape(a::AbstractArray, indexstyle, s::Size{S}) where {S}
     if indexstyle == IndexLinear
         exprs = [:(a[$i]) for i = 1:prod(S)]
     else
-        exprs = [:(a[$(inds...)]) for inds ∈ CartesianRange(S)]
+        exprs = [:(a[$(inds)]) for inds ∈ CartesianRange(S)]
     end
 
     return quote

test/abstractarray.jl

@@ -67,6 +67,9 @@
         @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]
+
+        # AbstractArray
+        @test reshape(view(ones(4,4), 1:4, 1:2), Size(4,2)) == SMatrix{4,2}(ones(4,2))
     end
 
     @testset "copy" begin

test/core.jl

@@ -106,14 +106,14 @@
         @test @inferred(convert(SArray{Tuple{1},Float64,1}, ma_int)) === sa_float
         @test @inferred(convert(SArray{Tuple{1},Float64,1,1}, ma_int)) === sa_float
     end
-    
+
     @testset "AbstractArray conversion" begin
         sa = SArray{Tuple{2,2}, Int}((3, 4, 5, 6))
         ma = MArray{Tuple{2,2}, Int}((3, 4, 5, 6))
         a = [3 5; 4 6]
 
         @test @inferred(convert(SArray{Tuple{2,2}}, a)) === sa
-        @test @inferred(convert(SArray{Tuple{2,2},Int}, a)) === sa  
+        @test @inferred(convert(SArray{Tuple{2,2},Int}, a)) === sa
         @test @inferred(convert(SArray{Tuple{2,2},Int,2}, a)) === sa
         @test @inferred(convert(SArray{Tuple{2,2},Int,2,4}, a)) === sa
 
@@ -132,7 +132,7 @@
     end
     @test_throws Exception Length{2.5}()
     @test Length(2) == Length{2}()
-    @test Tuple{2, 3, 5} != Size{(2, 3, 4)}
-    @test Size{(2, 3, 4)} != Tuple{2, 3, 5} 
-
+    @test Tuple{2, 3, 5} != StaticArrays.Size{(2, 3, 4)}
+    @test StaticArrays.Size{(2, 3, 4)} != Tuple{2, 3, 5}
+    @test StaticArrays.check_length(2) == nothing
 end