Sara/fencer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: cleanup pass for dictionary.c

Browse source
This commit is contained in:
Sara 2024-01-25 00:03:27 +01:00
parent 368332b2b3
commit 4188047bbc
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/dictionary.c
View file

@ -23,7 +23,7 @@ Key* internal_dictionary_get(Dictionary* self, uintptr_t keyhash, size_t* out_in
Key* element; Key* element;
signed long l = 0, r = self->list.len, m; signed long l = 0, r = self->list.len, m;
while(l <= r) { while(l <= r) {
m = round((double)(l+r)/2.0); m = floor((double)(l+r)/2.0);
if(out_index != NULL) *out_index = m; if(out_index != NULL) *out_index = m;
element = list_at_unchecked(&self->list, m); element = list_at_unchecked(&self->list, m);
if(keyhash < element->hash) if(keyhash < element->hash)
@ -55,7 +55,7 @@ int dictionary_insert_kvp(Dictionary* self, Key key, void* value, size_t index)
memcpy(insert_data, &key, sizeof(Key)); memcpy(insert_data, &key, sizeof(Key));
memcpy(insert_data + sizeof(Key), value, self->element_size); memcpy(insert_data + sizeof(Key), value, self->element_size);
// decide add or insert based on current length of list // decide add or insert based on current length of list
if(self->list.len == 0) if(self->list.len == 0 || index >= self->list.len)
list_add(&self->list, insert_data); list_add(&self->list, insert_data);
else else
list_insert(&self->list, insert_data, index); list_insert(&self->list, insert_data, index);
@ -71,15 +71,17 @@ int dictionary_set_raw(Dictionary* self, const char* key, void* data) {
// get index of closest hash // get index of closest hash
// prepare key data // prepare key data
Key keydata = { Key keydata = {
.hash = strhash(key), .hash = keyhash,
.key = malloc(strlen(key)+1) .key = malloc(strlen(key)+1)
}; };
strcpy(keydata.key, key); strcpy(keydata.key, key);
if(closest == NULL || keyhash < closest->hash) { // insert before if(closest == NULL) {
return dictionary_insert_kvp(self, keydata, data, closest_index); return dictionary_insert_kvp(self, keydata, data, closest_index);
} else if(strcmp(closest->key, key) == 0) { } else if(closest->hash == keyhash && strcmp(closest->key, key) == 0) {
memcpy(closest + 1, data, self->element_size); memcpy(closest + 1, data, self->element_size);
return 0; return 0;
} else if(keyhash < closest->hash) { // insert before
return dictionary_insert_kvp(self, keydata, data, closest_index);
} else { } else {
return dictionary_insert_kvp(self, keydata, data, closest_index + 1); return dictionary_insert_kvp(self, keydata, data, closest_index + 1);
} }