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

make replace with count=0 a no-op #22325

Merged
merged 13 commits into from
Jul 4, 2017
+45 −7
Merged

make replace with count=0 a no-op #22325

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7688517
replace with count=0 is a no-op
rfourquet Jun 10, 2017
5b99e0a
document the behavior for negative count
rfourquet Jun 10, 2017
2f26043
remove default in the docstring
rfourquet Jun 10, 2017
d387b31
use typemax(Int) instead of -1 for unlimited (nalimilan)
rfourquet Jun 11, 2017
bd0079a
deprecate when count < 0 and add NEWS.md entry
rfourquet Jun 11, 2017
5d03ce1
avoid error when a number bigger than typemax(Int) is passed as count…
rfourquet Jun 11, 2017
06a8cfd
add another commented method to be uncommented when replace removed f…
rfourquet Jun 11, 2017
06a7706
check replace is implemented for GenericString (nalimilan)
rfourquet Jun 12, 2017
d77b51a
remove un-needed Base. prefix
rfourquet Jun 12, 2017
4f60ef7
add missing backtick (nalimilan)
rfourquet Jun 12, 2017
981e8da
remove unecessary `Base.` (tkelman) and cancel conversion to Int (nal…
rfourquet Jun 13, 2017
4405d63
improve TODO notes (StefanKarpinski)
rfourquet Jun 15, 2017
ff0b955
cross-ref search (tkelman)
rfourquet Jul 4, 2017
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
Next Next commit
replace with count=0 is a no-op
  • Loading branch information
@rfourquet
rfourquet committed Jul 4, 2017
commit 76885174d39c1a6003c2cb356247bf99d0be76f0
3 changes: 2 additions & 1 deletion base/strings/util.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ _replace(io, repl::Function, str, r, pattern) =
print(io, repl(SubString(str, first(r), last(r))))

function replace(str::String, pattern, repl, limit::Integer)
limit == 0 && return str
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you're at it, maybe rename the argument so that it's consistent with the docstring (or change the docstring)?

n = 1
e = endof(str)
i = a = start(str)
Expand Down Expand Up @@ -402,7 +403,7 @@ If `pat` is a regular expression and `r` is a `SubstitutionString`, then capture
references in `r` are replaced with the corresponding matched text.
"""
replace(s::AbstractString, pat, f, n::Integer) = replace(String(s), pat, f, n)
replace(s::AbstractString, pat, r) = replace(s, pat, r, 0)
replace(s::AbstractString, pat, r) = replace(s, pat, r, -1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should probably mention this in the docstring

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok (Note that it's not mentioned in Python's docstring either)

Copy link
Contributor

@tkelman tkelman Jun 10, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is python relevant? The docstring above says "If n is provided, replace at most n occurrences." So if there's a special meaning to negative inputs, best to describe that. We don't do as many sign-based behavior changes as Python does, like negative indexing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, that was not so relevant, only as a mature language which doesn't mention the behavior for negative inputs, which is same as here, i.e. replace all. Will add that.


# hex <-> bytes conversion

Expand Down
7 changes: 7 additions & 0 deletions test/strings/util.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,13 @@ end
# Issue 13332
@test replace("abc", 'b', 2.1) == "a2.1c"

# test replace with a count, check that replace is a no-op if count==0
@test replace("aaa", 'a', 'z', 0) == "aaa"
@test replace("aaa", 'a', 'z', 1) == "zaa"
@test replace("aaa", 'a', 'z', 2) == "zza"
@test replace("aaa", 'a', 'z', 3) == "zzz"
@test replace("aaa", 'a', 'z', 4) == "zzz"

# chomp/chop
@test chomp("foo\n") == "foo"
@test chop("fooε") == "foo"
Expand Down