thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1374: Vim9: error for assigning empty list to script variable

Browse Source 
Problem:    Vim9: error for assigning empty list to script variable.
Solution:   Use t_unknown for empty list member. (closes #6595)
This commit is contained in:
Bram Moolenaar
2020-08-05 15:11:03 +02:00
parent f9b2b49663
commit a71e263320
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vim9compile.c
View File

@@ -502,22 +502,25 @@ typval2type(typval_T *tv, garray_T *type_gap)
if (tv->v_type == VAR_STRING)
return &t_string;
if (tv->v_type == VAR_LIST
&& tv->vval.v_list != NULL
&& tv->vval.v_list->lv_first != NULL)
if (tv->v_type == VAR_LIST)
{
if (tv->vval.v_list == NULL || tv->vval.v_list->lv_first == NULL)
return &t_list_empty;
// Use the type of the first member, it is the most specific.
member_type = typval2type(&tv->vval.v_list->lv_first->li_tv, type_gap);
return get_list_type(member_type, type_gap);
}
if (tv->v_type == VAR_DICT
&& tv->vval.v_dict != NULL
&& tv->vval.v_dict->dv_hashtab.ht_used > 0)
if (tv->v_type == VAR_DICT)
{
dict_iterator_T iter;
typval_T *value;
if (tv->vval.v_dict == NULL
|| tv->vval.v_dict->dv_hashtab.ht_used == 0)
return &t_dict_empty;
// Use the type of the first value, it is the most specific.
dict_iterate_start(tv, &iter);
dict_iterate_next(&iter, &value);