mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.2.0619: null dict is not handled like an empty dict
Problem: Null dict is not handled like an empty dict. Solution: Fix the code and add tests. (Yegappan Lakshmanan, closes #5968)
This commit is contained in:
@@ -871,7 +871,10 @@ get_lval(
|
||||
if (len != -1)
|
||||
key[len] = prevval;
|
||||
if (wrong)
|
||||
{
|
||||
clear_tv(&var1);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (lp->ll_di == NULL)
|
||||
@@ -4553,8 +4556,9 @@ echo_string_core(
|
||||
case VAR_DICT:
|
||||
if (tv->vval.v_dict == NULL)
|
||||
{
|
||||
// NULL dict is equivalent to empty dict.
|
||||
*tofree = NULL;
|
||||
r = NULL;
|
||||
r = (char_u *)"{}";
|
||||
}
|
||||
else if (copyID != 0 && tv->vval.v_dict->dv_copyID == copyID
|
||||
&& tv->vval.v_dict->dv_hashtab.ht_used != 0)
|
||||
@@ -4565,6 +4569,7 @@ echo_string_core(
|
||||
else
|
||||
{
|
||||
int old_copyID = tv->vval.v_dict->dv_copyID;
|
||||
|
||||
tv->vval.v_dict->dv_copyID = copyID;
|
||||
*tofree = dict2string(tv, copyID, restore_copyID);
|
||||
if (restore_copyID)
|
||||
|
Reference in New Issue
Block a user