From db51821a97bfa18ad897713087e3e59b14ae4b21 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 5 Sep 2020 14:52:16 +0200 Subject: [PATCH] Remove type size check, looks like its not needed Add check if the type is float. Float byte comparison doesn't work because +0.0 and -0.0 are considered equal but their byte representations are not equal. --- lib/std/mem.zig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/std/mem.zig b/lib/std/mem.zig index 5833bf9670..cd1000d5e3 100644 --- a/lib/std/mem.zig +++ b/lib/std/mem.zig @@ -897,7 +897,9 @@ fn boyerMooreHorspoolPreprocess(pattern: []const u8, table: *[256]usize) void { pub fn lastIndexOf(comptime T: type, haystack: []const T, needle: []const T) ?usize { if (needle.len > haystack.len or needle.len == 0) return null; - if (!isValidAlign(T.bit_count) or haystack.len < 32 or needle.len <= 2) + // byte comparison with float doesn't work because +0.0 and -0.0 and considered + // equal but their byte representations are not equal. + if (@typeInfo(T) == .Float or haystack.len < 32 or needle.len <= 2) return lastIndexOfLinear(T, haystack, needle); const haystack_bytes = sliceAsBytes(haystack); @@ -921,7 +923,9 @@ pub fn lastIndexOf(comptime T: type, haystack: []const T, needle: []const T) ?us pub fn indexOfPos(comptime T: type, haystack: []const T, start_index: usize, needle: []const T) ?usize { if (needle.len > haystack.len or needle.len == 0) return null; - if (!isValidAlign(T.bit_count) or haystack.len < 32 or needle.len <= 2) + // byte comparison with float doesn't work because +0.0 and -0.0 and considered + // equal but their byte representations are not equal. + if (@typeInfo(T) == .Float or haystack.len < 32 or needle.len <= 2) return indexOfPosLinear(T, haystack, start_index, needle); const haystack_bytes = sliceAsBytes(haystack);