Always store •HashMap keys and values as HArrs

This commit is contained in:
Marshall Lochbaum 2023-11-27 19:19:24 -05:00
parent 96c7f2eb1a
commit 016e428db6
2 changed files with 7 additions and 6 deletions

View File

@ -619,17 +619,17 @@ B hashmap_build(B keys, usz n) {
HashMap* map = mm_alloc(fsizeof(HashMap,a,u64,l+ext), t_hashmap);
map->pop = n; map->sh = sh; map->sz = l;
u64* hp = map->a;
SGetU(keys)
B* kp = harr_ptr(keys);
u64 e = ~(u64)0;
u64 m = ~(u32)0;
memset64(hp, e, l+ext);
for (usz i=0; i<n; i++) {
B key = GetU(keys,i);
B key = kp[i];
u64 h = bqn_hash(key, wy_secret);
u64 v = (h &~ m) | i;
u64 j0 = h>>sh; u64 j = j0;
u64 u; while ((u=hp[j]) < v) j++;
if (u < (v|m) && equal(key, GetU(keys,u&m))) thrM("•HashMap: 𝕨 contained duplicate keys");
if (u < (v|m) && equal(key, kp[u&m])) thrM("•HashMap: 𝕨 contained duplicate keys");
u64 je=j; while (u!=e) { u64 s=u; je++; u=hp[je]; hp[je]=s; }
hp[j] = v;
}
@ -644,12 +644,12 @@ B hashmap_lookup(B* vars, B w, B x) {
u64 v = h &~ m;
u64 j = h >> map->sh;
u64 u; while ((u=hp[j]) < v) j++;
B k = vars[0];
B* k = harr_ptr(vars[0]); // keys
while (u < (v|m)) {
usz i = u&m;
if (equal(x, IGetU(k, i))) {
if (equal(x, k[i])) {
dec(x); dec(w);
return IGet(vars[1], i);
return inc(harr_ptr(vars[1])[i]);
}
u = hp[++j];
}

View File

@ -729,6 +729,7 @@ B hashMap_c2(B t, B w, B x) {
usz n = IA(w);
if (n != IA(x)) thrF("•HashMap: 𝕨 and 𝕩 must have the same length (%s≡≠𝕨, %s≡≠𝕩)", n, IA(x));
if (hashmap_ns==NULL) hashmap_init();
w = taga(toHArr(w)); x = taga(toHArr(x));
B h = hashmap_build(w, n);
B ns = m_nns(hashmap_ns, w, x, h, m_nfn(hashmap_getDesc, bi_N));
Scope* sc = c(NS,ns)->sc;