Fix sort for RangeCumSum (#210)

* Fix sort for RangeCumSum

* Test for value match

Author: jishnub

Project.toml

@@ -1,7 +1,7 @@
 name = "ArrayLayouts"
 uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "1.6.1"
+version = "1.6.2"
 
 [deps]
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"

src/ArrayLayouts.jl

@@ -7,7 +7,7 @@ using Base: AbstractCartesianIndex, OneTo, oneto, RangeIndex, ReinterpretArray,
             Slice, tuple_type_tail, unalias,
             @propagate_inbounds
 
-import Base: axes, size, length, eltype, ndims, first, last, diff, isempty, union, sort!,
+import Base: axes, size, length, eltype, ndims, first, last, diff, isempty, union, sort!, sort,
                 ==, *, +, -, /, \, copy, copyto!, similar, getproperty, getindex, strides,
                 reverse, unsafe_convert, convert, view
 

src/cumsum.jl

@@ -37,6 +37,7 @@ isempty(r::RangeCumsum) = isempty(r.range)
 union(a::RangeCumsum{<:Any,<:OneTo}, b::RangeCumsum{<:Any,<:OneTo}) =
     RangeCumsum(OneTo(max(last(a.range), last(b.range))))
 
-sort!(a::RangeCumsum{<:Any,<:AbstractUnitRange}) = a
+sort!(a::RangeCumsum{<:Any,<:Base.OneTo}) = a
+sort(a::RangeCumsum{<:Any,<:Base.OneTo}) = a
 
 convert(::Type{RangeCumsum{T,R}}, r::RangeCumsum) where {T,R} = RangeCumsum{T,R}(convert(R, r.range))

test/test_cumsum.jl

@@ -19,7 +19,12 @@ include("infinitearrays.jl")
 
     a,b = RangeCumsum(Base.OneTo(5)), RangeCumsum(Base.OneTo(6))
     @test union(a,b) ≡ union(b,a) ≡ b
+    @test sort!(copy(a)) == a
     @test sort!(a) ≡ a
+    @test sort(a) ≡ a == Vector(a)
+
+    r = RangeCumsum(-4:4)
+    @test sort(r) == sort(Vector(r))
 
     a = RangeCumsum(Base.OneTo(3))
     b = RangeCumsum(1:3)