Skip to content

Commit 90d9083

Browse files
committed
Update ChainedFixes and delete blank lines
1 parent c151f24 commit 90d9083

12 files changed

+20
-8
lines changed

Project.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "StaticRanges"
22
uuid = "d8176aec-3168-11e9-3c98-e3954798be3a"
33
authors = ["zchristensen "]
4-
version = "0.6.11"
4+
version = "0.6.12"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -13,7 +13,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1313

1414
[compat]
1515
ArrayInterface = "2"
16-
ChainedFixes = "0.1"
16+
ChainedFixes = "0.2"
1717
IntervalSets = "0.5"
1818
Requires = "1"
1919
StaticArrays = "0.12.1"

src/abstractlinrange.jl

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
"""
23
AbstractLinRange
34

src/abstractsteprange.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
"""
23
AbstractStepRange
34
@@ -7,7 +8,7 @@ identically to `StepRange`.
78
abstract type AbstractStepRange{T,S} <: OrdinalRange{T,S} end
89

910
function Base.isempty(r::AbstractStepRange)
10-
(first(r) != last(r)) & ((step(r) > zero(step(r))) != (last(r) > first(r)))
11+
return (first(r) != last(r)) & ((step(r) > zero(step(r))) != (last(r) > first(r)))
1112
end
1213

1314
"""

src/broadcast.jl

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Base.broadcasted(::DefaultArrayStyle{1}, ::typeof(+), r::OneToRange) = r
23
Base.broadcasted(::DefaultArrayStyle{1}, ::typeof(+), r::AbstractStepRange) = r
34
Base.broadcasted(::DefaultArrayStyle{1}, ::typeof(+), r::AbstractStepRangeLen) = r
@@ -226,3 +227,4 @@ Base.broadcasted(::DefaultArrayStyle{1}, ::typeof(big), r::StepRange) = big(r.st
226227
Base.broadcasted(::DefaultArrayStyle{1}, ::typeof(big), r::StepRangeLen) = StepRangeLen(big(r.ref), big(r.step), length(r), r.offset)
227228
Base.broadcasted(::DefaultArrayStyle{1}, ::typeof(big), r::LinRange) = LinRange(big(r.start), big(r.stop), length(r))
228229
=#
230+

src/filter.jl

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
# Notes on implementation:
23
# Currently Base Julia reutrns an empty vector on empty(::AbstractRange)
34
# We want the appropriate variant of the range that returns true when isempty(::AbstractRange)
@@ -10,3 +11,4 @@
1011
Base.filter(f::Function, r::UnionRange) = r[find_all(f, r)]
1112

1213
Base.filter(f::ChainedFix, r::UnionRange) = r[findall(f, r)]
14+

src/merge.jl

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
# The goal is to create type stable merges that don't instantly result in an explosion
23
# of allocations because everything has to become an array.
34

src/offset_range.jl

+1
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,4 @@ function __init__()
125125
has_offset_axes(::Type{<:OffsetArrays.IdOffsetRange}) = true
126126
end
127127
end
128+

src/pop.jl

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# TODO:
2-
# - Account for empty ranges, small length, etc.
32
# - ensure there are pop and popfirst working for all types (non-mutating)
43

54
# FIXME this should be defined somewhere
@@ -88,7 +87,11 @@ end
8887
function Base.popfirst!(r::Union{StepMRange,UnitMRange})
8988
isempty(r) && error("array must be non-empty")
9089
f = first(r)
91-
length(r) == 1 ? empty!(r) : setfield!(r, :start, @inbounds(r[2]))
90+
if length(r) == 1
91+
empty!(r)
92+
else
93+
setfield!(r, :start, @inbounds(r[2]))
94+
end
9295
return f
9396
end
9497

src/push.jl

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
StaticArrays.push(v::AbstractVector{T}, item) where {T} = pushfirst(v, convert(T, item))
23

34
function StaticArrays.push(v::AbstractVector{T}, item::T) where {T}

src/size.jl

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Base.size(gr::GapRange) = (length(gr),)
23

34
StaticArrays.Size(::Type{LinSRange{T,B,E,L,D}}) where {T,B,E,L,D} = Size{(L,)}()
@@ -19,3 +20,4 @@ end
1920
StaticArrays.Size(::Type{OneToSRange{T,L}}) where {T<:Union{Int,Int64},L} = Size{(T(L),)}()
2021

2122
StaticArrays.Size(::Type{OneToSRange{T,L}}) where {T,L} = Size{(Int(L - zero(T)),)}()
23+

src/traits.jl

-3
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,3 @@ Base.@pure function _has_offset_axes(::Type{T}) where {T<:Tuple}
420420
return false
421421
end
422422

423-
424-
425-

src/unitrange.jl

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
"""
23
UnitSRange
34

0 commit comments

Comments
 (0)