mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make lastIndexOf use the same cut-off between BMH as indexOf

Browse Source 
Also update test to use a string longer than 52 characters
to test both BMH and linear path.
This commit is contained in:
dec05eba 2020-10-24 03:49:04 +02:00 committed by Andrew Kelley
parent 72064eba23
commit c0fa5963ee
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/std/mem.zig
View File

@ -907,7 +907,7 @@ pub fn lastIndexOf(comptime T: type, haystack: []const T, needle: []const T) ?us
if (needle.len > haystack.len) return null;
if (needle.len == 0) return haystack.len;
if (!meta.trait.hasUniqueRepresentation(T) or haystack.len < 32 or needle.len <= 2)
if (!meta.trait.hasUniqueRepresentation(T) or haystack.len < 52 or needle.len <= 4)
return lastIndexOfLinear(T, haystack, needle);
const haystack_bytes = sliceAsBytes(haystack);
@ -951,10 +951,10 @@ pub fn indexOfPos(comptime T: type, haystack: []const T, start_index: usize, nee
}
test "mem.indexOf" {
testing.expect(indexOf(u8, "one two three four five six seven eight nine ten", "three four").? == 8);
testing.expect(lastIndexOf(u8, "one two three four five six seven eight nine ten", "three four").? == 8);
testing.expect(indexOf(u8, "one two three four five six seven eight nine ten", "two two") == null);
testing.expect(lastIndexOf(u8, "one two three four five six seven eight nine ten", "two two") == null);
testing.expect(indexOf(u8, "one two three four five six seven eight nine ten eleven", "three four").? == 8);
testing.expect(lastIndexOf(u8, "one two three four five six seven eight nine ten eleven", "three four").? == 8);
testing.expect(indexOf(u8, "one two three four five six seven eight nine ten eleven", "two two") == null);
testing.expect(lastIndexOf(u8, "one two three four five six seven eight nine ten eleven", "two two") == null);
testing.expect(indexOf(u8, "one two three four five six seven eight nine ten", "").? == 0);
testing.expect(lastIndexOf(u8, "one two three four five six seven eight nine ten", "").? == 48);