Allow non-Vector to be sorted with sort_int_range!

dlfivefifty · Mar 5, 2020 · 7d1a3a2 · 7d1a3a2
1 parent 71d9375
commit 7d1a3a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/base/sort.jl b/base/sort.jl
@@ -711,7 +711,7 @@ function sort!(v::AbstractVector;
  rev::Union{Bool,Nothing}=nothing,
  order::Ordering=Forward)
  ordr = ord(lt,by,rev,order)
- if ordr === Forward && isa(v,Vector) && eltype(v)<:Integer
+ if ordr === Forward && eltype(v)<:Integer
  n = length(v)
  if n > 1
  min, max = extrema(v)
@@ -726,7 +726,7 @@ function sort!(v::AbstractVector;
 end
 
 # sort! for vectors of few unique integers
-function sort_int_range!(x::Vector{<:Integer}, rangelen, minval)
+function sort_int_range!(x::AbstractVector{<:Integer}, rangelen, minval)
  offs = 1 - minval
  n = length(x)
 

diff --git a/test/sorting.jl b/test/sorting.jl
@@ -501,4 +501,14 @@ end
  @test isequal(a, [8,6,7,NaN,5,3,0,9])
 end
 
+@testset "sort!(::AbstractVector{<:Integer}) with short int range" begin
+ a = view([9:-1:0;], :)::SubArray
+ sort!(a)
+ @test issorted(a)
+
+ a = view([9:-1:0;], :)::SubArray
+ Base.Sort.sort_int_range!(a, 10, 0) # test it supports non-Vector
+ @test issorted(a)
+end
+
 end