Skip to content

Turn Merge back into SubString instead of using unsafe operators #10

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Turn Merge back into SubString instead of using unsafe operators #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd523d9
Update mstring.jl
vtjnash Oct 3, 2025
d32b899
Update mstring.jl
vtjnash Oct 3, 2025
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
14 changes: 6 additions & 8 deletions src/mstring.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Merge(s::SubString, e::Bool = false, byte::Bool = false) = Merge(s.string, s.off
Merge(s::String, e::Bool = false, byte::Bool = false) = Merge(s, 0, ncodeunits(s), e, byte)

function Merge(a::Merge, b::Merge)
if a.string === b.string
if a.string == b.string
if a.offset < b.offset
offset = a.offset
@assert offset + a.ncodeunits == b.offset "merge un-adjacent Merge"
Expand Down Expand Up @@ -95,11 +95,9 @@ function write_merges(io::IO, rank, endsym = nothing; limit = typemax(Int), comm
end

function Base.hash(m::Merge, h::UInt)
h = hash(m.byte, hash(m.extra, h)) + Base.memhash_seed
str_size = m.ncodeunits * sizeof(UInt8)
str = m.string
ptr = convert(Ptr{UInt8}, pointer(str)) + m.offset
return GC.@preserve str ccall(Base.memhash, UInt, (Ptr{UInt8}, Csize_t, UInt32), ptr, str_size, h % UInt32) + h
str = SubString(str, m.offset + 1, prevind(str, m.offset + 1 + m.ncodeunits))
return hash(str, hash(m.byte, hash(m.extra, h)))
end

function Base.:(==)(m1::Merge, m2::Merge)
Expand All @@ -109,9 +107,9 @@ function Base.:(==)(m1::Merge, m2::Merge)
m1.byte == m2.byte || return false
str1 = m1.string
str2 = m2.string
p1 = convert(Ptr{UInt8}, pointer(str1)) + m1.offset
p2 = convert(Ptr{UInt8}, pointer(str2)) + m2.offset
return GC.@preserve str1 str2 0 == Base._memcmp(p1, p2, s * sizeof(UInt8))
str1 = SubString(str1, m1.offset + 1, prevind(str1, m1.offset + 1 + s))
str2 = SubString(str2, m2.offset + 1, prevind(str2, m2.offset + 1 + s))
return str1 == str2
end

function as_string(m::Merge, sepsym, endsym)
Expand Down