Skip to content

Fix offset handling of String#rindex with Regex #5594

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

Merged
asterite merged 2 commits into from
Jan 23, 2018
Merged

Fix offset handling of String#rindex with Regex #5594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bf3339
Fix offset handling of String#rindex with Regex
straight-shoota Jan 16, 2018
3a9931d
Fix negative offset and remove substring
straight-shoota Jan 16, 2018
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
24 changes: 22 additions & 2 deletions spec/std/string_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,24 +707,40 @@ describe "String" do

describe "rindex" do
describe "by char" do
it { "bbbb".rindex('b').should eq(3) }
it { "foobar".rindex('a').should eq(4) }
it { "foobar".rindex('g').should be_nil }
it { "日本語日本語".rindex('本').should eq(4) }
it { "あいう_えお".rindex('_').should eq(3) }

describe "with offset" do
it { "bbbb".rindex('b', 2).should eq(2) }
it { "abbbb".rindex('b', 0).should be_nil }
it { "abbbb".rindex('b', 1).should eq(1) }
it { "abbbb".rindex('a', 0).should eq(0) }
it { "bbbb".rindex('b', -2).should eq(2) }
it { "bbbb".rindex('b', -5).should be_nil }
it { "bbbb".rindex('b', -4).should eq(0) }
it { "faobar".rindex('a', 3).should eq(1) }
it { "faobarbaz".rindex('a', -3).should eq(4) }
it { "日本語日本語".rindex('本', 3).should eq(1) }
end
end

describe "by string" do
it { "bbbb".rindex("b").should eq(3) }
it { "foo baro baz".rindex("o b").should eq(7) }
it { "foo baro baz".rindex("fg").should be_nil }
it { "日本語日本語".rindex("日本").should eq(3) }

describe "with offset" do
it { "bbbb".rindex("b", 2).should eq(2) }
it { "abbbb".rindex("b", 0).should be_nil }
it { "abbbb".rindex("b", 1).should eq(1) }
it { "abbbb".rindex("a", 0).should eq(0) }
it { "bbbb".rindex("b", -2).should eq(2) }
it { "bbbb".rindex("b", -5).should be_nil }
it { "bbbb".rindex("b", -4).should eq(0) }
it { "foo baro baz".rindex("o b", 6).should eq(2) }
it { "foo".rindex("", 3).should eq(3) }
it { "foo".rindex("", 4).should eq(3) }
Expand All @@ -738,8 +754,12 @@ describe "String" do
it { "bbbb".rindex(/\d/).should be_nil }

describe "with offset" do
it { "bbbb".rindex(/b/, -3).should eq(2) }
it { "bbbb".rindex(/b/, -1235).should be_nil }
it { "bbbb".rindex(/b/, 2).should eq(2) }
it { "abbbb".rindex(/b/, 0).should be_nil }
it { "abbbb".rindex(/a/, 0).should eq(0) }
it { "bbbb".rindex(/b/, -2).should eq(2) }
it { "bbbb".rindex(/b/, -5).should be_nil }
it { "bbbb".rindex(/b/, -4).should eq(0) }
it { "日本語日本語".rindex(/日本/, 2).should eq(0) }
end
end
Expand Down
7 changes: 4 additions & 3 deletions src/string.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2738,16 +2738,17 @@ class String
end

# ditto
def rindex(search : Regex, offset = 0)
def rindex(search : Regex, offset = size - 1)
offset += size if offset < 0
return nil unless 0 <= offset <= size

match_result = nil
self[0, self.size - offset].scan(search) do |match_data|
scan(search) do |match_data|
break if (index = match_data.begin) && index > offset
match_result = match_data
end

match_result.try &.begin(0)
match_result.try &.begin
end

# Searches separator or pattern (`Regex`) in the string, and returns
Expand Down