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

Fix __split for new empty range behavior #7

Merged
merged 1 commit into from
May 24, 2020
Merged

Fix __split for new empty range behavior #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/util.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function __split(str, splitter, limit::Integer, keep_empty::Bool, strs::Vector)
pos = 1
lst = lastindex(str)
res = find(First, splitter, str)
if res != 0:-1
if res !== 0:-1
j, k = first(res), nextind(str, last(res))
while 0 < j <= lst && length(strs) != limit - 1
if pos < k
Expand All @@ -77,7 +77,7 @@ function __split(str, splitter, limit::Integer, keep_empty::Bool, strs::Vector)
end
(k <= j) && (k = nextind(str, j))
res = find(Fwd, splitter, str, k)
res == 0:-1 && break
res === 0:-1 && break
j, k = first(res), nextind(str, last(res))
end
end
Expand Down
36 changes: 18 additions & 18 deletions test/search.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,42 @@ const u8map = [1, 4, 5, 7, 8, 9, 10, 11, 12, 13, 16, 17, 19, 20, 21, 22, 23, 24,
function test2(dir, P, str, list)
for (p, res) in list
pat = P(p)
(r = fnd(dir, pat, str)) == res ||
(r = fnd(dir, pat, str)) === res ||
println("fnd($dir, $(typeof(pat)):\"$pat\", $(typeof(str)):\"$str\") => $r != $res")
@test fnd(dir, pat, str) == res
@test fnd(dir, pat, str) === res
end
end

function test3(dir, P, str, list)
for (p, beg, res) in list
pat = P(p)
(r = fnd(dir, pat, str, beg)) == res ||
(r = fnd(dir, pat, str, beg)) === res ||
println("fnd($dir, $(typeof(pat)):\"$pat\", $(typeof(str)):\"$str\", $beg) => $r != $res")
@test fnd(dir, pat, str, beg) == res
@test fnd(dir, pat, str, beg) === res
end
end

function test2ch(dir, C, str, list)
for (p, res) in list
pat = cvtchar(C, p)
(r = fnd(dir, pat, str)) == res ||
(r = fnd(dir, pat, str)) === res ||
println("fnd($dir, $(typeof(p)):\"$pat\"), $(typeof(str)):\"$str\") => $r != $res")
(r = fnd(dir, ==(pat), str)) == res ||
(r = fnd(dir, ==(pat), str)) === res ||
println("fnd($dir, ==($(typeof(pat)):\"$pat\"), $(typeof(str)):\"$str\") => $r != $res")
@test fnd(dir, pat, str) == res
@test fnd(dir, ==(pat), str) == res
@test fnd(dir, pat, str) === res
@test fnd(dir, ==(pat), str) === res
end
end

function test3ch(dir, C, str, list)
for (p, beg, res) in list
pat = cvtchar(C, p)
(r = fnd(dir, pat, str, beg)) == res ||
(r = fnd(dir, pat, str, beg)) === res ||
println("fnd($dir, $(typeof(pat)):'$pat', $(typeof(str)):\"$str\", $beg) => $r != $res")
(r = fnd(dir, ==(pat), str, beg)) == res ||
(r = fnd(dir, ==(pat), str, beg)) === res ||
println("fnd($dir, ==($(typeof(pat)):'$pat'), $(typeof(str)):\"$str\", $beg) => $r != $res")
@test fnd(dir, pat, str, beg) == res
@test fnd(dir, ==(pat), str, beg) == res
@test fnd(dir, pat, str, beg) === res
@test fnd(dir, ==(pat), str, beg) === res
end
end

Expand Down Expand Up @@ -147,14 +147,14 @@ end
@testset "find empty string,..." begin
i = 1
while i <= ncodeunits(str)
@test fnd(Fwd, emptyP, str, i) == i:i-1
@test fnd(Rev, emptyP, str, i) == i:i-1
@test fnd(Fwd, emptyP, str, i) === i:i-1
@test fnd(Rev, emptyP, str, i) === i:i-1
i = nextind(str, i)
end
end

@test fnd(First, emptyP, emptyT) == 1:0
@test fnd(Last, emptyP, emptyT) == 1:0
@test fnd(First, emptyP, emptyT) === 1:0
@test fnd(Last, emptyP, emptyT) === 1:0
end
end
end
Expand Down Expand Up @@ -232,8 +232,8 @@ end
@testset "find empty string,..." begin
i = 1
while i <= ncodeunits(str)
@test fnd(Fwd, empty, str, i) == i:i-1
@test fnd(Rev, empty, str, i) == i:i-1
@test fnd(Fwd, empty, str, i) === i:i-1
@test fnd(Rev, empty, str, i) === i:i-1
i = nextind(str, i)
end
end
Expand Down
2 changes: 1 addition & 1 deletion test/substr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ function teststr(T)
# search and SubString (issue #5679)
let str = T("Hello, world!"),
u = SubString(str, 1, 5)
@test fnd(Last, T("World"), u) == 0:-1
@test fnd(Last, T("World"), u) === 0:-1
@test fnd(Last, ==('z'), u) == 0
@test fnd(Last, T("ll"), u) == 3:4
end
Expand Down