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

patch 8.2.1710: Vim9: list of list type can be wrong

Browse Source 
Problem:    Vim9: list of list type can be wrong.
Solution:   Use VAR_UNKNOWN for empty list.  Recognize VAR_UNKNOWN when
            looking for a common type. (closes #6979)
This commit is contained in:
Bram Moolenaar
2020-09-19 14:12:34 +02:00
parent dec07510bb
commit 77b20977dc
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vim9type.c
View File

@@ -869,6 +869,19 @@ common_type(type_T *type1, type_T *type2, type_T **dest, garray_T *type_gap)
return;
}
// If either is VAR_UNKNOWN use the other type. An empty list/dict has no
// specific type.
if (type1->tt_type == VAR_UNKNOWN)
{
*dest = type2;
return;
}
if (type2->tt_type == VAR_UNKNOWN)
{
*dest = type1;
return;
}
if (type1->tt_type == type2->tt_type)
{
if (type1->tt_type == VAR_LIST || type2->tt_type == VAR_DICT)
@@ -932,7 +945,7 @@ get_member_type_from_stack(
// Use "any" for an empty list or dict.
if (count == 0)
return &t_void;
return &t_unknown;
// Use the first value type for the list member type, then find the common
// type from following items.