aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-28 09:27:14 -04:00
Code Activity

patch 8.2.0729: Vim9: When reloading a script variables are not cleared

Browse Source 
Problem:    Vim9: When reloading a script variables are not cleared.
Solution:   When sourcing a script again clear all script-local variables.
This commit is contained in:
Bram Moolenaar
2020-05-10 15:24:44 +02:00
parent 69212b11d1
commit 89483d4043
5 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/dict.c
View File

@@ -104,29 +104,38 @@ rettv_dict_set(typval_T *rettv, dict_T *d)
*/
void
dict_free_contents(dict_T *d)
{
hashtab_free_contents(&d->dv_hashtab);
}
/*
* Clear hashtab "ht" and dict items it contains.
*/
void
hashtab_free_contents(hashtab_T *ht)
{
int todo;
hashitem_T *hi;
dictitem_T *di;
// Lock the hashtab, we don't want it to resize while freeing items.
hash_lock(&d->dv_hashtab);
todo = (int)d->dv_hashtab.ht_used;
for (hi = d->dv_hashtab.ht_array; todo > 0; ++hi)
hash_lock(ht);
todo = (int)ht->ht_used;
for (hi = ht->ht_array; todo > 0; ++hi)
{
if (!HASHITEM_EMPTY(hi))
{
// Remove the item before deleting it, just in case there is
// something recursive causing trouble.
di = HI2DI(hi);
hash_remove(&d->dv_hashtab, hi);
hash_remove(ht, hi);
dictitem_free(di);
--todo;
}
}
// The hashtab is still locked, it has to be re-initialized anyway
hash_clear(&d->dv_hashtab);
// The hashtab is still locked, it has to be re-initialized anyway.
hash_clear(ht);
}
static void