Julia v1.9 (#88)

* Julia v1.9

* v0.9.6

Author: dlfivefifty

.github/workflows/ci.yml

@@ -12,6 +12,7 @@ jobs:
         version:
           - '1.6'
           - '1'
+          - '^1.9.0-0'
         os:
           - ubuntu-latest
           - macOS-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "QuasiArrays"
 uuid = "c4ea9172-b204-11e9-377d-29865faadc5c"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "0.9.5"
+version = "0.9.6"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/QuasiArrays.jl

@@ -6,7 +6,7 @@ import Base: getindex, size, axes, axes1, length, ==, isequal, iterate, Cartesia
                 isreal, iszero, isempty, empty, isapprox, fill!, getproperty, showarg
 import Base: @_inline_meta, DimOrInd, OneTo, @_propagate_inbounds_meta, @_noinline_meta,
                 DimsInteger, error_if_canonical_getindex, @propagate_inbounds, _return_type,
-                _maybetail, tail, _getindex, _maybe_reshape, index_ndims, _unsafe_getindex,
+                safe_tail, tail, _getindex, _maybe_reshape, index_ndims, _unsafe_getindex,
                 index_shape, to_shape, @nloops, @ncall, unalias, _unaliascopy,
                 to_index, to_indices, _to_subscript_indices, _splatmap, dataids,
                 compute_stride1, compute_offset1, fill_to_length

src/indices.jl

@@ -111,14 +111,19 @@ to_indices(A::AbstractQuasiArray, inds, ::Tuple{}) = ()
 to_indices(A::AbstractQuasiArray, ::Tuple{}, I::Tuple{Any,Vararg{Any}}) = 
     (@_inline_meta; (to_index(A, I[1]), to_indices(A, (), tail(I))...))
 to_indices(A::AbstractQuasiArray, inds, I::Tuple{Any,Vararg{Any}}) =
-    (@_inline_meta; (to_quasi_index(A, eltype(inds[1]), I[1]), to_indices(A, _maybetail(inds), tail(I))...))
+    (@_inline_meta; (to_quasi_index(A, eltype(inds[1]), I[1]), to_indices(A, _cutdim(inds, I[1]), tail(I))...))
 @inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{CartesianIndex, Vararg{Any}}) =
     to_indices(A, inds, (I[1].I..., tail(I)...))
 @inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{Colon, Vararg{Any}}) =
-    (uncolon(inds, I), to_indices(A, _maybetail(inds), tail(I))...)
-
+    (_uncolon(inds, I), to_indices(A, _cutdim(inds, I[1]), tail(I))...)
 
+_cutdim(inds, I1) = safe_tail(inds)
 
+if VERSION < v"1.9-"
+    _uncolon(inds, I) = uncolon(inds, I)
+else
+    _uncolon(inds, I) = uncolon(inds)
+end
 LinearIndices(A::AbstractQuasiArray) = LinearIndices(axes(A))