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

Switch supertype of CodeUnits from DenseVector to AbstractVector #54002

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+8 −1
Open

Switch supertype of CodeUnits from DenseVector to AbstractVector #54002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07c6c69
Switch supertype of CodeUnits from DenseVector to AbstractVector
jakobnissen Apr 9, 2024
d245384
Fake dense array for codeunits of String
jakobnissen Apr 9, 2024
2122414
Whitespace
jakobnissen Apr 9, 2024
ef2eadc
Fixup: Fake dense array for codeunits of String
jakobnissen Apr 9, 2024
5b06af8
Fixup: Fake dense array for codeunits of String
jakobnissen Apr 9, 2024
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: 1 addition & 1 deletion base/strings/basic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ iterate(r::Iterators.Reverse{<:EachStringIndex}, i=lastindex(r.itr.s)) = i < fir
Wrap a string (without copying) in an immutable vector-like object that accesses the code units
of the string's representation.
"""
struct CodeUnits{T,S<:AbstractString} <: DenseVector{T}
struct CodeUnits{T,S<:AbstractString} <: AbstractVector{T}
s::S
CodeUnits(s::S) where {S<:AbstractString} = new{codeunit(s),S}(s)
end
Expand Down
7 changes: 7 additions & 0 deletions base/strings/substring.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ convert(::Type{Union{String, SubString{String}}}, s::String) = s
convert(::Type{Union{String, SubString{String}}}, s::SubString{String}) = s
convert(::Type{Union{String, SubString{String}}}, s::AbstractString) = convert(String, s)::String

# This allows CodeUnits of known, memory-backed String types to act like a dense array
# See issue #53996
function _memory_offset(x::CodeUnits{<:Any, <:Union{String, SubString{String}}}, I::Vararg{Any,N}) where {N}
(_to_linear_index(x, I...) - first(LinearIndices(x)))*elsize(x)
end
strides(x::CodeUnits{<:Any, <:Union{String, SubString{String}}}) = (1,)

function String(s::SubString{String})
parent = s.string
copy = GC.@preserve parent unsafe_string(pointer(parent, s.offset+1), s.ncodeunits)
Expand Down
Loading