Skip to content

Commit ffebce9

Browse files
committed
apply suggestion from comments and fix a dispatching error
1 parent 88061ad commit ffebce9

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/OffsetArrays.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ end
9595

9696
for FT in (:OffsetArray, :OffsetVector, :OffsetMatrix)
9797
# The only route out to inner constructor
98-
@eval function $FT(A::AbstractArray{T}, offsets::NTuple{N, Integer}) where {T, N}
98+
@eval function $FT(A::AbstractArray{T, N}, offsets::NTuple{N, Integer}) where {T, N}
9999
ndims(A) == N || throw(DimensionMismatch("The number of offsets $(N) should equal ndims(A) = $(ndims(A))"))
100100
OffsetArray{T, ndims(A), typeof(A)}(A, offsets)
101101
end
102102
# nested OffsetArrays
103-
@eval $FT(A::OffsetArray{T}, offsets::NTuple{N, Integer}) where {T,N} = $FT(parent(A), A.offsets .+ offsets)
103+
@eval $FT(A::OffsetArray{T, N}, offsets::NTuple{N, Integer}) where {T,N} = $FT(parent(A), A.offsets .+ offsets)
104104
# convert ranges to offsets
105105
@eval function $FT(A::AbstractArray{T}, inds::NTuple{N,OffsetAxisKnownLength}) where {T,N}
106106
axparent = axes(A)

test/runtests.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ end
9292
end
9393

9494
@testset "Constructors" begin
95-
@testset "0-dimensional array" begin
95+
@testset "Single-entry arrays in dims 0:5" begin
9696
for n = 0:5
9797
for z in (OffsetArray(ones(Int,ntuple(d->1,n)), ntuple(x->x-1,n)),
9898
fill!(OffsetArray{Float64}(undef, ntuple(x->x:x, n)), 1),
@@ -109,7 +109,9 @@ end
109109
@test axes(a) == ()
110110
@test ndims(a) == 0
111111
@test a[] == 3
112-
@test a == OffsetArray(a, ())
112+
@test a === OffsetArray(a, ())
113+
@test_throws DimensionMismatch OffsetArray(a, 0)
114+
@test_throws DimensionMismatch OffsetArray(a0, 0)
113115
end
114116

115117
@testset "OffsetVector" begin

0 commit comments

Comments
 (0)