motiejus/zig
1
Fork 0
Code Releases Activity

Only use boyer-moore-horsepool for types that are power of 2

Browse Source
This commit is contained in:
dec05eba
2020-09-05 12:57:05 +02:00
parent d012507a8f
commit f65f3d24f8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/std/mem.zig
View File

@@ -888,13 +888,13 @@ fn boyerMooreHorspoolPreprocess(pattern: []const u8, table: []usize) void {
/// To start looking at a different index, slice the haystack first.
// Reverse boyer-moore-horspool algorithm
pub fn lastIndexOf(comptime T: type, haystack: []const T, needle: []const T) ?usize {
if (haystack.len < 32 or needle.len <= 2)
if (!isValidAlign(T.bit_count) or haystack.len < 32 or needle.len <= 2)
return lastIndexOfNaive(T, haystack, needle);
if (needle.len > haystack.len or needle.len == 0) return null;
const haystackU8 = @bitCast([]const u8, haystack);
const needleU8 = @bitCast([]const u8, needle);
const haystackU8 = sliceAsBytes(haystack);
const needleU8 = sliceAsBytes(needle);
var table: [256]usize = undefined;
boyerMooreHorspoolPreprocess(needleU8, table[0..]);
@@ -911,13 +911,13 @@ pub fn lastIndexOf(comptime T: type, haystack: []const T, needle: []const T) ?us
// Boyer-moore-horspool algorithm
pub fn indexOfPos(comptime T: type, haystack: []const T, start_index: usize, needle: []const T) ?usize {
if (haystack.len < 32 or needle.len <= 2)
if (!isValidAlign(T.bit_count) or haystack.len < 32 or needle.len <= 2)
return indexOfPosNaive(T, haystack, start_index, needle);
if (needle.len > haystack.len or needle.len == 0) return null;
const haystackU8 = @bitCast([]const u8, haystack);
const needleU8 = @bitCast([]const u8, needle);
const haystackU8 = sliceAsBytes(haystack);
const needleU8 = sliceAsBytes(needle);
var table: [256]usize = undefined;
boyerMooreHorspoolPreprocess(needleU8, table[0..]);