mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

map: wrap up delete fix (#9601)

Browse Source
This commit is contained in:
ka-weihe
2021-04-06 15:57:08 +02:00
committed by GitHub
parent 7d5c1c2ddb
commit cbcc0d34b5
6 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/builtin/map.v
View File

@ -637,16 +637,9 @@ fn (mut d DenseArray) delete(i int) {
}
}
// delete this
pub fn (mut m map) delete(key string) {
unsafe {
m.delete_1(&key)
}
}
// Removes the mapping of a particular key from the map.
[unsafe]
pub fn (mut m map) delete_1(key voidptr) {
pub fn (mut m map) delete(key voidptr) {
mut index, mut meta := m.key_to_index(key)
index, meta = m.meta_less(index, meta)
// Perform backwards shifting

8
vlib/builtin/map_test.v
View File

@ -568,9 +568,9 @@ fn test_int_keys() {
}
four := 4
m2.delete_1(3)
m2.delete_1(four)
m2.delete_1(5)
m2.delete(3)
m2.delete(four)
m2.delete(5)
assert m2.len == 0
assert m2[3] == 0
assert m2[4] == 0
@ -603,7 +603,7 @@ fn test_int_keys() {
2: 'two'
}
assert m3[1] == 'one'
m3.delete_1(1)
m3.delete(1)
}
fn test_voidptr_keys() {