Tweak the interface to better reflect the underlying types it provides, and provide a test for StaticArrayMap.

Author: RetroDev256

CMakeLists.txt

@@ -484,7 +484,7 @@ set(ZIG_STAGE2_SOURCES
     lib/std/process/Child.zig
     lib/std/sort.zig
     lib/std/start.zig
-    lib/std/static_string_map.zig
+    lib/std/static_array_map.zig
     lib/std/std.zig
     lib/std/time.zig
     lib/std/treap.zig

lib/std/static_string_map.zig renamed to lib/std/static_array_map.zig

@@ -1,14 +1,27 @@
 const std = @import("std.zig");
 const assert = std.debug.assert;
 
-/// 'comptime' optimized mapping between string keys and associated values.
+/// 'comptime' optimized mapping between string keys and associated `V` values.
 pub fn StaticStringMap(comptime V: type) type {
-    return StaticStringMapAdvanced(V, u8, defaultEql);
+    return StaticArrayMapWithEql(V, u8, defaultEql);
 }
 
 /// Same as StaticStringMap, except keys are compared case-insensitively.
 pub fn StaticStringMapIgnoreCase(comptime V: type) type {
-    return StaticStringMapAdvanced(V, u8, ignoreCaseEql);
+    return StaticArrayMapWithEql(V, u8, ignoreCaseEql);
+}
+
+/// Same as StaticStringMap, but allows you to provide the `eql` function yourself.
+pub fn StaticStringMapWithEql(
+    comptime V: type,
+    comptime eql: fn (comptime usize, comptime anytype, anytype) bool,
+) type {
+    return StaticArrayMapWithEql(V, u8, eql);
+}
+
+/// 'comptime' optimized mapping between `[]const T` keys and associated `V` values.
+pub fn StaticArrayMap(comptime T: type, comptime V: type) type {
+    return StaticArrayMapWithEql(V, T, defaultEql);
 }
 
 pub fn defaultEql(comptime len: usize, comptime expected: anytype, actual: anytype) bool {
@@ -59,7 +72,7 @@ fn toLowerSimd(comptime len: usize, input: [len]u8) [len]u8 {
 
 /// Static string map constructed at compile time for additional optimizations.
 /// First branches on the key length, then compares the possible matching keys.
-pub fn StaticStringMapAdvanced(
+pub fn StaticArrayMapWithEql(
     /// The type of the value
     comptime V: type,
     /// The type of the element in the array, eg. []const T - would be u8 for a string
@@ -414,3 +427,26 @@ test "sorting kvs doesn't exceed eval branch quota" {
     });
     try testing.expectEqual(1, TypeToByteSizeLUT.get("t1"));
 }
+
+test "static array map" {
+    const map = StaticArrayMap(u16, u4).initComptime(.{
+        .{ &[_]u16{ 0, 1, 2, 3 }, 0 },
+        .{ &[_]u16{ 4, 5, 6, 7, 8 }, 1 },
+        .{ &[_]u16{ 9, 10, 1 << 13, 4 }, 2 },
+        .{ &[_]u16{0}, 3 },
+        .{ &[_]u16{}, 4 },
+    });
+
+    try testing.expectEqual(0, map.get(&[_]u16{ 0, 1, 2, 3 }).?);
+    try testing.expectEqual(2, map.get(&[_]u16{ 9, 10, 1 << 13, 4 }).?);
+    try testing.expectEqual(4, map.get(&[_]u16{}).?);
+
+    try testing.expectEqual(null, map.get(&[_]u16{ 7, 7, 7 }));
+    try testing.expectEqual(null, map.get(&[_]u16{ 0, 1 }));
+
+    try testing.expectEqual(true, map.has(&[_]u16{ 4, 5, 6, 7, 8 }));
+    try testing.expectEqual(true, map.has(&[_]u16{0}));
+
+    try testing.expectEqual(false, map.has(&[_]u16{5}));
+    try testing.expectEqual(false, map.has(&[_]u16{ 0, 0 }));
+}

lib/std/std.zig

@@ -14,9 +14,11 @@ pub const BoundedArrayAligned = @import("bounded_array.zig").BoundedArrayAligned
 pub const Build = @import("Build.zig");
 pub const BufMap = @import("buf_map.zig").BufMap;
 pub const BufSet = @import("buf_set.zig").BufSet;
-pub const StaticStringMap = static_string_map.StaticStringMap;
-pub const StaticStringMapIgnoreCase = static_string_map.StaticStringMapIgnoreCase;
-pub const StaticStringMapAdvanced = static_string_map.StaticStringMapAdvanced;
+pub const StaticArrayMap = static_array_map.StaticArrayMap;
+pub const StaticArrayMapWithEql = static_array_map.StaticArrayMapWithEql;
+pub const StaticStringMap = static_array_map.StaticStringMap;
+pub const StaticStringMapIgnoreCase = static_array_map.StaticStringMapIgnoreCase;
+pub const StaticStringMapWithEql = static_array_map.StaticStringMapWithEql;
 pub const DoublyLinkedList = @import("linked_list.zig").DoublyLinkedList;
 pub const DynLib = @import("dynamic_library.zig").DynLib;
 pub const DynamicBitSet = bit_set.DynamicBitSet;
@@ -58,7 +60,7 @@ pub const builtin = @import("builtin.zig");
 pub const c = @import("c.zig");
 pub const coff = @import("coff.zig");
 pub const compress = @import("compress.zig");
-pub const static_string_map = @import("static_string_map.zig");
+pub const static_array_map = @import("static_array_map.zig");
 pub const crypto = @import("crypto.zig");
 pub const debug = @import("debug.zig");
 pub const dwarf = @import("dwarf.zig");