Simpler reshaping for SubArray

Author: mbauman

base/subarray.jl

@@ -12,8 +12,12 @@ immutable SubArray{T,N,P,I,L} <: AbstractArray{T,N}
     first_index::Int   # for linear indexing and pointer, only valid when L==true
     stride1::Int       # used only for linear indexing
 end
+# Ensure the dimensionality of the parent matches the number of indices
+function SubArray{N}(parent::AbstractArray, indexes::NTuple{N}, dims::Tuple)
+    SubArray(reshape(parent, Val{N}), indexes, dims)
+end
 # Compute the linear indexability of the indices, and combine it with the linear indexing of the parent
-function SubArray(parent::AbstractArray, indexes::Tuple, dims::Tuple)
+function SubArray{T,N}(parent::AbstractArray{T,N}, indexes::NTuple{N}, dims::Tuple)
     SubArray(linearindexing(viewindexing(indexes), linearindexing(parent)), parent, indexes, convert(Dims, dims))
 end
 function SubArray{P, I, N}(::LinearSlow, parent::P, indexes::I, dims::NTuple{N, Int})
@@ -77,14 +81,7 @@ parentindexes(a::AbstractArray) = ntuple(i->1:size(a,i), ndims(a))
 
 ## SubArray creation
 # Drops singleton dimensions (those indexed with a scalar)
-slice{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N}) = (@_propagate_inbounds_meta; _slice(A, I...))
-slice(A::AbstractVector, i::ViewIndex) = (@_propagate_inbounds_meta; _slice(A, i))
-slice(A::AbstractArray, i::ViewIndex) = (@_propagate_inbounds_meta; _slice(reshape(A, length(A)), i))
-function slice{N}(A::AbstractArray, I::Vararg{ViewIndex,N}) # TODO: DEPRECATE FOR #14770
-    @_propagate_inbounds_meta
-    _slice(reshape(A, Val{N}), I...)
-end
-function _slice{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
+function slice{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
     @_inline_meta
     @boundscheck checkbounds(A, I...)
     J = to_indexes(I...)
@@ -96,14 +93,7 @@ keep_leading_scalars(T::Tuple{Real, Vararg{Real}}) = T
 keep_leading_scalars(T::Tuple{Real, Vararg{Any}}) = (@_inline_meta; (NoSlice(T[1]), keep_leading_scalars(tail(T))...))
 keep_leading_scalars(T::Tuple{Any, Vararg{Any}}) = (@_inline_meta; (T[1], keep_leading_scalars(tail(T))...))
 
-sub{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N}) = (@_propagate_inbounds_meta; _sub(A, I...))
-sub(A::AbstractVector, i::ViewIndex) = (@_propagate_inbounds_meta; _sub(A, i))
-sub(A::AbstractArray, i::ViewIndex) = (@_propagate_inbounds_meta; _sub(reshape(A, length(A)), i))
-function sub{N}(A::AbstractArray, I::Vararg{ViewIndex,N}) # TODO: DEPRECATE FOR #14770
-    @_propagate_inbounds_meta
-    _sub(reshape(A, Val{N}), I...)
-end
-function _sub{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
+function sub{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
     @_inline_meta
     @boundscheck checkbounds(A, I...)
     J = keep_leading_scalars(to_indexes(I...))