Fix findfirst for InfStepRange for negative step

JuliaArrays · Aug 27, 2024 · eb992be · eb992be
1 parent 83860f6
commit eb992be
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/infrange.jl b/src/infrange.jl
@@ -571,7 +571,7 @@ MemoryLayout(::Type{<:AbstractInfUnitRange}) = LazyLayout()
 
 # from array.jl
 function _step_findfirst(p, r::InfStepRange{T,S}) where {T,S}
-    first(r) <= p.x || return nothing
+    first(r) <= p.x && step(r) > zero(step(r)) || first(r) >= p.x && step(r) < zero(step(r)) || return nothing
     d = convert(S, p.x - first(r))
     iszero(d % step(r)) || return nothing
     return d ÷ step(r) + 1
@@ -624,4 +624,9 @@ function inv(D::Diagonal{<:Any, <:InfRanges})
     idx = findfirst(iszero, d) 
     isnothing(idx) || throw(SingularException(idx))
     return Diagonal(inv.(d))
-end
+end
+
+# bounds-checking
+function Base.checkindex(::Type{Bool}, inds::NTuple{N, AbstractInfUnitRange}, i::AbstractRange{CartesianIndex{N}}) where {N}
+    isempty(i) | checkindex(Bool, inds, first(i))
+end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1229,5 +1229,15 @@ end
     @test v[1:∞] == v
 end
 
+@testset "issue #180" begin
+    @test isnothing(findfirst(==(21), 10:-1:-∞))
+    @test isnothing(findfirst(==(11), 10:-1:-∞))
+    @test findfirst(==(9), 10:-1:-∞) == 2
+    r = 10:-1:-∞
+    v = -20
+    ind = findfirst(==(v), r)
+    @test r[ind] == v
+end
+
 include("test_infconv.jl")
-include("test_block.jl")
+include("test_block.jl")