Skip to content
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

Add keytype+valtype method for AbstractArray and AbstractVector #27749

Merged
merged 13 commits into from
Apr 4, 2019
+81 −0
Merged

Add keytype+valtype method for AbstractArray and AbstractVector #27749

Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a6b2f97
Add keytype method for AbstractArray and AbstractVector
tkluck Jun 23, 2018
ab76e1a
Add keytype method for AbstractArray and AbstractVector (part 2)
tkluck Jun 24, 2018
93cc981
Merge remote-tracking branch 'origin/master' into keytype-abstractarray
tkluck Mar 25, 2019
cb5026b
Add valtype(...) for arrays
tkluck Mar 25, 2019
dc3cf84
Implement keytype/valtype for object as keytype(typeof(...
mbauman Mar 27, 2019
d200e3e
Implement keytype/valtype for ranges
tkluck Mar 27, 2019
8d95b77
Add test cases for keytype/valtype(::AbstractArray)
tkluck Mar 27, 2019
c426505
Add #27749 to NEWS.md
tkluck Mar 27, 2019
c14b3b0
keytype/valtype for arrays: docs + compat annotation
tkluck Mar 29, 2019
330a762
keytype/valtype: use String values in examples
StefanKarpinski Mar 29, 2019
4e5893f
keytype/valtype for arrays: no special treatment for ranges
tkluck Mar 30, 2019
092ba3c
Merge remote-tracking branch 'origin/master' into keytype-abstractarray
tkluck Mar 30, 2019
c40c2af
Merge branch 'master' into keytype-abstractarray
tkluck Apr 3, 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
9 changes: 9 additions & 0 deletions base/abstractarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@ unsafe_indices(r::AbstractRange) = (OneTo(unsafe_length(r)),) # Ranges use check
keys(a::AbstractArray) = CartesianIndices(axes(a))
keys(a::AbstractVector) = LinearIndices(a)

keytype(a::AbstractArray) = CartesianIndex{ndims(a)}
tkluck marked this conversation as resolved.
Show resolved Hide resolved
keytype(a::AbstractVector) = Int
tkluck marked this conversation as resolved.
Show resolved Hide resolved
tkluck marked this conversation as resolved.
Show resolved Hide resolved

keytype(A::Type{<:AbstractArray}) = CartesianIndex{ndims(A)}
keytype(A::Type{<:AbstractVector}) = Int

valtype(a::AbstractArray) = eltype(a)
tkluck marked this conversation as resolved.
Show resolved Hide resolved
valtype(A::Type{<:AbstractArray}) = eltype(A)

prevind(::AbstractArray, i::Integer) = Int(i)-1
nextind(::AbstractArray, i::Integer) = Int(i)+1

Expand Down