aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.2.1758: Vim9: type of unmaterialized list is wrong

Browse Source 
Problem:    Vim9: type of unmaterialized list is wrong.
Solution:   Use list<number>.
This commit is contained in:
Bram Moolenaar
2020-09-27 17:45:03 +02:00
parent a5fe91e6dc
commit 5597ba0467
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/test_vim9_expr.vim
View File

@@ -1517,6 +1517,10 @@ def Test_expr7_list()
llstring = [[], ['text']] llstring = [[], ['text']]
llstring = [[], []] llstring = [[], []]
var rangelist: list<number> = range(3)
g:rangelist = range(3)
CheckDefExecFailure(["var x: list<string> = g:rangelist"], 'E1012: Type mismatch; expected list<string> but got list<number>', 1)
CheckDefFailure(["let x = 1234[3]"], 'E1107:', 1) CheckDefFailure(["let x = 1234[3]"], 'E1107:', 1)
CheckDefExecFailure(["let x = g:anint[3]"], 'E1062:', 1) CheckDefExecFailure(["let x = g:anint[3]"], 'E1062:', 1)

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1758,
/**/ /**/
1757, 1757,
/**/ /**/

12
src/vim9type.c
View File

@@ -269,15 +269,17 @@ typval2type_int(typval_T *tv, garray_T *type_gap)
if (tv->v_type == VAR_LIST) if (tv->v_type == VAR_LIST)
{ {
listitem_T *li; list_T *l = tv->vval.v_list;
listitem_T *li;
if (tv->vval.v_list == NULL || tv->vval.v_list->lv_first == NULL) if (l == NULL || l->lv_first == NULL)
return &t_list_empty; return &t_list_empty;
if (l->lv_first == &range_list_item)
return &t_list_number;
// Use the common type of all members. // Use the common type of all members.
member_type = typval2type(&tv->vval.v_list->lv_first->li_tv, type_gap); member_type = typval2type(&l->lv_first->li_tv, type_gap);
for (li = tv->vval.v_list->lv_first->li_next; li != NULL; for (li = l->lv_first->li_next; li != NULL; li = li->li_next)
li = li->li_next)
common_type(typval2type(&li->li_tv, type_gap), common_type(typval2type(&li->li_tv, type_gap),
member_type, &member_type, type_gap); member_type, &member_type, type_gap);
return get_list_type(member_type, type_gap); return get_list_type(member_type, type_gap);