Skip to content

Commit 88061ad

Browse files
committed
Revert "more simplification"
This reverts commit b660d86.
1 parent 5a804c9 commit 88061ad

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/OffsetArrays.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ for FT in (:OffsetArray, :OffsetVector, :OffsetMatrix)
114114
indsN = _uncolonindices(A, _expandCartesianIndices(inds))
115115
$FT(A, indsN)
116116
end
117-
@eval $FT(A::AbstractArray{T}, inds...) where {T, N} = $FT(A, inds)
117+
@eval $FT(A::AbstractArray{T}, inds::Vararg{OffsetAxis,N}) where {T, N} = $FT(A, inds)
118118
end
119119

120120
# array initialization
@@ -128,15 +128,15 @@ function OffsetArray{T, N}(init::ArrayInitializer, inds::NTuple{NT, Union{Offset
128128
length(indsN) == N || throw(DimensionMismatch("The number of offsets $(length(indsN)) should equal ndims(A) = $N"))
129129
OffsetArray{T, N}(init, indsN)
130130
end
131-
OffsetArray{T,N}(init::ArrayInitializer, inds...) where {T,N} = OffsetArray{T,N}(init, inds)
131+
OffsetArray{T,N}(init::ArrayInitializer, inds::Union{OffsetAxisKnownLength, CartesianIndices}...) where {T,N} = OffsetArray{T,N}(init, inds)
132132

133133
OffsetArray{T}(init::ArrayInitializer, inds::NTuple{N, OffsetAxisKnownLength}) where {T,N} = OffsetArray{T,N}(init, inds)
134134
function OffsetArray{T}(init::ArrayInitializer, inds::NTuple{N, Union{OffsetAxisKnownLength, CartesianIndices}}) where {T, N}
135135
# N is probably not the actual dimension of the array; CartesianIndices might contain multiple dimensions
136136
indsN = _expandCartesianIndices(inds)
137137
OffsetArray{T, length(indsN)}(init, indsN)
138138
end
139-
OffsetArray{T}(init::ArrayInitializer, inds...) where {T} = OffsetArray{T}(init, inds)
139+
OffsetArray{T}(init::ArrayInitializer, inds::Union{OffsetAxisKnownLength, CartesianIndices}...) where {T} = OffsetArray{T}(init, inds)
140140

141141
Base.IndexStyle(::Type{OA}) where {OA<:OffsetArray} = IndexStyle(parenttype(OA))
142142
parenttype(::Type{OffsetArray{T,N,AA}}) where {T,N,AA} = AA

0 commit comments

Comments
 (0)