Commit 7e07df06a4f1507be216c84b034167cdee1817f7 | zig

author	Ryan Liptak <squeek502@hotmail.com> 2021-08-13 16:16:29-07:00
committer	Ryan Liptak <squeek502@hotmail.com> 2021-08-13 16:22:56-07:00
log	7e07df06a4f1507be216c84b034167cdee1817f7
tree	4a7aa2c694cd784f5d4a3c85418621d8b1612d49
parent	8ff49966bc9d6d7438640fa475e95f9a24a4b931

ComptimeStringMap: expose kvs array in returned struct

Allows for iterating over the kvs when constructing with a list literal instead of having to create a separate array to pass into ComptimeStringMap in order to maintain access to the values.

For example when making a set, before in order to loop over the kvs you'd have to do something like:

    const MyKV = struct { @"0": []const u8 };
    const kvs: []const MyKV = &[_]MyKV{ .{ @"0" = "foo"}, .{ @"0" = "bar" } };
    const map = ComptimeStringMap(void, kvs);
    for (kvs) |kv| {}

whereas now it's possible to do:

    const map = ComptimeStringMap(void, .{ .{"foo"}, .{"bar"} });
    for (map.kvs) |kv| {}

1 files changed, 5 insertions(+), 3 deletions(-)

lib
- std
  - comptime_string_map.zig

lib/std/comptime_string_map.zig+5-3

...	...	@@ -13,21 +13,21 @@ const mem = std.mem;
13	13	/// `kvs` expects a list literal containing list literals or an array/slice of structs
14	14	/// where `.@"0"` is the `[]const u8` key and `.@"1"` is the associated value of type `V`.
15	15	/// TODO: https://github.com/ziglang/zig/issues/4335
16		pub fn ComptimeStringMap(comptime V: type, comptime kvs: anytype) type {
	16	pub fn ComptimeStringMap(comptime V: type, comptime kvs_list: anytype) type {
17	17	const precomputed = comptime blk: {
18	18	@setEvalBranchQuota(2000);
19	19	const KV = struct {
20	20	key: []const u8,
21	21	value: V,
22	22	};
23		var sorted_kvs: [kvs.len]KV = undefined;
	23	var sorted_kvs: [kvs_list.len]KV = undefined;
24	24	const lenAsc = (struct {
25	25	fn lenAsc(context: void, a: KV, b: KV) bool {
26	26	_ = context;
27	27	return a.key.len < b.key.len;
28	28	}
29	29	}).lenAsc;
30		for (kvs) \|kv, i\| {
	30	for (kvs_list) \|kv, i\| {
31	31	if (V != void) {
32	32	sorted_kvs[i] = .{ .key = kv.@"0", .value = kv.@"1" };
33	33	} else {
...	...	@@ -56,6 +56,8 @@ pub fn ComptimeStringMap(comptime V: type, comptime kvs: anytype) type {
56	56	};
57	57
58	58	return struct {
	59	pub const kvs = precomputed.sorted_kvs;
	60
59	61	pub fn has(str: []const u8) bool {
60	62	return get(str) != null;
61	63	}