Add more axes tests

Author: Tokazama

src/axes.jl

@@ -37,11 +37,9 @@ function axes_types(::Type{T}) where {T}
 end
 axes_types(::Type{LinearIndices{N,R}}) where {N,R} = R
 axes_types(::Type{CartesianIndices{N,R}}) where {N,R} = R
-function axes_types(::Type{T}) where {T<:VecAdjTrans}
-    return Tuple{OptionallyStaticUnitRange{One,One},axes_types(parent_type(T), One())}
-end
-function axes_types(::Type{T}) where {T<:MatAdjTrans}
-    return eachop_tuple(_get_tuple, to_parent_dims(T), axes_types(parent_type(T)))
+function axes_types(::Type{T}) where {T<:Union{Adjoint,Transpose}}
+    P = parent_type(T)
+    return Tuple{axes_types(P, static(2)), axes_types(P, static(1))}
 end
 function axes_types(::Type{T}) where {T<:PermutedDimsArray}
     return eachop_tuple(_get_tuple, to_parent_dims(T), axes_types(parent_type(T)))

src/indexing.jl

@@ -216,31 +216,8 @@ end
 end
 @propagate_inbounds function _to_indices(::StaticInt{N}, A, axs::Tuple, args::Tuple) where {N}
     axes_front, axes_tail = Base.IteratorsMD.split(axs, Val(N))
-    return _to_multi_indices(A, axes_front, axes_tail, first(args), _maybe_tail(args))
+    return (to_index(_layout(IndexStyle(A), axes_front), first(args)), to_indices(A, axes_tail, _maybe_tail(args))...)
 end
-@propagate_inbounds function _to_multi_indices(
-    A,
-    axes_front::Tuple,
-    axes_tail::Tuple,
-    arg::Union{LinearIndices,CartesianIndices},
-    args::Tuple
-)
-    return (to_indices(A, axes_front, axes(arg))..., to_indices(A, axes_tail, args)...,)
-end
-@propagate_inbounds function _to_multi_indices(
-    A,
-    axes_front::Tuple,
-    axes_tail::Tuple,
-    arg::AbstractCartesianIndex,
-    args::Tuple
-)
-    return (map(to_index, axes_front, Tuple(arg))..., to_indices(A, axes_tail, args)...)
-end
-
-@propagate_inbounds function _to_multi_indices(A, f::Tuple, l::Tuple, arg, args::Tuple)
-    return (to_index(_layout(IndexStyle(A), f), arg), to_indices(A, l, args)...)
-end
-
 @propagate_inbounds function to_indices(A, axs::Tuple, args::Tuple{})
     @boundscheck if length(first(axs)) != 1
         error("Cannot drop dimension of size $(length(first(axs))).")
@@ -254,7 +231,6 @@ to_indices(A, axs::Tuple{}, args::Tuple{}) = ()
 _maybe_tail(::Tuple{}) = ()
 _maybe_tail(x::Tuple) = tail(x)
 
-
 """
     to_index([::IndexStyle, ]axis, arg) -> index
 

test/runtests.jl

@@ -759,6 +759,23 @@ end
     end
 end
 
+
+@testset "axes" begin
+    A = zeros(3,4,5);
+    Ap = @view(PermutedDimsArray(A, (3,1,2))[:,1:2,1])';
+
+    axs = @inferred(ArrayInterface.axes(Ap))
+    lzaxs = @inferred(ArrayInterface.lazy_axes(Ap))
+    axis = axs[2]
+    lzaxis = lzaxs[2]
+
+    @test map(parent, lzaxs) === axs
+    @test @inferred(first(lzaxis)) === first(axis)
+    @test @inferred(lzaxis[2]) === axis[2]
+    @test @inferred(lzaxis[1:2:5]) === axis[1:2:5]
+    @test @inferred(lzaxis[1:2]) === axis[1:2]
+end
+
 include("ndindex.jl")
 include("indexing.jl")
 include("dimensions.jl")