Skip to content

Change IteratorSize on EnumerableMap to just pass through from underl… #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidanthoff merged 3 commits into from
Jul 8, 2019
Merged

Change IteratorSize on EnumerableMap to just pass through from underl… #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72d3af8
Change IteratorSize on EnumerableMap to just pass through from underl…
quinnj Jul 7, 2019
ce72403
Make IteratorSize trait definitions more consistent for Enumerables
quinnj Jul 7, 2019
41c7551
Merge branch 'master' into jq/perf
davidanthoff Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/enumerable/enumerable.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ abstract type Enumerable end

Base.IteratorSize(::Type{T}) where {T <: Enumerable} = Base.SizeUnknown()
IteratorInterfaceExtensions.isiterable(x::Enumerable) = true

haslength(S) = Base.IteratorSize(S) isa Union{Base.HasLength, Base.HasShape} ? Base.HasLength() : Base.IteratorSize(S)
2 changes: 1 addition & 1 deletion src/enumerable/enumerable_map.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ struct EnumerableMap{T, S, Q<:Function} <: Enumerable
f::Q
end

Base.IteratorSize(::Type{EnumerableMap{T,S,Q}}) where {T,S,Q} = !in(Base.IteratorSize(S), (Base.IsInfinite(), Base.SizeUnknown())) ? Base.HasLength() : Base.IteratorSize(S)
Base.IteratorSize(::Type{EnumerableMap{T,S,Q}}) where {T,S,Q} = haslength(S)

Base.eltype(iter::Type{EnumerableMap{T,S,Q}}) where {T,S,Q} = T

Expand Down
2 changes: 1 addition & 1 deletion src/enumerable/enumerable_orderby.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ struct EnumerableOrderby{T,S,KS<:Function,TKS} <: Enumerable
descending::Bool
end

Base.IteratorSize(::Type{EnumerableOrderby{T,S,KS,TKS}}) where {T,S,KS,TKS} = (Base.IteratorSize(S) isa Base.HasLength || Base.IteratorSize(S) isa Base.HasShape) ? Base.HasLength() : Base.IteratorSize(S)
Base.IteratorSize(::Type{EnumerableOrderby{T,S,KS,TKS}}) where {T,S,KS,TKS} = haslength(S)

Base.eltype(::Type{EnumerableOrderby{T,S,KS,TKS}}) where {T,S,KS,TKS} = T

Expand Down
2 changes: 1 addition & 1 deletion src/enumerable/enumerable_take.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function take(source::Enumerable, n::Integer)
return EnumerableTake{T,S}(source, Int(n))
end

Base.IteratorSize(::Type{EnumerableTake{T,S}}) where {T,S} = (Base.IteratorSize(S) isa Base.HasLength || Base.IteratorSize(S) isa Base.HasShape) ? Base.HasLength() : Base.SizeUnknown()
Base.IteratorSize(::Type{EnumerableTake{T,S}}) where {T,S} = haslength(S)

Base.eltype(::Type{EnumerableTake{T,S}}) where {T,S} = T

Expand Down
2 changes: 1 addition & 1 deletion src/source_iterable.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function query(source)
return source_enumerable
end

Base.IteratorSize(::Type{EnumerableIterable{T,S}}) where {T,S} = Base.IteratorSize(S) isa Base.HasShape ? Base.HasLength() : Base.IteratorSize(S)
Base.IteratorSize(::Type{EnumerableIterable{T,S}}) where {T,S} = haslength(S)

Base.eltype(::Type{EnumerableIterable{T,S}}) where {T,S} = T

Expand Down