Working sub/slice definitions

Author: mbauman

base/reshapedarray.jl

@@ -38,6 +38,7 @@ reshape(parent::AbstractArray, dims::Dims) = _reshape(parent, dims)
 reshape(parent::AbstractArray, len::Integer) = reshape(parent, (Int(len),))
 reshape(parent::AbstractArray, dims::Int...) = reshape(parent, dims)
 
+reshape{T,N}(parent::AbstractArray{T,N}, ndims::Type{Val{N}}) = parent
 @generated function reshape{T,AN,N}(parent::AbstractArray{T,AN}, ndims::Type{Val{N}})
     if AN < N
         # Add trailing singleton dimensions

base/subarray.jl

@@ -77,16 +77,23 @@ 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...)
+function slice{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
+    @_inline_meta
+    @boundscheck checkbounds(A, I...)
+    unsafe_slice(A, I...)
 end
-function _slice{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
+function slice(A::AbstractArray, i::ViewIndex)
+    @_inline_meta
+    @boundscheck checkbounds(A, i)
+    unsafe_slice(reshape(A, Val{1}), i)
+end
+function slice{N}(A::AbstractArray, I::Vararg{ViewIndex,N}) # TODO: DEPRECATE FOR #14770
     @_inline_meta
     @boundscheck checkbounds(A, I...)
+    unsafe_slice(reshape(A, Val{N}), I...)
+end
+function unsafe_slice{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
+    @_inline_meta
     J = to_indexes(I...)
     SubArray(A, J, index_shape(A, J...))
 end
@@ -96,16 +103,23 @@ 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...)
+function sub{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
+    @_inline_meta
+    @boundscheck checkbounds(A, I...)
+    unsafe_sub(A, I...)
 end
-function _sub{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
+function sub(A::AbstractArray, i::ViewIndex)
+    @_inline_meta
+    @boundscheck checkbounds(A, i)
+    unsafe_sub(reshape(A, Val{1}), i)
+end
+function sub{N}(A::AbstractArray, I::Vararg{ViewIndex,N}) # TODO: DEPRECATE FOR #14770
     @_inline_meta
     @boundscheck checkbounds(A, I...)
+    unsafe_sub(reshape(A, Val{N}), I...)
+end
+function unsafe_sub{T,N}(A::AbstractArray{T,N}, I::Vararg{ViewIndex,N})
+    @_inline_meta
     J = keep_leading_scalars(to_indexes(I...))
     SubArray(A, J, index_shape(A, J...))
 end
@@ -218,22 +232,14 @@ function setindex!(V::FastContiguousSubArray, x, i::Real)
 end
 # Nonscalar setindex! falls back to the defaults
 
-slice{T,N}(V::SubArray{T,N}, I::Vararg{ViewIndex,N}) = _slice(V, I...)
-slice{T}(V::SubArray{T,1}, i::ViewIndex) = _slice(V, i)
-slice(V::SubArray, i::ViewIndex) = _slice(reshape(V, length(V)), i)
-function _slice{T,N}(V::SubArray{T,N}, I::Vararg{ViewIndex,N})
+function unsafe_slice{T,N}(V::SubArray{T,N}, I::Vararg{ViewIndex,N})
     @_inline_meta
-    @boundscheck checkbounds(V, I...)
     idxs = reindex(V, V.indexes, to_indexes(I...))
     SubArray(V.parent, idxs, index_shape(V.parent, idxs...))
 end
 
-sub{T,N}(V::SubArray{T,N}, I::Vararg{ViewIndex,N}) = _sub(V, I...)
-sub{T}(V::SubArray{T,1}, i::ViewIndex) = _sub(V, i)
-sub(V::SubArray, i::ViewIndex) = _sub(reshape(V, length(V)), i)
-function _sub{T,N}(V::SubArray{T,N}, I::Vararg{ViewIndex,N})
+function unsafe_sub{T,N}(V::SubArray{T,N}, I::Vararg{ViewIndex,N})
     @_inline_meta
-    @boundscheck checkbounds(V, I...)
     idxs = reindex(V, V.indexes, keep_leading_scalars(to_indexes(I...)))
     SubArray(V.parent, idxs, index_shape(V.parent, idxs...))
 end