Skip to content

Commit fc67490

Browse files
authored
convert RangeCumsum's parent type (#140)
* convert RangeCumsum's parent type * bump version to v1.0.6
1 parent b2110d8 commit fc67490

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ArrayLayouts"
22
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
33
authors = ["Sheehan Olver <[email protected]>"]
4-
version = "1.0.5"
4+
version = "1.0.6"
55

66
[deps]
77
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"

src/ArrayLayouts.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using Base: AbstractCartesianIndex, OneTo, RangeIndex, ReinterpretArray, Reshape
99

1010
import Base: axes, size, length, eltype, ndims, first, last, diff, isempty, union, sort!,
1111
==, *, +, -, /, \, copy, copyto!, similar, getproperty, getindex, strides,
12-
reverse, unsafe_convert
12+
reverse, unsafe_convert, convert
1313

1414
using Base.Broadcast: Broadcasted
1515

src/cumsum.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ union(a::RangeCumsum{<:Any,<:OneTo}, b::RangeCumsum{<:Any,<:OneTo}) =
3535
RangeCumsum(OneTo(max(last(a.range), last(b.range))))
3636

3737
sort!(a::RangeCumsum{<:Any,<:AbstractUnitRange}) = a
38+
39+
convert(::Type{RangeCumsum{T,R}}, r::RangeCumsum) where {T,R} = RangeCumsum{T,R}(convert(R, r.range))

test/test_cumsum.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ using ArrayLayouts, Test
1414
a,b = RangeCumsum(Base.OneTo(5)), RangeCumsum(Base.OneTo(6))
1515
@test union(a,b) union(b,a) b
1616
@test sort!(a) a
17+
18+
a = RangeCumsum(Base.OneTo(3))
19+
b = RangeCumsum(1:3)
20+
@test oftype(a, b) === a
1721
end

0 commit comments

Comments
 (0)