Add support for ranges with step 0 in searchsortedfirst and searchsor…

…tedlast.

base/sort.jl

@@ -178,14 +178,20 @@ for s in {:searchsortedfirst, :searchsortedlast, :searchsorted}
  end
 end
 
-searchsortedlast{T <: Real}(a::Ranges{T}, x::Real, o::Ordering) = searchsortedlast(a, x)
-searchsortedlast{T <: Real}(a::Ranges{T}, x::Real) = max(min(int(fld(x - first(a), step(a))) + 1, length(a)), 0)
-
-searchsortedfirst{T <: Real}(a::Ranges{T}, x::Real, o::Ordering) = searchsortedfirst(a, x)
-function searchsortedfirst{T <: Real}(a::Ranges{T}, x::Real)
- n = x - first(a)
- s = step(a)
- max(min(int(fld(n, s)) + (rem(n, s) != 0), length(a)), 0) + 1
+function searchsortedlast{T <: Real}(a::Ranges{T}, x::Real, o::Ordering=Forward)
+ if step(a) == 0
+ lt(o, x, first(a)) ? 0 : length(a)
+ else
+ max(min(int(fld(x - first(a), step(a))) + 1, length(a)), 0)
+ end
+end
+
+function searchsortedfirst{T <: Real}(a::Ranges{T}, x::Real, o::Ordering=Forward)
+ if step(a) == 0
+ lt(o, first(a), x) ? length(a) + 1 : 1
+ else
+ max(min(int(-fld(first(a) - x, step(a))), length(a)), 0) + 1
+ end
 end
 
 searchsorted{T <: Real}(a::Ranges{T}, x::Real) = searchsortedfirst(a,x):searchsortedlast(a,x)

test/sorting.jl

@@ -55,6 +55,17 @@ for i = -5:.5:4
  searchsortedlast(rgv_r, i, Sort.Reverse)
 end
 
+rg = 3+0*(1:5); rgv = [rg]
+rg_r = rg; rgv_r = [rg_r]
+for i = 2:4
+ @test searchsortedfirst(rg, i) == searchsortedfirst(rgv, i)
+ @test searchsortedlast(rg, i) == searchsortedlast(rgv, i)
+ @test searchsortedfirst(rg_r, i, Sort.Reverse) ==
+ searchsortedfirst(rgv_r, i, Sort.Reverse)
+ @test searchsortedlast(rg_r, i, Sort.Reverse) ==
+ searchsortedlast(rgv_r, i, Sort.Reverse)
+end
+
 a = rand(1:10000, 1000)
 
 for alg in [InsertionSort, MergeSort, TimSort]