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

Jump to bottom

add replace(io, str, patterns...) #48625

Merged
merged 9 commits into from
Jul 3, 2023
Merged

add replace(io, str, patterns...) #48625

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
596e81d
add replace(io, str, patterns...)
stevengj Feb 10, 2023
8422f84
optimize SubString methods in a different PR
stevengj Feb 10, 2023
a17af9a
bugfix
stevengj Feb 10, 2023
96a1277
rename out -> io
stevengj Feb 10, 2023
26ae601
bugfix
stevengj Feb 10, 2023
166e0dc
bugfix
stevengj Feb 10, 2023
87ad92c
bugfixes and cleanups
stevengj Feb 10, 2023
41ea3d8
test replace(io, ...) API
stevengj Feb 11, 2023
46d01ae
rm tempfile
stevengj Feb 11, 2023
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
Prev Previous commit
Next Next commit
bugfixes and cleanups
  • Loading branch information
@stevengj
stevengj committed Jul 3, 2023
commit 87ad92c0a0f3ee12bd29746e7b303b428d77d0bd
15 changes: 8 additions & 7 deletions base/strings/util.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,8 @@ function _replace_init(str, pat_repl::NTuple{N, Pair}, count::Int) where N
end

# note: leave str untyped here to make it easier for packages like StringViews to hook in
function _replace_finish(io::IO, str, count::Int, e1, patterns, replaces, rs)
function _replace_finish(io::IO, str, count::Int,
e1::Int, patterns::Tuple, replaces::Tuple, rs::Tuple)
n = 1
i = a = firstindex(str)
while true
Expand All @@ -728,9 +729,9 @@ function _replace_finish(io::IO, str, count::Int, e1, patterns, replaces, rs)
j, k = first(r), last(r)
j > e1 && break
if i == a || i <= k
# copy io preserved portion
# copy out preserved portion
GC.@preserve str unsafe_write(io, pointer(str, i), UInt(j-i))
# copy io replacement string
# copy out replacement string
_replace(io, replaces[p], str, r, patterns[p])
end
if k < j
Expand Down Expand Up @@ -761,7 +762,7 @@ function _replace_finish(io::IO, str, count::Int, e1, patterns, replaces, rs)
end

# note: leave str untyped here to make it easier for packages like StringViews to hook in
function _replace_io(io::IO, retval, str, pat_repl::Pair...; count::Integer=typemax(Int))
function _replace_(io::IO, str, pat_repl::NTuple{N, Pair}, count::Int) where N
if count == 0
write(io, str)
return io
Expand All @@ -776,7 +777,7 @@ function _replace_io(io::IO, retval, str, pat_repl::Pair...; count::Integer=type
end

# note: leave str untyped here to make it easier for packages like StringViews to hook in
function _replace_str(str, pat_repl::Pair...; count::Integer=typemax(Int))
function _replace_(str, pat_repl::NTuple{N, Pair}, count::Int) where N
count == 0 && return str
e1, patterns, replaces, rs, notfound = _replace_init(str, pat_repl, count)
if notfound
Expand Down Expand Up @@ -835,10 +836,10 @@ julia> replace("abcabc", "a" => "b", "b" => "c", r".+" => "a")
```
"""
replace(io::IO, s::AbstractString, pat_f::Pair...; count=typemax(Int)) =
_replace_io(io, String(s), pat_f..., count=count)
_replace_(io, String(s), pat_f, Int(count))

replace(s::AbstractString, pat_f::Pair...; count=typemax(Int)) =
_replace_str(String(s), pat_f..., count=count)
_replace_(String(s), pat_f, Int(count))


# TODO: allow transform as the first argument to replace?
Expand Down