# HG changeset patch # User Bram Moolenaar # Date 1601222403 -7200 # Node ID 6a9e5c087c867d94607c1985d827adf2a69c9805 # Parent 04fb79390bafc76d33fca95f0e746e18e8be9176 patch 8.2.1758: Vim9: type of unmaterialized list is wrong Commit: https://github.com/vim/vim/commit/5597ba046790e5ffd76dfc327d7898c56df65d3f Author: Bram Moolenaar Date: Sun Sep 27 17:45:03 2020 +0200 patch 8.2.1758: Vim9: type of unmaterialized list is wrong Problem: Vim9: type of unmaterialized list is wrong. Solution: Use list. diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1517,6 +1517,10 @@ def Test_expr7_list() llstring = [[], ['text']] llstring = [[], []] + var rangelist: list = range(3) + g:rangelist = range(3) + CheckDefExecFailure(["var x: list = g:rangelist"], 'E1012: Type mismatch; expected list but got list', 1) + CheckDefFailure(["let x = 1234[3]"], 'E1107:', 1) CheckDefExecFailure(["let x = g:anint[3]"], 'E1062:', 1) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1758, +/**/ 1757, /**/ 1756, diff --git a/src/vim9type.c b/src/vim9type.c --- a/src/vim9type.c +++ b/src/vim9type.c @@ -269,15 +269,17 @@ typval2type_int(typval_T *tv, garray_T * 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; + if (l->lv_first == &range_list_item) + return &t_list_number; // Use the common type of all members. - member_type = typval2type(&tv->vval.v_list->lv_first->li_tv, type_gap); - for (li = tv->vval.v_list->lv_first->li_next; li != NULL; - li = li->li_next) + member_type = typval2type(&l->lv_first->li_tv, type_gap); + for (li = l->lv_first->li_next; li != NULL; li = li->li_next) common_type(typval2type(&li->li_tv, type_gap), member_type, &member_type, type_gap); return get_list_type(member_type, type_gap);