Merge pull request #72 from Tokazama/OptionallyStaticUnitRange-fixes

Fixe BoundsError and length on OptionallyStaticUnitRange

Author: chriselrod

Project.toml

@@ -1,6 +1,6 @@
 name = "ArrayInterface"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "2.13.0"
+version = "2.13.1"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/ranges.jl

@@ -105,23 +105,23 @@ unsafe_length_one_to(lst::Int) = lst
 unsafe_length_one_to(::StaticInt{L}) where {L} = lst
 
 Base.@propagate_inbounds function Base.getindex(r::OptionallyStaticUnitRange, i::Integer)
-  if known_first(r) === oneunit(r)
+  if known_first(r) === oneunit(eltype(r))
     return get_index_one_to(r, i)
   else
     return get_index_unit_range(r, i)
   end
 end
 
 @inline function get_index_one_to(r, i)
-  @boundscheck if ((i > 0) & (i <= last(r)))
+  @boundscheck if ((i < 1) || (i > last(r)))
     throw(BoundsError(r, i))
   end
   return convert(eltype(r), i)
 end
 
 @inline function get_index_unit_range(r, i)
   val = first(r) + (i - 1)
-  @boundscheck if i > 0 && val <= last(r) && val >= first(r)
+  @boundscheck if (i < 1) || (val > last(r) && val < first(r))
     throw(BoundsError(r, i))
   end
   return convert(eltype(r), val)
@@ -169,15 +169,15 @@ function Base.length(r::OptionallyStaticUnitRange)
   if isempty(r)
     return 0
   else
-    if known_first(r) === 0
+    if known_first(r) === 1
       return unsafe_length_one_to(last(r))
     else
       return unsafe_length_unit_range(first(r), last(r))
     end
   end
 end
 
-unsafe_length_unit_range(start::Integer, stop::Integer) = Int(start - stop + 1)
+unsafe_length_unit_range(start::Integer, stop::Integer) = Int((stop - start) + 1)
 
 """
     indices(x[, d])

test/runtests.jl

@@ -200,6 +200,15 @@ end
     @test isnothing(@inferred(ArrayInterface.known_step(typeof(1:0.2:4))))
     @test isone(@inferred(ArrayInterface.known_step(1:4)))
     @test isone(@inferred(ArrayInterface.known_step(typeof(1:4))))
+
+    @test @inferred(length(ArrayInterface.OptionallyStaticUnitRange(1, 0))) == 0
+    @test @inferred(length(ArrayInterface.OptionallyStaticUnitRange(1, 10))) == 10
+    @test @inferred(length(ArrayInterface.OptionallyStaticUnitRange(StaticInt(1), 10))) == 10
+    @test @inferred(length(ArrayInterface.OptionallyStaticUnitRange(StaticInt(0), 10))) == 11
+    @test @inferred(getindex(ArrayInterface.OptionallyStaticUnitRange(StaticInt(1), 10), 1)) == 1
+    @test @inferred(getindex(ArrayInterface.OptionallyStaticUnitRange(StaticInt(0), 10), 1)) == 0
+    @test_throws BoundsError getindex(ArrayInterface.OptionallyStaticUnitRange(StaticInt(1), 10), 0)
+    @test_throws BoundsError getindex(ArrayInterface.OptionallyStaticUnitRange(StaticInt(1), 10), 0)
 end
 
 @testset "Memory Layout" begin