diff --git a/lib/std/comptime_string_map.zig b/lib/std/comptime_string_map.zig index 7da24545ec..6e8f190bc4 100644 --- a/lib/std/comptime_string_map.zig +++ b/lib/std/comptime_string_map.zig @@ -13,21 +13,21 @@ const mem = std.mem; /// `kvs` expects a list literal containing list literals or an array/slice of structs /// where `.@"0"` is the `[]const u8` key and `.@"1"` is the associated value of type `V`. /// TODO: https://github.com/ziglang/zig/issues/4335 -pub fn ComptimeStringMap(comptime V: type, comptime kvs: anytype) type { +pub fn ComptimeStringMap(comptime V: type, comptime kvs_list: anytype) type { const precomputed = comptime blk: { @setEvalBranchQuota(2000); const KV = struct { key: []const u8, value: V, }; - var sorted_kvs: [kvs.len]KV = undefined; + var sorted_kvs: [kvs_list.len]KV = undefined; const lenAsc = (struct { fn lenAsc(context: void, a: KV, b: KV) bool { _ = context; return a.key.len < b.key.len; } }).lenAsc; - for (kvs) |kv, i| { + for (kvs_list) |kv, i| { if (V != void) { sorted_kvs[i] = .{ .key = kv.@"0", .value = kv.@"1" }; } else { @@ -56,6 +56,8 @@ pub fn ComptimeStringMap(comptime V: type, comptime kvs: anytype) type { }; return struct { + pub const kvs = precomputed.sorted_kvs; + pub fn has(str: []const u8) bool { return get(str) != null; }