authorgravatar for johnnymarler@gmail.comJonathan Marler <johnnymarler@gmail.com> 2022-02-04 23:42:10-07:00
committergravatar for johnnymarler@gmail.comJonathan Marler <johnnymarler@gmail.com> 2022-05-11 18:41:23-06:00
log71f69190ef7a79650647cf5422633813756fbe48
treebf821e89d7bf7e1da1e6217f91e5e9ffdc085dcf
parent1c874a871fe4795f71edf6e9739b72d071eb453a

some fixes to the EnvMap HashContext

2 files changed, 10 insertions(+), 8 deletions(-)

lib/std/build/RunStep.zig+1-1
......@@ -99,7 +99,7 @@ pub fn clearEnvironment(self: *RunStep) void {
9999pub fn addPathDir(self: *RunStep, search_path: []const u8) void {
100100 const env_map = self.getEnvMap();
101101
102 var key: []const u8 = "PATH";
102 const key = "PATH";
103103 var prev_path = env_map.get(key);
104104
105105 if (prev_path) |pp| {
lib/std/process.zig+9-7
......@@ -62,18 +62,20 @@ pub const EnvMap = struct {
6262 std.hash_map.default_max_load_percentage,
6363 );
6464
65 pub const Size = HashMap.Size;
66
6567 pub const EnvNameHashContext = struct {
6668 fn upcase(c: u21) u21 {
6769 if (c <= std.math.maxInt(u16))
68 return std.os.windows.ntdll.RtlUpcaseUnicodeChar(c);
70 return std.os.windows.ntdll.RtlUpcaseUnicodeChar(@intCast(u16, c));
6971 return c;
7072 }
7173
7274 pub fn hash(self: @This(), s: []const u8) u64 {
7375 _ = self;
7476 if (builtin.os.tag == .windows) {
75 const h = std.hash.Wyhash.init(0);
76 var it = std.unicode.Utf8View(s).iterator();
77 var h = std.hash.Wyhash.init(0);
78 var it = std.unicode.Utf8View.initUnchecked(s).iterator();
7779 while (it.nextCodepoint()) |cp| {
7880 const cp_upper = upcase(cp);
7981 h.update(&[_]u8{
......@@ -90,15 +92,15 @@ pub const EnvMap = struct {
9092 pub fn eql(self: @This(), a: []const u8, b: []const u8) bool {
9193 _ = self;
9294 if (builtin.os.tag == .windows) {
93 var it_a = std.unicode.Utf8View(a).iterator();
94 var it_b = std.unicode.Utf8View(b).iterator();
95 var it_a = std.unicode.Utf8View.initUnchecked(a).iterator();
96 var it_b = std.unicode.Utf8View.initUnchecked(b).iterator();
9597 while (true) {
9698 const c_a = it_a.nextCodepoint() orelse break;
9799 const c_b = it_b.nextCodepoint() orelse return false;
98100 if (upcase(c_a) != upcase(c_b))
99101 return false;
100102 }
101 if (it_b.nextCodepoint()) return false;
103 if (it_b.nextCodepoint()) |_| return false;
102104 }
103105 return std.hash_map.eqlString(a, b);
104106 }
......@@ -220,7 +222,7 @@ test "EnvMap" {
220222 var it = env.iterator();
221223 var count: EnvMap.Size = 0;
222224 while (it.next()) |entry| {
223 const is_an_expected_name = std.mem.eql(u8, "SOMETHING_NEW", entry.name) or std.mem.eql(u8, "SOMETHING_NEW_AND_LONGER", entry.name);
225 const is_an_expected_name = std.mem.eql(u8, "SOMETHING_NEW", entry.key_ptr.*) or std.mem.eql(u8, "SOMETHING_NEW_AND_LONGER", entry.key_ptr.*);
224226 try testing.expect(is_an_expected_name);
225227 count += 1;
226228 }